Skip to content

Commit b0fc36d

Browse files
committed
[ELF] Remove unneeded getTargetInfo. NFC
1 parent 2575c39 commit b0fc36d

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

lld/ELF/Arch/AArch64.cpp

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,18 +1073,6 @@ void AArch64BtiPac::writePlt(uint8_t *buf, const Symbol &sym,
10731073
memcpy(buf + sizeof(addrInst) + sizeof(stdBr), nopData, sizeof(nopData));
10741074
}
10751075

1076-
static TargetInfo *getTargetInfo() {
1077-
if ((ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) ||
1078-
ctx.arg.zPacPlt) {
1079-
static AArch64BtiPac t;
1080-
return &t;
1081-
}
1082-
static AArch64 t;
1083-
return &t;
1084-
}
1085-
1086-
TargetInfo *elf::getAArch64TargetInfo() { return getTargetInfo(); }
1087-
10881076
template <class ELFT>
10891077
static void
10901078
addTaggedSymbolReferences(InputSectionBase &sec,
@@ -1187,3 +1175,13 @@ void lld::elf::createTaggedSymbols(const SmallVector<ELFFileBase *, 0> &files) {
11871175
symbol->setIsTagged(true);
11881176
}
11891177
}
1178+
1179+
TargetInfo *elf::getAArch64TargetInfo() {
1180+
if ((ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) ||
1181+
ctx.arg.zPacPlt) {
1182+
static AArch64BtiPac t;
1183+
return &t;
1184+
}
1185+
static AArch64 t;
1186+
return &t;
1187+
}

lld/ELF/Arch/X86_64.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ void RetpolineZNow::writePlt(uint8_t *buf, const Symbol &sym,
12241224
write32le(buf + 8, ctx.in.plt->getVA() - pltEntryAddr - 12);
12251225
}
12261226

1227-
static TargetInfo *getTargetInfo() {
1227+
TargetInfo *elf::getX86_64TargetInfo() {
12281228
if (ctx.arg.zRetpolineplt) {
12291229
if (ctx.arg.zNow) {
12301230
static RetpolineZNow t;
@@ -1242,5 +1242,3 @@ static TargetInfo *getTargetInfo() {
12421242
static X86_64 t;
12431243
return &t;
12441244
}
1245-
1246-
TargetInfo *elf::getX86_64TargetInfo() { return getTargetInfo(); }

0 commit comments

Comments
 (0)