diff options
| author | Kai Nacke <kai.nacke@redstar.de> | 2014-01-20 11:00:40 +0000 |
|---|---|---|
| committer | Kai Nacke <kai.nacke@redstar.de> | 2014-01-20 11:00:40 +0000 |
| commit | e51c813859c1934782627cd99ce2b3ce77e9d687 (patch) | |
| tree | 25f87a923c6a427b089caff4825ffe81960d6fe2 /llvm/lib | |
| parent | 0f28f0cfc15ad864ea70dfa6886922ead326a942 (diff) | |
| download | bcm5719-llvm-e51c813859c1934782627cd99ce2b3ce77e9d687.tar.gz bcm5719-llvm-e51c813859c1934782627cd99ce2b3ce77e9d687.zip | |
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.
llvm-svn: 199644
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/MC/MCExpr.cpp | 3 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/llvm/lib/MC/MCExpr.cpp b/llvm/lib/MC/MCExpr.cpp index 69cdfa35440..2052d55dc7e 100644 --- a/llvm/lib/MC/MCExpr.cpp +++ b/llvm/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/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index 72ac6e22e8d..6fcc021a6c7 100644 --- a/llvm/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/llvm/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: |
