diff options
| author | James Molloy <james.molloy@arm.com> | 2012-03-30 09:15:32 +0000 |
|---|---|---|
| committer | James Molloy <james.molloy@arm.com> | 2012-03-30 09:15:32 +0000 |
| commit | cb0809b82b126e79b99755ae4fc3d9733faea038 (patch) | |
| tree | 850a983c467c93d3487f17578c8593da0ea98b8a /lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp | |
| parent | 1c80f56268fa91f9c0c4d0a32b5d61e7b900c6d4 (diff) | |
| download | external_llvm-cb0809b82b126e79b99755ae4fc3d9733faea038.zip external_llvm-cb0809b82b126e79b99755ae4fc3d9733faea038.tar.gz external_llvm-cb0809b82b126e79b99755ae4fc3d9733faea038.tar.bz2 | |
Ensure conditional BL instructions for ARM are given the fixup fixup_arm_condbranch.
Patch by Tim Northover!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153737 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp')
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp index 9d3da14..8057cb6 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp @@ -82,7 +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_uncondbl: + case ARM::fixup_arm_condbl: case ARM::fixup_arm_blx: RelocType = unsigned(macho::RIT_ARM_Branch24Bit); // Report as 'long', even though that is not quite accurate. |