aboutsummaryrefslogtreecommitdiffstats
path: root/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
diff options
context:
space:
mode:
authorLogan Chien <tzuhsiang.chien@gmail.com>2012-09-01 15:06:36 +0000
committerLogan Chien <tzuhsiang.chien@gmail.com>2012-09-01 15:06:36 +0000
commit8fccd013d87c4b12edb4c9982fd9f3517917d2f7 (patch)
tree1439ca4d93abfe7aa3ba5edb1123b88bc0624220 /lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
parent4b6fbf25600a94dc41ba96b174045e50b85862cf (diff)
downloadexternal_llvm-8fccd013d87c4b12edb4c9982fd9f3517917d2f7.zip
external_llvm-8fccd013d87c4b12edb4c9982fd9f3517917d2f7.tar.gz
external_llvm-8fccd013d87c4b12edb4c9982fd9f3517917d2f7.tar.bz2
Fix Thumb2 fixup kind in the integrated-as.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@163063 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp')
-rw-r--r--lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
index 7d6acbc..b53da3b 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
@@ -194,6 +194,10 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
case ARM::fixup_arm_uncondbranch:
Type = ELF::R_ARM_JUMP24;
break;
+ case ARM::fixup_t2_condbranch:
+ case ARM::fixup_t2_uncondbranch:
+ Type = ELF::R_ARM_THM_JUMP24;
+ break;
case ARM::fixup_arm_movt_hi16:
case ARM::fixup_arm_movt_hi16_pcrel:
Type = ELF::R_ARM_MOVT_PREL;