summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorOwen Anderson <resistor@mac.com>2011-03-23 21:19:56 +0000
committerOwen Anderson <resistor@mac.com>2011-03-23 21:19:56 +0000
commitab234158b81dea3fb159ec9376096b68311d455f (patch)
tree5fd5a66e962eedb3c288363fa2b815d25964700f /llvm
parent336a15e04119c0eb1174c3fe9b3deefccbd0c444 (diff)
downloadbcm5719-llvm-ab234158b81dea3fb159ec9376096b68311d455f.tar.gz
bcm5719-llvm-ab234158b81dea3fb159ec9376096b68311d455f.zip
Fix a bug introduced by my patch yesterday: BL is a 4-byte instructions like BLX, rather than a 2-byte instruction like B.
llvm-svn: 128169
Diffstat (limited to 'llvm')
-rw-r--r--llvm/lib/MC/MachObjectWriter.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index f2e91c26719..105506a113d 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -949,14 +949,13 @@ public:
// 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;
OpenPOWER on IntegriCloud