diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2010-03-09 00:22:23 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2010-03-09 00:22:23 +0000 |
| commit | d2c1765800bb1bde84747dacbd1536e201780592 (patch) | |
| tree | 34e7f76ce8b59941be5a01da049dd48005070a0f | |
| parent | 9a3c0778c6c17191c835c2a38c49f090d2970d80 (diff) | |
Use bx lr unconditionally in setjmp_arm.S
Rockbox doesn't support ARMv4 non T CPUs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25083 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/codecs/lib/setjmp_arm.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/codecs/lib/setjmp_arm.S b/apps/codecs/lib/setjmp_arm.S index a4d5a016bd..ee5ebd9169 100644 --- a/apps/codecs/lib/setjmp_arm.S +++ b/apps/codecs/lib/setjmp_arm.S @@ -59,6 +59,8 @@ #define RET movs pc, lr #elif defined(__thumb2__) #define RET bx lr +#elif !defined(ROCKBOX_SUPPORTS_AN_ARMV4_NON_T_CPU) +#define RET bx lr /* BX exists on v4T, v5 and more recent architectures */ #else #define RET tst lr, #1; \ moveq pc, lr ; \ |