diff options
| author | Jim Grosbach <grosbach@apple.com> | 2012-02-27 21:36:23 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2012-02-27 21:36:23 +0000 |
| commit | 7b25ecf6adbf3c4709c48033acfeb6ebbb4452ab (patch) | |
| tree | 649c04d8126e29b74b9881df0434fadd4aec39d9 /lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp | |
| parent | 945c2b3965a5d327055f624dd5dab659551da108 (diff) | |
| download | external_llvm-7b25ecf6adbf3c4709c48033acfeb6ebbb4452ab.zip external_llvm-7b25ecf6adbf3c4709c48033acfeb6ebbb4452ab.tar.gz external_llvm-7b25ecf6adbf3c4709c48033acfeb6ebbb4452ab.tar.bz2 | |
ARM BL/BLX instruction fixups should use relocations.
We on the linker to resolve calls to the appropriate BL/BLX instruction
to make interworking function correctly. It uses the symbol in the
relocation to do that, so we need to be careful about being too clever.
To enable this for ARM mode, split the BL/BLX fixup kind off from the
unconditional-branch fixups.
rdar://10927209
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151571 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp')
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp index 96a11eb..faf73ac 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp @@ -82,6 +82,8 @@ static bool getARMFixupKindMachOInfo(unsigned Kind, unsigned &RelocType, case ARM::fixup_arm_adr_pcrel_12: case ARM::fixup_arm_condbranch: case ARM::fixup_arm_uncondbranch: + case ARM::fixup_arm_bl: + case ARM::fixup_arm_blx: RelocType = unsigned(macho::RIT_ARM_Branch24Bit); // Report as 'long', even though that is not quite accurate. Log2Size = llvm::Log2_32(4); |