Skip to content

Commit 3c661cf

Browse files
kovdan01kovdan01
authored
[PAC][MC][ELF][AArch64] Support signed TLSDESC (#120010)
Support the following relocations and assembly operators: - `R_AARCH64_AUTH_TLSDESC_ADR_PAGE21` (`:tlsdesc_auth:` for `adrp`) - `R_AARCH64_AUTH_TLSDESC_LD64_LO12` (`:tlsdesc_auth_lo12:` for `ldr`) - `R_AARCH64_AUTH_TLSDESC_ADD_LO12` (`:tlsdesc_auth_lo12:` for `add`)
1 parent 9829598 commit 3c661cf

File tree

7 files changed

+200
-120
lines changed

7 files changed

+200
-120
lines changed

‎llvm/lib/Target/AArch64/AArch64MCInstLower.cpp

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,16 @@ MCOperand AArch64MCInstLower::lowerSymbolOperandELF(const MachineOperand &MO,
194194
} else if (MO.getTargetFlags() & AArch64II::MO_TLS) {
195195
TLSModel::Model Model;
196196
if (MO.isGlobal()) {
197-
const GlobalValue *GV = MO.getGlobal();
198-
Model = Printer.TM.getTLSModel(GV);
199-
if (!EnableAArch64ELFLocalDynamicTLSGeneration &&
200-
Model == TLSModel::LocalDynamic)
197+
const MachineFunction *MF = MO.getParent()->getParent()->getParent();
198+
if (MF->getInfo<AArch64FunctionInfo>()->hasELFSignedGOT()) {
201199
Model = TLSModel::GeneralDynamic;
202-
200+
} else {
201+
const GlobalValue *GV = MO.getGlobal();
202+
Model = Printer.TM.getTLSModel(GV);
203+
if (!EnableAArch64ELFLocalDynamicTLSGeneration &&
204+
Model == TLSModel::LocalDynamic)
205+
Model = TLSModel::GeneralDynamic;
206+
}
203207
} else {
204208
assert(MO.isSymbol() &&
205209
StringRef(MO.getSymbolName()) == "_TLS_MODULE_BASE_" &&
@@ -218,10 +222,18 @@ MCOperand AArch64MCInstLower::lowerSymbolOperandELF(const MachineOperand &MO,
218222
case TLSModel::LocalDynamic:
219223
RefFlags |= AArch64MCExpr::VK_DTPREL;
220224
break;
221-
case TLSModel::GeneralDynamic:
222-
RefFlags |= AArch64MCExpr::VK_TLSDESC;
225+
case TLSModel::GeneralDynamic: {
226+
// TODO: it's probably better to introduce MO_TLS_AUTH or smth and avoid
227+
// running hasELFSignedGOT() every time, but existing flags already
228+
// cover all 12 bits of SubReg_TargetFlags field in MachineOperand, and
229+
// making the field wider breaks static assertions.
230+
const MachineFunction *MF = MO.getParent()->getParent()->getParent();
231+
RefFlags |= MF->getInfo<AArch64FunctionInfo>()->hasELFSignedGOT()
232+
? AArch64MCExpr::VK_TLSDESC_AUTH
233+
: AArch64MCExpr::VK_TLSDESC;
223234
break;
224235
}
236+
}
225237
} else if (MO.getTargetFlags() & AArch64II::MO_PREL) {
226238
RefFlags |= AArch64MCExpr::VK_PREL;
227239
} else {

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

Lines changed: 58 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -904,6 +904,7 @@ class AArch64Operand : public MCParsedAsmOperand {
904904
ELFRefKind == AArch64MCExpr::VK_TPREL_LO12_NC ||
905905
ELFRefKind == AArch64MCExpr::VK_GOTTPREL_LO12_NC ||
906906
ELFRefKind == AArch64MCExpr::VK_TLSDESC_LO12 ||
907+
ELFRefKind == AArch64MCExpr::VK_TLSDESC_AUTH_LO12 ||
907908
ELFRefKind == AArch64MCExpr::VK_SECREL_LO12 ||
908909
ELFRefKind == AArch64MCExpr::VK_SECREL_HI12 ||
909910
ELFRefKind == AArch64MCExpr::VK_GOT_PAGE_LO15) {
@@ -1021,6 +1022,7 @@ class AArch64Operand : public MCParsedAsmOperand {
10211022
ELFRefKind == AArch64MCExpr::VK_TPREL_LO12 ||
10221023
ELFRefKind == AArch64MCExpr::VK_TPREL_LO12_NC ||
10231024
ELFRefKind == AArch64MCExpr::VK_TLSDESC_LO12 ||
1025+
ELFRefKind == AArch64MCExpr::VK_TLSDESC_AUTH_LO12 ||
10241026
ELFRefKind == AArch64MCExpr::VK_SECREL_HI12 ||
10251027
ELFRefKind == AArch64MCExpr::VK_SECREL_LO12;
10261028
}
@@ -3314,7 +3316,8 @@ ParseStatus AArch64AsmParser::tryParseAdrpLabel(OperandVector &Operands) {
33143316
ELFRefKind != AArch64MCExpr::VK_GOT_AUTH_PAGE &&
33153317
ELFRefKind != AArch64MCExpr::VK_GOT_PAGE_LO15 &&
33163318
ELFRefKind != AArch64MCExpr::VK_GOTTPREL_PAGE &&
3317-
ELFRefKind != AArch64MCExpr::VK_TLSDESC_PAGE) {
3319+
ELFRefKind != AArch64MCExpr::VK_TLSDESC_PAGE &&
3320+
ELFRefKind != AArch64MCExpr::VK_TLSDESC_AUTH_PAGE) {
33183321
// The operand must be an @page or @gotpage qualified symbolref.
33193322
return Error(S, "page or gotpage label reference expected");
33203323
}
@@ -4398,56 +4401,59 @@ bool AArch64AsmParser::parseSymbolicImmVal(const MCExpr *&ImmVal) {
43984401
return TokError("expect relocation specifier in operand after ':'");
43994402

44004403
std::string LowerCase = getTok().getIdentifier().lower();
4401-
RefKind = StringSwitch<AArch64MCExpr::VariantKind>(LowerCase)
4402-
.Case("lo12", AArch64MCExpr::VK_LO12)
4403-
.Case("abs_g3", AArch64MCExpr::VK_ABS_G3)
4404-
.Case("abs_g2", AArch64MCExpr::VK_ABS_G2)
4405-
.Case("abs_g2_s", AArch64MCExpr::VK_ABS_G2_S)
4406-
.Case("abs_g2_nc", AArch64MCExpr::VK_ABS_G2_NC)
4407-
.Case("abs_g1", AArch64MCExpr::VK_ABS_G1)
4408-
.Case("abs_g1_s", AArch64MCExpr::VK_ABS_G1_S)
4409-
.Case("abs_g1_nc", AArch64MCExpr::VK_ABS_G1_NC)
4410-
.Case("abs_g0", AArch64MCExpr::VK_ABS_G0)
4411-
.Case("abs_g0_s", AArch64MCExpr::VK_ABS_G0_S)
4412-
.Case("abs_g0_nc", AArch64MCExpr::VK_ABS_G0_NC)
4413-
.Case("prel_g3", AArch64MCExpr::VK_PREL_G3)
4414-
.Case("prel_g2", AArch64MCExpr::VK_PREL_G2)
4415-
.Case("prel_g2_nc", AArch64MCExpr::VK_PREL_G2_NC)
4416-
.Case("prel_g1", AArch64MCExpr::VK_PREL_G1)
4417-
.Case("prel_g1_nc", AArch64MCExpr::VK_PREL_G1_NC)
4418-
.Case("prel_g0", AArch64MCExpr::VK_PREL_G0)
4419-
.Case("prel_g0_nc", AArch64MCExpr::VK_PREL_G0_NC)
4420-
.Case("dtprel_g2", AArch64MCExpr::VK_DTPREL_G2)
4421-
.Case("dtprel_g1", AArch64MCExpr::VK_DTPREL_G1)
4422-
.Case("dtprel_g1_nc", AArch64MCExpr::VK_DTPREL_G1_NC)
4423-
.Case("dtprel_g0", AArch64MCExpr::VK_DTPREL_G0)
4424-
.Case("dtprel_g0_nc", AArch64MCExpr::VK_DTPREL_G0_NC)
4425-
.Case("dtprel_hi12", AArch64MCExpr::VK_DTPREL_HI12)
4426-
.Case("dtprel_lo12", AArch64MCExpr::VK_DTPREL_LO12)
4427-
.Case("dtprel_lo12_nc", AArch64MCExpr::VK_DTPREL_LO12_NC)
4428-
.Case("pg_hi21_nc", AArch64MCExpr::VK_ABS_PAGE_NC)
4429-
.Case("tprel_g2", AArch64MCExpr::VK_TPREL_G2)
4430-
.Case("tprel_g1", AArch64MCExpr::VK_TPREL_G1)
4431-
.Case("tprel_g1_nc", AArch64MCExpr::VK_TPREL_G1_NC)
4432-
.Case("tprel_g0", AArch64MCExpr::VK_TPREL_G0)
4433-
.Case("tprel_g0_nc", AArch64MCExpr::VK_TPREL_G0_NC)
4434-
.Case("tprel_hi12", AArch64MCExpr::VK_TPREL_HI12)
4435-
.Case("tprel_lo12", AArch64MCExpr::VK_TPREL_LO12)
4436-
.Case("tprel_lo12_nc", AArch64MCExpr::VK_TPREL_LO12_NC)
4437-
.Case("tlsdesc_lo12", AArch64MCExpr::VK_TLSDESC_LO12)
4438-
.Case("got", AArch64MCExpr::VK_GOT_PAGE)
4439-
.Case("gotpage_lo15", AArch64MCExpr::VK_GOT_PAGE_LO15)
4440-
.Case("got_lo12", AArch64MCExpr::VK_GOT_LO12)
4441-
.Case("got_auth", AArch64MCExpr::VK_GOT_AUTH_PAGE)
4442-
.Case("got_auth_lo12", AArch64MCExpr::VK_GOT_AUTH_LO12)
4443-
.Case("gottprel", AArch64MCExpr::VK_GOTTPREL_PAGE)
4444-
.Case("gottprel_lo12", AArch64MCExpr::VK_GOTTPREL_LO12_NC)
4445-
.Case("gottprel_g1", AArch64MCExpr::VK_GOTTPREL_G1)
4446-
.Case("gottprel_g0_nc", AArch64MCExpr::VK_GOTTPREL_G0_NC)
4447-
.Case("tlsdesc", AArch64MCExpr::VK_TLSDESC_PAGE)
4448-
.Case("secrel_lo12", AArch64MCExpr::VK_SECREL_LO12)
4449-
.Case("secrel_hi12", AArch64MCExpr::VK_SECREL_HI12)
4450-
.Default(AArch64MCExpr::VK_INVALID);
4404+
RefKind =
4405+
StringSwitch<AArch64MCExpr::VariantKind>(LowerCase)
4406+
.Case("lo12", AArch64MCExpr::VK_LO12)
4407+
.Case("abs_g3", AArch64MCExpr::VK_ABS_G3)
4408+
.Case("abs_g2", AArch64MCExpr::VK_ABS_G2)
4409+
.Case("abs_g2_s", AArch64MCExpr::VK_ABS_G2_S)
4410+
.Case("abs_g2_nc", AArch64MCExpr::VK_ABS_G2_NC)
4411+
.Case("abs_g1", AArch64MCExpr::VK_ABS_G1)
4412+
.Case("abs_g1_s", AArch64MCExpr::VK_ABS_G1_S)
4413+
.Case("abs_g1_nc", AArch64MCExpr::VK_ABS_G1_NC)
4414+
.Case("abs_g0", AArch64MCExpr::VK_ABS_G0)
4415+
.Case("abs_g0_s", AArch64MCExpr::VK_ABS_G0_S)
4416+
.Case("abs_g0_nc", AArch64MCExpr::VK_ABS_G0_NC)
4417+
.Case("prel_g3", AArch64MCExpr::VK_PREL_G3)
4418+
.Case("prel_g2", AArch64MCExpr::VK_PREL_G2)
4419+
.Case("prel_g2_nc", AArch64MCExpr::VK_PREL_G2_NC)
4420+
.Case("prel_g1", AArch64MCExpr::VK_PREL_G1)
4421+
.Case("prel_g1_nc", AArch64MCExpr::VK_PREL_G1_NC)
4422+
.Case("prel_g0", AArch64MCExpr::VK_PREL_G0)
4423+
.Case("prel_g0_nc", AArch64MCExpr::VK_PREL_G0_NC)
4424+
.Case("dtprel_g2", AArch64MCExpr::VK_DTPREL_G2)
4425+
.Case("dtprel_g1", AArch64MCExpr::VK_DTPREL_G1)
4426+
.Case("dtprel_g1_nc", AArch64MCExpr::VK_DTPREL_G1_NC)
4427+
.Case("dtprel_g0", AArch64MCExpr::VK_DTPREL_G0)
4428+
.Case("dtprel_g0_nc", AArch64MCExpr::VK_DTPREL_G0_NC)
4429+
.Case("dtprel_hi12", AArch64MCExpr::VK_DTPREL_HI12)
4430+
.Case("dtprel_lo12", AArch64MCExpr::VK_DTPREL_LO12)
4431+
.Case("dtprel_lo12_nc", AArch64MCExpr::VK_DTPREL_LO12_NC)
4432+
.Case("pg_hi21_nc", AArch64MCExpr::VK_ABS_PAGE_NC)
4433+
.Case("tprel_g2", AArch64MCExpr::VK_TPREL_G2)
4434+
.Case("tprel_g1", AArch64MCExpr::VK_TPREL_G1)
4435+
.Case("tprel_g1_nc", AArch64MCExpr::VK_TPREL_G1_NC)
4436+
.Case("tprel_g0", AArch64MCExpr::VK_TPREL_G0)
4437+
.Case("tprel_g0_nc", AArch64MCExpr::VK_TPREL_G0_NC)
4438+
.Case("tprel_hi12", AArch64MCExpr::VK_TPREL_HI12)
4439+
.Case("tprel_lo12", AArch64MCExpr::VK_TPREL_LO12)
4440+
.Case("tprel_lo12_nc", AArch64MCExpr::VK_TPREL_LO12_NC)
4441+
.Case("tlsdesc_lo12", AArch64MCExpr::VK_TLSDESC_LO12)
4442+
.Case("tlsdesc_auth_lo12", AArch64MCExpr::VK_TLSDESC_AUTH_LO12)
4443+
.Case("got", AArch64MCExpr::VK_GOT_PAGE)
4444+
.Case("gotpage_lo15", AArch64MCExpr::VK_GOT_PAGE_LO15)
4445+
.Case("got_lo12", AArch64MCExpr::VK_GOT_LO12)
4446+
.Case("got_auth", AArch64MCExpr::VK_GOT_AUTH_PAGE)
4447+
.Case("got_auth_lo12", AArch64MCExpr::VK_GOT_AUTH_LO12)
4448+
.Case("gottprel", AArch64MCExpr::VK_GOTTPREL_PAGE)
4449+
.Case("gottprel_lo12", AArch64MCExpr::VK_GOTTPREL_LO12_NC)
4450+
.Case("gottprel_g1", AArch64MCExpr::VK_GOTTPREL_G1)
4451+
.Case("gottprel_g0_nc", AArch64MCExpr::VK_GOTTPREL_G0_NC)
4452+
.Case("tlsdesc", AArch64MCExpr::VK_TLSDESC_PAGE)
4453+
.Case("tlsdesc_auth", AArch64MCExpr::VK_TLSDESC_AUTH_PAGE)
4454+
.Case("secrel_lo12", AArch64MCExpr::VK_SECREL_LO12)
4455+
.Case("secrel_hi12", AArch64MCExpr::VK_SECREL_HI12)
4456+
.Default(AArch64MCExpr::VK_INVALID);
44514457

44524458
if (RefKind == AArch64MCExpr::VK_INVALID)
44534459
return TokError("expect relocation specifier in operand after ':'");
@@ -5821,6 +5827,7 @@ bool AArch64AsmParser::validateInstruction(MCInst &Inst, SMLoc &IDLoc,
58215827
ELFRefKind == AArch64MCExpr::VK_TPREL_LO12 ||
58225828
ELFRefKind == AArch64MCExpr::VK_TPREL_LO12_NC ||
58235829
ELFRefKind == AArch64MCExpr::VK_TLSDESC_LO12 ||
5830+
ELFRefKind == AArch64MCExpr::VK_TLSDESC_AUTH_LO12 ||
58245831
ELFRefKind == AArch64MCExpr::VK_SECREL_LO12 ||
58255832
ELFRefKind == AArch64MCExpr::VK_SECREL_HI12) &&
58265833
(Inst.getOpcode() == AArch64::ADDXri ||

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64ELFObjectWriter.cpp

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,15 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
187187
return R_CLS(TLSIE_ADR_GOTTPREL_PAGE21);
188188
if (SymLoc == AArch64MCExpr::VK_TLSDESC && !IsNC)
189189
return R_CLS(TLSDESC_ADR_PAGE21);
190+
if (SymLoc == AArch64MCExpr::VK_TLSDESC_AUTH && !IsNC) {
191+
if (IsILP32) {
192+
Ctx.reportError(Fixup.getLoc(),
193+
"ILP32 ADRP AUTH relocation not supported "
194+
"(LP64 eqv: AUTH_TLSDESC_ADR_PAGE21)");
195+
return ELF::R_AARCH64_NONE;
196+
}
197+
return ELF::R_AARCH64_AUTH_TLSDESC_ADR_PAGE21;
198+
}
190199
Ctx.reportError(Fixup.getLoc(),
191200
"invalid symbol kind for ADRP relocation");
192201
return ELF::R_AARCH64_NONE;
@@ -267,6 +276,15 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
267276
return R_CLS(TLSLE_ADD_TPREL_LO12);
268277
if (RefKind == AArch64MCExpr::VK_TLSDESC_LO12)
269278
return R_CLS(TLSDESC_ADD_LO12);
279+
if (RefKind == AArch64MCExpr::VK_TLSDESC_AUTH_LO12) {
280+
if (IsILP32) {
281+
Ctx.reportError(Fixup.getLoc(),
282+
"ILP32 ADD AUTH relocation not supported "
283+
"(LP64 eqv: AUTH_TLSDESC_ADD_LO12)");
284+
return ELF::R_AARCH64_NONE;
285+
}
286+
return ELF::R_AARCH64_AUTH_TLSDESC_ADD_LO12;
287+
}
270288
if (RefKind == AArch64MCExpr::VK_GOT_AUTH_LO12 && IsNC) {
271289
if (IsILP32) {
272290
Ctx.reportError(Fixup.getLoc(),
@@ -411,6 +429,14 @@ unsigned AArch64ELFObjectWriter::getRelocType(MCContext &Ctx,
411429
"TLSDESC_LD64_LO12)");
412430
return ELF::R_AARCH64_NONE;
413431
}
432+
if (SymLoc == AArch64MCExpr::VK_TLSDESC_AUTH) {
433+
if (!IsILP32)
434+
return ELF::R_AARCH64_AUTH_TLSDESC_LD64_LO12;
435+
Ctx.reportError(Fixup.getLoc(), "ILP32 64-bit load/store AUTH "
436+
"relocation not supported (LP64 eqv: "
437+
"AUTH_TLSDESC_LD64_LO12)");
438+
return ELF::R_AARCH64_NONE;
439+
}
414440
Ctx.reportError(Fixup.getLoc(),
415441
"invalid fixup for 64-bit load/store instruction");
416442
return ELF::R_AARCH64_NONE;

‎llvm/lib/Target/AArch64/MCTargetDesc/AArch64MCExpr.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ StringRef AArch64MCExpr::getVariantKindName() const {
6868
case VK_TPREL_LO12: return ":tprel_lo12:";
6969
case VK_TPREL_LO12_NC: return ":tprel_lo12_nc:";
7070
case VK_TLSDESC_LO12: return ":tlsdesc_lo12:";
71+
case VK_TLSDESC_AUTH_LO12: return ":tlsdesc_auth_lo12:";
7172
case VK_ABS_PAGE: return "";
7273
case VK_ABS_PAGE_NC: return ":pg_hi21_nc:";
7374
case VK_GOT: return ":got:";
@@ -81,6 +82,8 @@ StringRef AArch64MCExpr::getVariantKindName() const {
8182
case VK_GOTTPREL_G0_NC: return ":gottprel_g0_nc:";
8283
case VK_TLSDESC: return "";
8384
case VK_TLSDESC_PAGE: return ":tlsdesc:";
85+
case VK_TLSDESC_AUTH: return "";
86+
case VK_TLSDESC_AUTH_PAGE: return ":tlsdesc_auth:";
8487
case VK_SECREL_LO12: return ":secrel_lo12:";
8588
case VK_SECREL_HI12: return ":secrel_hi12:";
8689
case VK_GOT_AUTH: return ":got_auth:";
@@ -154,6 +157,7 @@ void AArch64MCExpr::fixELFSymbolsInTLSFixups(MCAssembler &Asm) const {
154157
case VK_GOTTPREL:
155158
case VK_TPREL:
156159
case VK_TLSDESC:
160+
case VK_TLSDESC_AUTH:
157161
break;
158162
}
159163

0 commit comments

Comments
 (0)