Browse Source

--- Merging r19238 into '.':
U compiler/arm/cgcpu.pas

git-svn-id: branches/fixes_2_6@19308 -

Jonas Maebe 14 years ago
parent
commit
29195c8b70
1 changed files with 2 additions and 1 deletions
  1. 2 1
      compiler/arm/cgcpu.pas

+ 2 - 1
compiler/arm/cgcpu.pas

@@ -514,7 +514,8 @@ unit cgcpu;
         branchopcode: tasmop;
         branchopcode: tasmop;
       begin
       begin
         { check not really correct: should only be used for non-Thumb cpus }
         { check not really correct: should only be used for non-Thumb cpus }
-        if (current_settings.cputype<cpu_armv5) then
+        if (current_settings.cputype<cpu_armv5) or
+           (current_settings.cputype in cpu_thumb2) then
           branchopcode:=A_BL
           branchopcode:=A_BL
         else
         else
           branchopcode:=A_BLX;
           branchopcode:=A_BLX;