Author: Stefano Rivera <stef...@rivera.za.net> Branch: Changeset: r67225:c4cd46b31996 Date: 2013-10-08 18:26 +0200 http://bitbucket.org/pypy/pypy/changeset/c4cd46b31996/
Log: There is no magic __ARM_ARCH__ integer. Just check for ARMv4 diff --git a/rpython/translator/c/src/stacklet/switch_arm_gcc.h b/rpython/translator/c/src/stacklet/switch_arm_gcc.h --- a/rpython/translator/c/src/stacklet/switch_arm_gcc.h +++ b/rpython/translator/c/src/stacklet/switch_arm_gcc.h @@ -1,9 +1,8 @@ -#if __ARM_ARCH__ >= 5 -# define call_reg(x) "blx " #x "\n" -#elif defined (__ARM_ARCH_4T__) +#if defined(__ARM_ARCH_4__) || defined (__ARM_ARCH_4T__) # define call_reg(x) "mov lr, pc ; bx " #x "\n" #else -# define call_reg(x) "mov lr, pc ; mov pc, " #x "\n" +/* ARM >= 5 */ +# define call_reg(x) "blx " #x "\n" #endif static void __attribute__((optimize("O3"))) *slp_switch(void *(*save_state)(void*, void*), _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit