diff options
| author | Owen Anderson <resistor@mac.com> | 2011-03-22 22:52:54 +0000 |
|---|---|---|
| committer | Owen Anderson <resistor@mac.com> | 2011-03-22 22:52:54 +0000 |
| commit | f862b35b0b948c14a4af669c09adab76a4b6e68a (patch) | |
| tree | 3bd1d28830ca7c14f6862b6eca2b6b80224fdbae /lib/MC/MachObjectWriter.cpp | |
| parent | 28cf1156c93afabedc69fe7b73aa92ce85e323a5 (diff) | |
RIT_ARM_ThumbBranch32Bit relocations are not used and should never be generated.
This fixes kimwitu++, bullet, and tramp3dv4 with the ARM integrated assembler.
Fixes <rdar://problem/9165738>.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@128117 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/MC/MachObjectWriter.cpp')
| -rw-r--r-- | lib/MC/MachObjectWriter.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/MC/MachObjectWriter.cpp b/lib/MC/MachObjectWriter.cpp index bd294c27e8..f2e91c2671 100644 --- a/lib/MC/MachObjectWriter.cpp +++ b/lib/MC/MachObjectWriter.cpp @@ -821,7 +821,7 @@ public: // 1 - :upper16: for movt instructions // high bit of r_length: // 0 - arm instructions - // 1 - thumb instructions + // 1 - thumb instructions // the other half of the relocated expression is in the following pair // relocation entry in the the low 16 bits of r_address field. unsigned ThumbBit = 0; @@ -949,15 +949,11 @@ 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: - RelocType = unsigned(macho::RIT_ARM_ThumbBranch32Bit); - Log2Size = llvm::Log2_32(4); - return true; - case ARM::fixup_arm_thumb_blx: RelocType = unsigned(macho::RIT_ARM_ThumbBranch22Bit); // Report as 'long', even though that is not quite accurate. |