| commit | cb0809b82b126e79b99755ae4fc3d9733faea038 | [log] [tgz] |
|---|---|---|
| author | James Molloy <james.molloy@arm.com> | Fri Mar 30 09:15:32 2012 +0000 |
| committer | James Molloy <james.molloy@arm.com> | Fri Mar 30 09:15:32 2012 +0000 |
| tree | 850a983c467c93d3487f17578c8593da0ea98b8a | |
| parent | 1c80f56268fa91f9c0c4d0a32b5d61e7b900c6d4 [diff] [blame] |
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
diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index 98a8bf5..aa649ba 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
@@ -178,7 +178,7 @@ break; } break; - case ARM::fixup_arm_bl: + case ARM::fixup_arm_uncondbl: case ARM::fixup_arm_blx: case ARM::fixup_arm_uncondbranch: switch (Modifier) { @@ -190,6 +190,7 @@ break; } break; + case ARM::fixup_arm_condbl: case ARM::fixup_arm_condbranch: Type = ELF::R_ARM_JUMP24; break;