This is an archive of the discontinued LLVM Phabricator instance.

Differential D64455

MC: AArch64: Add support for pg_hi21_nc relocation specifier.
ClosedPublic

Authored by pcc on Jul 9 2019, 5:07 PM.

Details

Reviewers
peter.smith
Commits
rG893f8d719c0e: MC: AArch64: Add support for pg_hi21_nc relocation specifier.
rL365661: MC: AArch64: Add support for pg_hi21_nc relocation specifier.

Diff Detail

Event Timeline

pcc created this revision.Jul 9 2019, 5:07 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 9 2019, 5:07 PM
Herald added subscribers: hiraditya, kristof.beyls, javed.absar. · View Herald Transcript
Harbormaster completed remote builds in B34657: Diff 208843.Jul 9 2019, 5:08 PM
pcc added a child revision: D64456: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation..Jul 9 2019, 5:08 PM
peter.smith accepted this revision.Jul 10 2019, 1:06 AM

Looks good to me. The pg_hi21_nc matches what is used in GNU as. For completeness, at some point we may want to add :pg_hi21: which maps to R_AARCH64_ADR_PREL_PG_HI21 but given that is what we get with no modifier it doesn't seem like it is used in practice.

This revision is now accepted and ready to land.Jul 10 2019, 1:06 AM
peter.smith mentioned this in D64456: ELF: Add support for R_AARCH64_ADR_PREL_PG_HI21_NC relocation..Jul 10 2019, 1:08 AM
Closed by commit rL365661: MC: AArch64: Add support for pg_hi21_nc relocation specifier. (authored by pcc). · Explain WhyJul 10 2019, 9:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
llvm/
lib/
Target/
AArch64/
AsmParser/
2 lines
test/
MC/
AArch64/
7 lines

Diff 208843

llvm/lib/Target/AArch64/AsmParser/AArch64AsmParser.cpp

Show First 20 Lines • Show All 2,496 Lines • ▼ Show 20 Lines if (classifySymbolRef(Expr, ELFRefKind, DarwinRefKind, Addend)) {
} else if ((DarwinRefKind == MCSymbolRefExpr::VK_GOTPAGE || } else if ((DarwinRefKind == MCSymbolRefExpr::VK_GOTPAGE ||
DarwinRefKind == MCSymbolRefExpr::VK_TLVPPAGE) && DarwinRefKind == MCSymbolRefExpr::VK_TLVPPAGE) &&
Addend != 0) { Addend != 0) {
Error(S, "gotpage label reference not allowed an addend"); Error(S, "gotpage label reference not allowed an addend");
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
} else if (DarwinRefKind != MCSymbolRefExpr::VK_PAGE && } else if (DarwinRefKind != MCSymbolRefExpr::VK_PAGE &&
DarwinRefKind != MCSymbolRefExpr::VK_GOTPAGE && DarwinRefKind != MCSymbolRefExpr::VK_GOTPAGE &&
DarwinRefKind != MCSymbolRefExpr::VK_TLVPPAGE && DarwinRefKind != MCSymbolRefExpr::VK_TLVPPAGE &&
ELFRefKind != AArch64MCExpr::VK_ABS_PAGE_NC &&
ELFRefKind != AArch64MCExpr::VK_GOT_PAGE && ELFRefKind != AArch64MCExpr::VK_GOT_PAGE &&
ELFRefKind != AArch64MCExpr::VK_GOTTPREL_PAGE && ELFRefKind != AArch64MCExpr::VK_GOTTPREL_PAGE &&
ELFRefKind != AArch64MCExpr::VK_TLSDESC_PAGE) { ELFRefKind != AArch64MCExpr::VK_TLSDESC_PAGE) {
// The operand must be an @page or @gotpage qualified symbolref. // The operand must be an @page or @gotpage qualified symbolref.
Error(S, "page or gotpage label reference expected"); Error(S, "page or gotpage label reference expected");
return MatchOperand_ParseFail; return MatchOperand_ParseFail;
} }
} }
▲ Show 20 Lines • Show All 749 Lines • ▼ Show 20 Lines RefKind = StringSwitch<AArch64MCExpr::VariantKind>(LowerCase)
.Case("dtprel_g2", AArch64MCExpr::VK_DTPREL_G2) .Case("dtprel_g2", AArch64MCExpr::VK_DTPREL_G2)
.Case("dtprel_g1", AArch64MCExpr::VK_DTPREL_G1) .Case("dtprel_g1", AArch64MCExpr::VK_DTPREL_G1)
.Case("dtprel_g1_nc", AArch64MCExpr::VK_DTPREL_G1_NC) .Case("dtprel_g1_nc", AArch64MCExpr::VK_DTPREL_G1_NC)
.Case("dtprel_g0", AArch64MCExpr::VK_DTPREL_G0) .Case("dtprel_g0", AArch64MCExpr::VK_DTPREL_G0)
.Case("dtprel_g0_nc", AArch64MCExpr::VK_DTPREL_G0_NC) .Case("dtprel_g0_nc", AArch64MCExpr::VK_DTPREL_G0_NC)
.Case("dtprel_hi12", AArch64MCExpr::VK_DTPREL_HI12) .Case("dtprel_hi12", AArch64MCExpr::VK_DTPREL_HI12)
.Case("dtprel_lo12", AArch64MCExpr::VK_DTPREL_LO12) .Case("dtprel_lo12", AArch64MCExpr::VK_DTPREL_LO12)
.Case("dtprel_lo12_nc", AArch64MCExpr::VK_DTPREL_LO12_NC) .Case("dtprel_lo12_nc", AArch64MCExpr::VK_DTPREL_LO12_NC)
.Case("pg_hi21_nc", AArch64MCExpr::VK_ABS_PAGE_NC)
.Case("tprel_g2", AArch64MCExpr::VK_TPREL_G2) .Case("tprel_g2", AArch64MCExpr::VK_TPREL_G2)
.Case("tprel_g1", AArch64MCExpr::VK_TPREL_G1) .Case("tprel_g1", AArch64MCExpr::VK_TPREL_G1)
.Case("tprel_g1_nc", AArch64MCExpr::VK_TPREL_G1_NC) .Case("tprel_g1_nc", AArch64MCExpr::VK_TPREL_G1_NC)
.Case("tprel_g0", AArch64MCExpr::VK_TPREL_G0) .Case("tprel_g0", AArch64MCExpr::VK_TPREL_G0)
.Case("tprel_g0_nc", AArch64MCExpr::VK_TPREL_G0_NC) .Case("tprel_g0_nc", AArch64MCExpr::VK_TPREL_G0_NC)
.Case("tprel_hi12", AArch64MCExpr::VK_TPREL_HI12) .Case("tprel_hi12", AArch64MCExpr::VK_TPREL_HI12)
.Case("tprel_lo12", AArch64MCExpr::VK_TPREL_LO12) .Case("tprel_lo12", AArch64MCExpr::VK_TPREL_LO12)
.Case("tprel_lo12_nc", AArch64MCExpr::VK_TPREL_LO12_NC) .Case("tprel_lo12_nc", AArch64MCExpr::VK_TPREL_LO12_NC)
▲ Show 20 Lines • Show All 2,483 Lines • Show Last 20 Lines

llvm/test/MC/AArch64/adrp-relocation2.s

  • This file was added.
// RUN: llvm-mc -triple=aarch64-linux-gnu -filetype=obj -o - %s | llvm-readobj -r - | FileCheck %s
// CHECK: R_AARCH64_ADR_PREL_PG_HI21_NC sym
adrp x0, :pg_hi21_nc:sym
.globl sym
sym: