commit ac8173cf71ab87bb80a13886f37d63a00f952bed
author Daniel Dunbar <daniel@zuster.org> Wed Dec 22 21:26:43 2010 +0000
committer Daniel Dunbar <daniel@zuster.org> Wed Dec 22 21:26:43 2010 +0000
tree 2965a1498c0b06bd3403f71524c572c82f388b6b
parent 0f3feb4e8d96da0185afc9b123f05e6fb8497621

MC/Mach-O/ARM: Don't try to use scattered relocs for BR24 fixups.

llvm-svn: 122441

llvm/lib/MC/MachObjectWriter.cpp

diff --git a/llvm/lib/MC/MachObjectWriter.cpp b/llvm/lib/MC/MachObjectWriter.cpp
index 13474277..5c4d6f2 100644
--- a/llvm/lib/MC/MachObjectWriter.cpp
+++ b/llvm/lib/MC/MachObjectWriter.cpp
@@ -962,7 +962,7 @@
     //
     // Is this right for ARM?
     uint32_t Offset = Target.getConstant();
-    if (IsPCRel)
+    if (IsPCRel && !Is24BitBranch)
       Offset += 1 << Log2Size;
     if (Offset && SD && !doesSymbolRequireExternRelocation(SD))
       return RecordARMScatteredRelocation(Asm, Layout, Fragment, Fixup,