Skip to content

Commit 96c4f02

Browse files
kovdan01kovdan01
committed
Address review comments
1 parent 6b5596b commit 96c4f02

File tree

5 files changed

+33
-56
lines changed

5 files changed

+33
-56
lines changed

‎lld/ELF/Relocations.cpp‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1328,39 +1328,19 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
13281328
return 1;
13291329
}
13301330

1331-
auto errBothAuthAndNonAuth = [this, &sym, offset]() {
1332-
auto diag = Err(ctx);
1333-
diag << "both AUTH and non-AUTH TLSDESC entries for '" << sym.getName()
1334-
<< "' requested, but only one type of TLSDESC entry per symbol is "
1335-
"supported";
1336-
printLocation(diag, *sec, sym, offset);
1337-
};
1338-
13391331
// Do not optimize signed TLSDESC (as described in pauthabielf64 to LE/IE).
13401332
// https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#general-restrictions
13411333
// > PAUTHELF64 only supports the descriptor based TLS (TLSDESC).
13421334
if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(expr)) {
1343-
assert(ctx.arg.emachine == EM_AARCH64);
1344-
uint16_t flags = sym.flags.load(std::memory_order_relaxed);
1345-
if (!(flags & NEEDS_TLSDESC)) {
1346-
sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
1347-
} else if (!(flags & NEEDS_TLSDESC_AUTH)) {
1348-
errBothAuthAndNonAuth();
1349-
return 1;
1350-
}
1335+
sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
13511336
sec->addReloc({expr, type, offset, addend, &sym});
13521337
return 1;
13531338
}
13541339

1355-
if (sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
1356-
assert(ctx.arg.emachine == EM_AARCH64);
1357-
// TLSDESC_CALL hint relocation probably should not be emitted by compiler
1358-
// with signed TLSDESC enabled since it does not give any value, but leave a
1359-
// check against that just in case someone uses it.
1360-
if (expr != R_TLSDESC_CALL)
1361-
errBothAuthAndNonAuth();
1362-
return 1;
1363-
}
1340+
// TLSDESC_CALL hint relocation should not be emitted by compiler with signed
1341+
// TLSDESC enabled.
1342+
if (expr == R_TLSDESC_CALL)
1343+
sym.setFlags(NEEDS_TLSDESC_NONAUTH);
13641344

13651345
bool isRISCV = ctx.arg.emachine == EM_RISCV;
13661346

@@ -1371,7 +1351,7 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
13711351
// set NEEDS_TLSDESC on the label.
13721352
if (expr != R_TLSDESC_CALL) {
13731353
if (!isRISCV || type == R_RISCV_TLSDESC_HI20)
1374-
sym.setFlags(NEEDS_TLSDESC);
1354+
sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_NONAUTH);
13751355
sec->addReloc({expr, type, offset, addend, &sym});
13761356
}
13771357
return 1;
@@ -1881,10 +1861,17 @@ void elf::postScanRelocations(Ctx &ctx) {
18811861
GotSection *got = ctx.in.got.get();
18821862

18831863
if (flags & NEEDS_TLSDESC) {
1864+
if ((flags & NEEDS_TLSDESC_AUTH) && (flags & NEEDS_TLSDESC_NONAUTH)) {
1865+
auto diag = Err(ctx);
1866+
diag << "both AUTH and non-AUTH TLSDESC entries for '" << sym.getName()
1867+
<< "' requested, but only one type of TLSDESC entry per symbol is "
1868+
"supported";
1869+
return;
1870+
}
18841871
got->addTlsDescEntry(sym);
18851872
RelType tlsDescRel = ctx.target->tlsDescRel;
18861873
if (flags & NEEDS_TLSDESC_AUTH) {
1887-
assert(ctx.arg.emachine == EM_AARCH64);
1874+
got->addTlsDescAuthEntry();
18881875
tlsDescRel = ELF::R_AARCH64_AUTH_TLSDESC;
18891876
}
18901877
ctx.mainPart->relaDyn->addAddendOnlyRelocIfNonPreemptible(

‎lld/ELF/Symbols.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ enum {
5454
NEEDS_GOT_AUTH = 1 << 9,
5555
NEEDS_GOT_NONAUTH = 1 << 10,
5656
NEEDS_TLSDESC_AUTH = 1 << 11,
57+
NEEDS_TLSDESC_NONAUTH = 1 << 12,
5758
};
5859

5960
// The base class for real symbol classes.

‎lld/ELF/SyntheticSections.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -678,14 +678,14 @@ bool GotSection::addTlsDescEntry(const Symbol &sym) {
678678
assert(sym.auxIdx == ctx.symAux.size() - 1);
679679
ctx.symAux.back().tlsDescIdx = numEntries;
680680
numEntries += 2;
681-
if (sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
682-
assert(ctx.arg.emachine == EM_AARCH64);
683-
authEntries.push_back({(numEntries - 2) * ctx.arg.wordsize, true});
684-
authEntries.push_back({(numEntries - 1) * ctx.arg.wordsize, false});
685-
}
686681
return true;
687682
}
688683

684+
void GotSection::addTlsDescAuthEntry() {
685+
authEntries.push_back({(numEntries - 2) * ctx.arg.wordsize, true});
686+
authEntries.push_back({(numEntries - 1) * ctx.arg.wordsize, false});
687+
}
688+
689689
bool GotSection::addDynTlsEntry(const Symbol &sym) {
690690
assert(sym.auxIdx == ctx.symAux.size() - 1);
691691
ctx.symAux.back().tlsGdIdx = numEntries;

‎lld/ELF/SyntheticSections.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ class GotSection final : public SyntheticSection {
114114
void addEntry(const Symbol &sym);
115115
void addAuthEntry(const Symbol &sym);
116116
bool addTlsDescEntry(const Symbol &sym);
117+
void addTlsDescAuthEntry();
117118
bool addDynTlsEntry(const Symbol &sym);
118119
bool addTlsIndex();
119120
uint32_t getTlsDescOffset(const Symbol &sym) const;

‎lld/test/ELF/aarch64-tlsdesc-pauth.s‎

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ a:
2727
adrp x0, :tlsdesc_auth:a
2828
ldr x16, [x0, :tlsdesc_auth_lo12:a]
2929
add x0, x0, :tlsdesc_auth_lo12:a
30-
.tlsdesccall a
3130
blraa x16, x0
3231

3332
// CHECK: adrp x0, 0x[[P]]000
@@ -42,7 +41,6 @@ a:
4241
adrp x0, :tlsdesc_auth:local1
4342
ldr x16, [x0, :tlsdesc_auth_lo12:local1]
4443
add x0, x0, :tlsdesc_auth_lo12:local1
45-
.tlsdesccall local1
4644
blraa x16, x0
4745

4846
// CHECK: adrp x0, 0x[[P]]000
@@ -53,7 +51,6 @@ a:
5351
adrp x0, :tlsdesc_auth:local2
5452
ldr x16, [x0, :tlsdesc_auth_lo12:local2]
5553
add x0, x0, :tlsdesc_auth_lo12:local2
56-
.tlsdesccall local2
5754
blraa x16, x0
5855

5956
// CHECK: adrp x0, 0x[[P]]000
@@ -98,47 +95,38 @@ local2:
9895
//--- err1.s
9996
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err1.s -o err1.o
10097
// RUN: not ld.lld -shared err1.o -o err1.so 2>&1 | FileCheck --check-prefix=ERR1 --implicit-check-not=error: %s
101-
// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
102-
// ERR1-NEXT: >>> defined in err1.o
103-
// ERR1-NEXT: >>> referenced by err1.o:(.text+0x10)
104-
// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
105-
// ERR1-NEXT: >>> defined in err1.o
106-
// ERR1-NEXT: >>> referenced by err1.o:(.text+0x14)
107-
// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
108-
// ERR1-NEXT: >>> defined in err1.o
109-
// ERR1-NEXT: >>> referenced by err1.o:(.text+0x18)
98+
// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
11099
.text
111100
adrp x0, :tlsdesc_auth:a
112101
ldr x16, [x0, :tlsdesc_auth_lo12:a]
113102
add x0, x0, :tlsdesc_auth_lo12:a
114-
.tlsdesccall a
115103
blraa x16, x0
116104

117105
adrp x0, :tlsdesc:a
118106
ldr x1, [x0, :tlsdesc_lo12:a]
119107
add x0, x0, :tlsdesc_lo12:a
120-
.tlsdesccall a
121108
blr x1
122109

123110
//--- err2.s
124111
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err2.s -o err2.o
125112
// RUN: not ld.lld -shared err2.o -o err2.so 2>&1 | FileCheck --check-prefix=ERR2 --implicit-check-not=error: %s
126-
// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
127-
// ERR2-NEXT: >>> defined in err2.o
128-
// ERR2-NEXT: >>> referenced by err2.o:(.text+0x10)
129-
// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
130-
// ERR2-NEXT: >>> defined in err2.o
131-
// ERR2-NEXT: >>> referenced by err2.o:(.text+0x14)
132-
// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
133-
// ERR2-NEXT: >>> defined in err2.o
134-
// ERR2-NEXT: >>> referenced by err2.o:(.text+0x18)
113+
// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
135114
.text
136115
adrp x0, :tlsdesc:a
137116
ldr x1, [x0, :tlsdesc_lo12:a]
138117
add x0, x0, :tlsdesc_lo12:a
139-
.tlsdesccall a
140118
blr x1
141119

120+
adrp x0, :tlsdesc_auth:a
121+
ldr x16, [x0, :tlsdesc_auth_lo12:a]
122+
add x0, x0, :tlsdesc_auth_lo12:a
123+
blraa x16, x0
124+
125+
//--- err3.s
126+
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err3.s -o err3.o
127+
// RUN: not ld.lld -shared err3.o -o err3.so 2>&1 | FileCheck --check-prefix=ERR3 --implicit-check-not=error: %s
128+
// ERR3: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but only one type of TLSDESC entry per symbol is supported
129+
.text
142130
adrp x0, :tlsdesc_auth:a
143131
ldr x16, [x0, :tlsdesc_auth_lo12:a]
144132
add x0, x0, :tlsdesc_auth_lo12:a

0 commit comments

Comments
 (0)