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 | fb5cd6085fc16a5062ea2ae9097e07ebacf5e998 (patch) | |
| tree | 0819b88df32576a8725597f29e280cbea7f59f5a /llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | |
| parent | 609089f2544d25df617dbfbf6ef9d6299fb6ff65 (diff) | |
| download | llvm-fb5cd6085fc16a5062ea2ae9097e07ebacf5e998.zip llvm-fb5cd6085fc16a5062ea2ae9097e07ebacf5e998.tar.gz llvm-fb5cd6085fc16a5062ea2ae9097e07ebacf5e998.tar.bz2 | |
Ensure conditional BL instructions for ARM are given the fixup fixup_arm_condbranch.
Patch by Tim Northover!
llvm-svn: 153737
Diffstat (limited to 'llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index 98a8bf5..aa649ba 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp @@ -178,7 +178,7 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target, 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 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target, break; } break; + case ARM::fixup_arm_condbl: case ARM::fixup_arm_condbranch: Type = ELF::R_ARM_JUMP24; break; |