diff options
| author | Tom Rini <trini@konsulko.com> | 2022-09-02 21:51:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-02 21:53:36 -0400 |
| commit | 98b3a998b31a83d8167f888b11ddd5cce8194f35 (patch) | |
| tree | 91e5c815982e9f1823f86f61bc49e28d948d1b4c /arch/arm/include/asm/assembler.h | |
| parent | 2d7069126d11f8708ee38c68b1c6cafae5e50dae (diff) | |
| parent | 21ddac140e3040b2693c1a5558a84c19a879c04f (diff) | |
Merge branch '2022-09-02-assorted-improvements' into next
- DM RTC improvements that should help in CI, allow disabling LTO from
the make line, add extension (cape, etc) support to distro bootcmd,
add a pause command and re-enable ARM v4T support.
Diffstat (limited to 'arch/arm/include/asm/assembler.h')
| -rw-r--r-- | arch/arm/include/asm/assembler.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index b146918586..8d42ef4823 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -58,16 +58,22 @@ #endif /* - * We only support cores that support at least Thumb-1 and thus we use - * 'bx lr' + * Use 'bx lr' everywhere except ARMv4 (without 'T') where only 'mov pc, lr' + * works */ .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo .macro ret\c, reg + + /* ARMv4- don't know bx lr but the assembler fails to see that */ +#ifdef __ARM_ARCH_4__ + mov\c pc, \reg +#else .ifeqs "\reg", "lr" bx\c \reg .else mov\c pc, \reg .endif +#endif .endm .endr |