diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-20 21:56:59 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-11-20 21:56:59 +0100 |
| commit | feadf1055966dff37453b11a22c3e22907a651e6 (patch) | |
| tree | 6de9c298e355327e4c8e47d17c48b94b6941db33 /lib/Target/PowerPC/MCTargetDesc/PPCELFObjectWriter.cpp | |
| parent | 77632a1613fa1f2847f5be88bde73ad80a06e53b (diff) | |
| parent | 6b42fadfac775641b124c3eb61a094bc052a059c (diff) | |
| download | llvm-feadf1055966dff37453b11a22c3e22907a651e6.tar.gz llvm-feadf1055966dff37453b11a22c3e22907a651e6.tar.bz2 llvm-feadf1055966dff37453b11a22c3e22907a651e6.tar.xz | |
Merge branch 'release-3.2' into embtk-support-release-3.2
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; |