Browse Source

Test the proper CPUARM capability when chosing between blx and bl.

git-svn-id: trunk@30273 -
Jeppe Johansen 10 years ago
parent
commit
3ef4033e7d
1 changed files with 3 additions and 3 deletions
  1. 3 3
      rtl/arm/arm.inc

+ 3 - 3
rtl/arm/arm.inc

@@ -534,11 +534,11 @@ asm
 {$endif}
 {$endif}
   stmfd   sp!, {r1, lr}
   stmfd   sp!, {r1, lr}
   sub     r0, r1, #8
   sub     r0, r1, #8
-{$if defined(CPUARM_HAS_BX) and not(defined(WINCE))}
+{$if defined(CPUARM_HAS_BLX_LABEL) and not(defined(WINCE))}
   blx     InterLockedDecrement
   blx     InterLockedDecrement
-{$else defined(CPUARM_HAS_BX) and not(defined(WINCE))}
+{$else defined(CPUARM_HAS_BLX_LABEL) and not(defined(WINCE))}
   bl      InterLockedDecrement
   bl      InterLockedDecrement
-{$endif defined(CPUARM_HAS_BX) and not(defined(WINCE))}
+{$endif defined(CPUARM_HAS_BLX_LABEL) and not(defined(WINCE))}
   // InterLockedDecrement is a nice guy and sets the z flag for us
   // InterLockedDecrement is a nice guy and sets the z flag for us
   // if the reference count dropped to 0
   // if the reference count dropped to 0
   ldmnefd sp!, {r1, pc}
   ldmnefd sp!, {r1, pc}