aboutsummaryrefslogtreecommitdiffstats
path: root/lib/MC/MachObjectWriter.cpp
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2010-12-22 21:26:43 +0000
committerDaniel Dunbar <daniel@zuster.org>2010-12-22 21:26:43 +0000
commit72123334adfa1b020aa7aecf05ce6d135f9c7ffa (patch)
treefc09444329e1042173f37aa9846a7a71cd6b6dc1 /lib/MC/MachObjectWriter.cpp
parentecbbf40d5c67f398b70cfed9ed7eaccf52432014 (diff)
downloadexternal_llvm-72123334adfa1b020aa7aecf05ce6d135f9c7ffa.zip
external_llvm-72123334adfa1b020aa7aecf05ce6d135f9c7ffa.tar.gz
external_llvm-72123334adfa1b020aa7aecf05ce6d135f9c7ffa.tar.bz2
MC/Mach-O/ARM: Don't try to use scattered relocs for BR24 fixups.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122441 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MachObjectWriter.cpp')
-rw-r--r--lib/MC/MachObjectWriter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp
index 1347427..5c4d6f2 100644
--- a/lib/MC/MachObjectWriter.cpp
+++ b/lib/MC/MachObjectWriter.cpp
@@ -962,7 +962,7 @@ public:
//
// 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,