diff options
| author | Hal Finkel <hfinkel@anl.gov> | 2012-11-20 03:57:32 +0000 |
|---|---|---|
| committer | Hal Finkel <hfinkel@anl.gov> | 2012-11-20 03:57:32 +0000 |
| commit | 3c221ac6795fd523c7b30846a26de1479ee14c73 (patch) | |
| tree | 5ba9e7945f621408f34c0db79b6564fe847f632d /lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp | |
| parent | c21252912a845335b30f64f72a149e034f173ffd (diff) | |
| download | llvm-3c221ac6795fd523c7b30846a26de1479ee14c73.tar.gz llvm-3c221ac6795fd523c7b30846a26de1479ee14c73.tar.bz2 llvm-3c221ac6795fd523c7b30846a26de1479ee14c73.tar.xz | |
Merge in PPC internal-as fixes: r167861, r167862, r167863, r167875, r167860, r167864
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_32@168351 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp')
| -rw-r--r-- | lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp index 1518a60db8..dc93f7124a 100644 --- a/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp +++ b/lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp @@ -74,10 +74,26 @@ unsigned PPCELFObjectWriter::getRelocTypeInner(const MCValue &Target, Type = ELF::R_PPC_ADDR14; // XXX: or BRNTAKEN?_ break; case PPC::fixup_ppc_ha16: - Type = ELF::R_PPC_ADDR16_HA; + switch (Modifier) { + default: llvm_unreachable("Unsupported Modifier"); + case MCSymbolRefExpr::VK_PPC_TPREL16_HA: + Type = ELF::R_PPC_TPREL16_HA; + break; + case MCSymbolRefExpr::VK_None: + Type = ELF::R_PPC_ADDR16_HA; + break; + } break; case PPC::fixup_ppc_lo16: - Type = ELF::R_PPC_ADDR16_LO; + switch (Modifier) { + default: llvm_unreachable("Unsupported Modifier"); + case MCSymbolRefExpr::VK_PPC_TPREL16_LO: + Type = ELF::R_PPC_TPREL16_LO; + break; + case MCSymbolRefExpr::VK_None: + Type = ELF::R_PPC_ADDR16_LO; + break; + } break; case PPC::fixup_ppc_lo14: Type = ELF::R_PPC_ADDR14; |