Use __APCS_32__ to decide whether or not to preserve condition codes

on function call.

diff --git a/sysdeps/arm/sysdep.h b/sysdeps/arm/sysdep.h
index b7964a3..8d1e297 100644 (file)
--- a/sysdeps/arm/sysdep.h
+++ b/sysdeps/arm/sysdep.h
@@ -43,13 +43,13 @@
 
 #endif
 
-/* ARM 6 needs slightly different handling */
-#ifdef __arm6__
+/* APCS-32 doesn't preserve the condition codes across function call. */
+#ifdef __APCS_32__
 #define LOADREGS(cond, base, reglist...)\
        ldm##cond       base,reglist
 #define RETINSTR(instr, regs...)\
        instr   regs
-#else  /* arm 3 */
+#else  /* APCS-26 */
 #define LOADREGS(cond, base, reglist...)\
        ldm##cond       base,reglist^
 #define RETINSTR(instr, regs...)\