[llvm-commits] [llvm] r128169 - /llvm/trunk/lib/MC/MachObjectWriter.cpp

[Owen Anderson]

Author: resistor
Date: Wed Mar 23 16:19:56 2011
New Revision: 128169

URL: http://llvm.org/viewvc/llvm-project?rev=128169&view=rev
Log:
Fix a bug introduced by my patch yesterday: BL is a 4-byte instructions like BLX, rather than a 2-byte instruction like B.

Modified:
    llvm/trunk/lib/MC/MachObjectWriter.cpp

Modified: llvm/trunk/lib/MC/MachObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MachObjectWriter.cpp?rev=128169&r1=128168&r2=128169&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MachObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/MachObjectWriter.cpp Wed Mar 23 16:19:56 2011
@@ -949,14 +949,13 @@
 
       // Handle Thumb branches.
     case ARM::fixup_arm_thumb_br:
-    case ARM::fixup_arm_thumb_bl:
       RelocType = unsigned(macho::RIT_ARM_ThumbBranch22Bit);
       Log2Size = llvm::Log2_32(2);
       return true;
-
+      
+    case ARM::fixup_arm_thumb_bl:
     case ARM::fixup_arm_thumb_blx:
       RelocType = unsigned(macho::RIT_ARM_ThumbBranch22Bit);
-      // Report as 'long', even though that is not quite accurate.
       Log2Size = llvm::Log2_32(4);
       return true;