summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorKai Nacke <kai.nacke@redstar.de>2014-01-20 11:00:40 +0000
committerKai Nacke <kai.nacke@redstar.de>2014-01-20 11:00:40 +0000
commit843fa74d3851e93abf5f534f9a98021282ab3dbd (patch)
tree4e15036b0a8568d7a27072b6d675485c9244d833 /lib
parentb924b8b56c8a2053a0b79682b2bddba9bd04f00f (diff)
downloadllvm-843fa74d3851e93abf5f534f9a98021282ab3dbd.tar.gz
llvm-843fa74d3851e93abf5f534f9a98021282ab3dbd.tar.bz2
llvm-843fa74d3851e93abf5f534f9a98021282ab3dbd.tar.xz
ARM: add tlsldo relocation
Add support for the symbol(tlsldo) relocation. This is required in order to solve PR18554. Reviewed by R. Golin, A. Korobeynikov. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199644 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/MC/MCExpr.cpp3
-rw-r--r--lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp
index 69cdfa3544..2052d55dc7 100644
--- a/lib/MC/MCExpr.cpp
+++ b/lib/MC/MCExpr.cpp
@@ -184,6 +184,7 @@ StringRef MCSymbolRefExpr::getVariantKindName(VariantKind Kind) {
case VK_ARM_TARGET1: return "target1";
case VK_ARM_TARGET2: return "target2";
case VK_ARM_PREL31: return "prel31";
+ case VK_ARM_TLSLDO: return "tlsldo";
case VK_PPC_LO: return "l";
case VK_PPC_HI: return "h";
case VK_PPC_HA: return "ha";
@@ -405,6 +406,8 @@ MCSymbolRefExpr::getVariantKindForName(StringRef Name) {
.Case("target2", VK_ARM_TARGET2)
.Case("PREL31", VK_ARM_PREL31)
.Case("prel31", VK_ARM_PREL31)
+ .Case("TLSLDO", VK_ARM_TLSLDO)
+ .Case("tlsldo", VK_ARM_TLSLDO)
.Default(VK_Invalid);
}
diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
index 72ac6e22e8..6fcc021a6c 100644
--- a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
+++ b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp
@@ -250,6 +250,9 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target,
case MCSymbolRefExpr::VK_ARM_PREL31:
Type = ELF::R_ARM_PREL31;
break;
+ case MCSymbolRefExpr::VK_ARM_TLSLDO:
+ Type = ELF::R_ARM_TLS_LDO32;
+ break;
}
break;
case ARM::fixup_arm_ldst_pcrel_12: