diff options
| author | Logan Chien <loganchien@google.com> | 2012-11-29 11:59:37 +0800 |
|---|---|---|
| committer | Logan Chien <loganchien@google.com> | 2012-11-29 11:59:37 +0800 |
| commit | e70243fd5213e4acbf894c8e8b7b6b74cad682a7 (patch) | |
| tree | d0dabc67c8757462cf385f407e0411a7d841a819 | |
| parent | 34169429c2822d8af6eb5a14acf3691ffe9b5edc (diff) | |
| download | llvm-e70243fd5213e4acbf894c8e8b7b6b74cad682a7.tar.gz | |
Add ARM TARGET2 relocation.
According to ARM EHABI, we should use TARGET2 as the
relocation type for type info reference, so we have
to add R_ARM_TARGET2 to MCExpr.
This patch is backported from upstream r167633
by Anton Korobeynikov.
Change-Id: I957fd1c43e0aec7c4b361ad29930fe4358ea610e
| -rw-r--r-- | include/llvm/MC/MCExpr.h | 1 | ||||
| -rw-r--r-- | lib/MC/MCExpr.cpp | 4 | ||||
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/llvm/MC/MCExpr.h b/include/llvm/MC/MCExpr.h index ff33641dba7..86ead0de122 100644 --- a/include/llvm/MC/MCExpr.h +++ b/include/llvm/MC/MCExpr.h @@ -170,6 +170,7 @@ public: VK_ARM_TPOFF, VK_ARM_GOTTPOFF, VK_ARM_TARGET1, + VK_ARM_TARGET2, VK_PPC_TOC, VK_PPC_DARWIN_HA16, // ha16(symbol) diff --git a/lib/MC/MCExpr.cpp b/lib/MC/MCExpr.cpp index 78801557af3..5d3a8f2cbce 100644 --- a/lib/MC/MCExpr.cpp +++ b/lib/MC/MCExpr.cpp @@ -60,7 +60,8 @@ void MCExpr::print(raw_ostream &OS) const { SRE.getKind() == MCSymbolRefExpr::VK_ARM_GOTOFF || SRE.getKind() == MCSymbolRefExpr::VK_ARM_TPOFF || SRE.getKind() == MCSymbolRefExpr::VK_ARM_GOTTPOFF || - SRE.getKind() == MCSymbolRefExpr::VK_ARM_TARGET1) + SRE.getKind() == MCSymbolRefExpr::VK_ARM_TARGET1 || + SRE.getKind() == MCSymbolRefExpr::VK_ARM_TARGET2) OS << MCSymbolRefExpr::getVariantKindName(SRE.getKind()); else if (SRE.getKind() != MCSymbolRefExpr::VK_None && SRE.getKind() != MCSymbolRefExpr::VK_PPC_DARWIN_HA16 && @@ -197,6 +198,7 @@ StringRef MCSymbolRefExpr::getVariantKindName(VariantKind Kind) { case VK_ARM_GOTTPOFF: return "(gottpoff)"; case VK_ARM_TLSGD: return "(tlsgd)"; case VK_ARM_TARGET1: return "(target1)"; + case VK_ARM_TARGET2: return "(target2)"; case VK_PPC_TOC: return "toc"; case VK_PPC_DARWIN_HA16: return "ha16"; case VK_PPC_DARWIN_LO16: return "lo16"; diff --git a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp index d0917afdb5f..4f153a730f6 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMELFObjectWriter.cpp @@ -246,6 +246,9 @@ unsigned ARMELFObjectWriter::GetRelocTypeInner(const MCValue &Target, case MCSymbolRefExpr::VK_ARM_TARGET1: Type = ELF::R_ARM_TARGET1; break; + case MCSymbolRefExpr::VK_ARM_TARGET2: + Type = ELF::R_ARM_TARGET2; + break; } break; case ARM::fixup_arm_ldst_pcrel_12: |