https://github.com/kovdan01 updated
https://github.com/llvm/llvm-project/pull/113817
>From 8c57e4cf99d7517079df09135f155e16cfe58e21 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Fri, 25 Oct 2024 12:32:27 +0300
Subject: [PATCH 1/9] [PAC][lld][AArch64][ELF] Support signed TLSDESC
Support `R_AARCH64_AUTH_TLSDESC_ADR_PAGE21`, `R_AARCH64_AUTH_TLSDESC_LD64_LO12`
and `R_AARCH64_AUTH_TLSDESC_LD64_LO12` static TLSDESC relocations.
---
lld/ELF/Arch/AArch64.cpp | 8 ++
lld/ELF/InputSection.cpp | 2 +
lld/ELF/Relocations.cpp | 38 +++++++-
lld/ELF/Relocations.h | 2 +
lld/ELF/Symbols.h | 1 +
lld/ELF/SyntheticSections.cpp | 5 +
lld/test/ELF/aarch64-tlsdesc-pauth.s | 134 +++++++++++++++++++++++++++
7 files changed, 188 insertions(+), 2 deletions(-)
create mode 100644 lld/test/ELF/aarch64-tlsdesc-pauth.s
diff --git a/lld/ELF/Arch/AArch64.cpp b/lld/ELF/Arch/AArch64.cpp
index 9571e0e9566fc3..68c9c5e20e0f94 100644
--- a/lld/ELF/Arch/AArch64.cpp
+++ b/lld/ELF/Arch/AArch64.cpp
@@ -157,9 +157,14 @@ RelExpr AArch64::getRelExpr(RelType type, const Symbol &s,
return RE_AARCH64_AUTH;
case R_AARCH64_TLSDESC_ADR_PAGE21:
return RE_AARCH64_TLSDESC_PAGE;
+ case R_AARCH64_AUTH_TLSDESC_ADR_PAGE21:
+ return RE_AARCH64_AUTH_TLSDESC_PAGE;
case R_AARCH64_TLSDESC_LD64_LO12:
case R_AARCH64_TLSDESC_ADD_LO12:
return R_TLSDESC;
+ case R_AARCH64_AUTH_TLSDESC_LD64_LO12:
+ case R_AARCH64_AUTH_TLSDESC_ADD_LO12:
+ return RE_AARCH64_AUTH_TLSDESC;
case R_AARCH64_TLSDESC_CALL:
return R_TLSDESC_CALL;
case R_AARCH64_TLSLE_ADD_TPREL_HI12:
@@ -542,6 +547,7 @@ void AArch64::relocate(uint8_t *loc, const Relocation &rel,
case R_AARCH64_ADR_PREL_PG_HI21:
case R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21:
case R_AARCH64_TLSDESC_ADR_PAGE21:
+ case R_AARCH64_AUTH_TLSDESC_ADR_PAGE21:
checkInt(ctx, loc, val, 33, rel);
[[fallthrough]];
case R_AARCH64_ADR_PREL_PG_HI21_NC:
@@ -592,6 +598,7 @@ void AArch64::relocate(uint8_t *loc, const Relocation &rel,
case R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC:
case R_AARCH64_TLSLE_LDST64_TPREL_LO12_NC:
case R_AARCH64_TLSDESC_LD64_LO12:
+ case R_AARCH64_AUTH_TLSDESC_LD64_LO12:
checkAlignment(ctx, loc, val, 8, rel);
write32Imm12(loc, getBits(val, 3, 11));
break;
@@ -666,6 +673,7 @@ void AArch64::relocate(uint8_t *loc, const Relocation &rel,
break;
case R_AARCH64_TLSLE_ADD_TPREL_LO12_NC:
case R_AARCH64_TLSDESC_ADD_LO12:
+ case R_AARCH64_AUTH_TLSDESC_ADD_LO12:
write32Imm12(loc, val);
break;
case R_AARCH64_TLSDESC:
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 26dc5c606f57f9..8b9f687b34f308 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -965,12 +965,14 @@ uint64_t InputSectionBase::getRelocTargetVA(Ctx &ctx,
const Relocation &r,
case R_SIZE:
return r.sym->getSize() + a;
case R_TLSDESC:
+ case RelExpr::R_AARCH64_AUTH_TLSDESC:
return ctx.in.got->getTlsDescAddr(*r.sym) + a;
case R_TLSDESC_PC:
return ctx.in.got->getTlsDescAddr(*r.sym) + a - p;
case R_TLSDESC_GOTPLT:
return ctx.in.got->getTlsDescAddr(*r.sym) + a - ctx.in.gotPlt->getVA();
case RE_AARCH64_TLSDESC_PAGE:
+ case RE_AARCH64_AUTH_TLSDESC_PAGE:
return getAArch64Page(ctx.in.got->getTlsDescAddr(*r.sym) + a) -
getAArch64Page(p);
case RE_LOONGARCH_TLSDESC_PAGE_PC:
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 07f341293156ac..ced61876f54797 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1342,6 +1342,36 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
return 1;
}
+ auto fatalBothAuthAndNonAuth = [&sym]() {
+ fatal("both AUTH and non-AUTH TLSDESC entries for '" + sym.getName() +
+ "' requested, but only one type of TLSDESC entry per symbol is "
+ "supported");
+ };
+
+ // Do not optimize signed TLSDESC as described in pauthabielf64 to LE/IE.
+ //
https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#general-restrictions
+ // > PAUTHELF64 only supports the descriptor based TLS (TLSDESC).
+ if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(
+ expr)) {
+ assert(ctx.arg.emachine == EM_AARCH64);
+ if (!sym.hasFlag(NEEDS_TLSDESC))
+ sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
+ else if (!sym.hasFlag(NEEDS_TLSDESC_AUTH))
+ fatalBothAuthAndNonAuth();
+ sec->addReloc({expr, type, offset, addend, &sym});
+ return 1;
+ }
+
+ if (sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
+ assert(ctx.arg.emachine == EM_AARCH64);
+ // TLSDESC_CALL hint relocation probably should not be emitted by compiler
+ // with signed TLSDESC enabled since it does not give any value, but leave
a
+ // check against that just in case someone uses it.
+ if (expr != R_TLSDESC_CALL)
+ fatalBothAuthAndNonAuth();
+ return 1;
+ }
+
bool isRISCV = ctx.arg.emachine == EM_RISCV;
if (oneof<RE_AARCH64_TLSDESC_PAGE, R_TLSDESC, R_TLSDESC_CALL, R_TLSDESC_PC,
@@ -1845,9 +1875,13 @@ void elf::postScanRelocations(Ctx &ctx) {
if (flags & NEEDS_TLSDESC) {
got->addTlsDescEntry(sym);
+ RelType tlsDescRel = ctx.target->tlsDescRel;
+ if (flags & NEEDS_TLSDESC_AUTH) {
+ assert(ctx.arg.emachine == EM_AARCH64);
+ tlsDescRel = ELF::R_AARCH64_AUTH_TLSDESC;
+ }
ctx.mainPart->relaDyn->addAddendOnlyRelocIfNonPreemptible(
- ctx.target->tlsDescRel, *got, got->getTlsDescOffset(sym), sym,
- ctx.target->tlsDescRel);
+ tlsDescRel, *got, got->getTlsDescOffset(sym), sym, tlsDescRel);
}
if (flags & NEEDS_TLSGD) {
got->addDynTlsEntry(sym);
diff --git a/lld/ELF/Relocations.h b/lld/ELF/Relocations.h
index 50487206a8b6db..32b3187cdc48a5 100644
--- a/lld/ELF/Relocations.h
+++ b/lld/ELF/Relocations.h
@@ -97,6 +97,8 @@ enum RelExpr {
RE_AARCH64_PAGE_PC,
RE_AARCH64_RELAX_TLS_GD_TO_IE_PAGE_PC,
RE_AARCH64_TLSDESC_PAGE,
+ RE_AARCH64_AUTH_TLSDESC_PAGE,
+ RE_AARCH64_AUTH_TLSDESC,
RE_AARCH64_AUTH,
RE_ARM_PCA,
RE_ARM_SBREL,
diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index 388644834d025a..9d4caeed9c497a 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -52,6 +52,7 @@ enum {
NEEDS_GOT_DTPREL = 1 << 7,
NEEDS_TLSIE = 1 << 8,
NEEDS_GOT_AUTH = 1 << 9,
+ NEEDS_TLSDESC_AUTH = 1 << 10,
};
// The base class for real symbol classes.
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
index 28bef2341a9713..3bf60a279e6656 100644
--- a/lld/ELF/SyntheticSections.cpp
+++ b/lld/ELF/SyntheticSections.cpp
@@ -676,6 +676,11 @@ bool GotSection::addTlsDescEntry(const Symbol &sym) {
assert(sym.auxIdx == ctx.symAux.size() - 1);
ctx.symAux.back().tlsDescIdx = numEntries;
numEntries += 2;
+ if (sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
+ assert(ctx.arg.emachine == EM_AARCH64);
+ authEntries.push_back({(numEntries - 2) * ctx.arg.wordsize, true});
+ authEntries.push_back({(numEntries - 1) * ctx.arg.wordsize, false});
+ }
return true;
}
diff --git a/lld/test/ELF/aarch64-tlsdesc-pauth.s
b/lld/test/ELF/aarch64-tlsdesc-pauth.s
new file mode 100644
index 00000000000000..36505f652b0c52
--- /dev/null
+++ b/lld/test/ELF/aarch64-tlsdesc-pauth.s
@@ -0,0 +1,134 @@
+// REQUIRES: aarch64
+// RUN: rm -rf %t && split-file %s %t && cd %t
+
+//--- a.s
+
+.section .tbss,"awT",@nobits
+.global a
+a:
+.xword 0
+
+//--- ok.s
+
+// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth ok.s -o
ok.o
+// RUN: ld.lld -shared ok.o -o ok.so
+// RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn ok.so | \
+// RUN: FileCheck -DP=20 -DA=896 -DB=912 -DC=928 %s
+// RUN: llvm-readobj -r -x .got ok.so | FileCheck --check-prefix=REL \
+// RUN: -DP1=20 -DA1=380 -DB1=390 -DC1=3A0 -DP2=020 -DA2=380 -DB2=390
-DC2=3a0 %s
+
+// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth a.s -o
a.so.o
+// RUN: ld.lld -shared a.so.o -soname=so -o a.so
+// RUN: ld.lld ok.o a.so -o ok
+// RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn ok | \
+// RUN: FileCheck -DP=220 -DA=936 -DB=952 -DC=968 %s
+// RUN: llvm-readobj -r -x .got ok | FileCheck --check-prefix=REL \
+// RUN: -DP1=220 -DA1=3A8 -DB1=3B8 -DC1=3C8 -DP2=220 -DA2=3a8 -DB2=3b8
-DC2=3c8 %s
+
+ .text
+ adrp x0, :tlsdesc_auth:a
+ ldr x16, [x0, :tlsdesc_auth_lo12:a]
+ add x0, x0, :tlsdesc_auth_lo12:a
+ .tlsdesccall a
+ blraa x16, x0
+
+// CHECK: adrp x0, 0x[[P]]000
+// CHECK-NEXT: ldr x16, [x0, #[[A]]]
+// CHECK-NEXT: add x0, x0, #[[A]]
+// CHECK-NEXT: blraa x16, x0
+
+// Create relocation against local TLS symbols where linker should
+// create target specific dynamic TLSDESC relocation where addend is
+// the symbol VMA in tls block.
+
+ adrp x0, :tlsdesc_auth:local1
+ ldr x16, [x0, :tlsdesc_auth_lo12:local1]
+ add x0, x0, :tlsdesc_auth_lo12:local1
+ .tlsdesccall local1
+ blraa x16, x0
+
+// CHECK: adrp x0, 0x[[P]]000
+// CHECK-NEXT: ldr x16, [x0, #[[B]]]
+// CHECK-NEXT: add x0, x0, #[[B]]
+// CHECK-NEXT: blraa x16, x0
+
+ adrp x0, :tlsdesc_auth:local2
+ ldr x16, [x0, :tlsdesc_auth_lo12:local2]
+ add x0, x0, :tlsdesc_auth_lo12:local2
+ .tlsdesccall local2
+ blraa x16, x0
+
+// CHECK: adrp x0, 0x[[P]]000
+// CHECK-NEXT: ldr x16, [x0, #[[C]]]
+// CHECK-NEXT: add x0, x0, #[[C]]
+// CHECK-NEXT: blraa x16, x0
+
+ .section .tbss,"awT",@nobits
+ .type local1,@object
+ .p2align 2
+local1:
+ .word 0
+ .size local1, 4
+
+ .type local2,@object
+ .p2align 3
+local2:
+ .xword 0
+ .size local2, 8
+
+
+// R_AARCH64_AUTH_TLSDESC - 0x0 -> start of tls block
+// R_AARCH64_AUTH_TLSDESC - 0x8 -> align (sizeof (local1), 8)
+
+// REL: Relocations [
+// REL-NEXT: Section (5) .rela.dyn {
+// REL-NEXT: 0x[[P1]][[B1]] R_AARCH64_AUTH_TLSDESC - 0x0
+// REL-NEXT: 0x[[P1]][[C1]] R_AARCH64_AUTH_TLSDESC - 0x8
+// REL-NEXT: 0x[[P1]][[A1]] R_AARCH64_AUTH_TLSDESC a 0x0
+// REL-NEXT: }
+// REL-NEXT: ]
+
+// REL: Hex dump of section '.got':
+// REL-NEXT: 0x00[[P2]][[A2]] 00000000 00000080 00000000 000000a0
+// REL-NEXT: 0x00[[P2]][[B2]] 00000000 00000080 00000000 000000a0
+// REL-NEXT: 0x00[[P2]][[C2]] 00000000 00000080 00000000 000000a0
+// ^^
+// 0b10000000 bit 63 address
diversity = true, bits 61..60 key = IA
+// ^^
+// 0b10100000 bit
63 address diversity = true, bits 61..60 key = DA
+
+//--- err1.s
+
+// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err1.s -o
err1.o
+// RUN: not ld.lld -shared err1.o -o err1.so 2>&1 | FileCheck
--check-prefix=ERR1 %s
+// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but
only one type of TLSDESC entry per symbol is supported
+ .text
+ adrp x0, :tlsdesc_auth:a
+ ldr x16, [x0, :tlsdesc_auth_lo12:a]
+ add x0, x0, :tlsdesc_auth_lo12:a
+ .tlsdesccall a
+ blraa x16, x0
+
+ adrp x0, :tlsdesc:a
+ ldr x1, [x0, :tlsdesc_lo12:a]
+ add x0, x0, :tlsdesc_lo12:a
+ .tlsdesccall a
+ blr x1
+
+//--- err2.s
+
+// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err2.s -o
err2.o
+// RUN: not ld.lld -shared err2.o -o err2.so 2>&1 | FileCheck
--check-prefix=ERR2 %s
+// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but
only one type of TLSDESC entry per symbol is supported
+ .text
+ adrp x0, :tlsdesc:a
+ ldr x1, [x0, :tlsdesc_lo12:a]
+ add x0, x0, :tlsdesc_lo12:a
+ .tlsdesccall a
+ blr x1
+
+ adrp x0, :tlsdesc_auth:a
+ ldr x16, [x0, :tlsdesc_auth_lo12:a]
+ add x0, x0, :tlsdesc_auth_lo12:a
+ .tlsdesccall a
+ blraa x16, x0
>From 8f7109c12ba2babf1ba9f7db6eaa3500f53fe0df Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Fri, 1 Nov 2024 13:31:14 +0300
Subject: [PATCH 2/9] Address review comments
---
lld/ELF/Relocations.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index ced61876f54797..40f3881c25455c 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1348,7 +1348,7 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
"supported");
};
- // Do not optimize signed TLSDESC as described in pauthabielf64 to LE/IE.
+ // Do not optimize signed TLSDESC (as described in pauthabielf64 to LE/IE).
//
https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#general-restrictions
// > PAUTHELF64 only supports the descriptor based TLS (TLSDESC).
if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(
>From 87b0539917072f1a6013a5ce2dfbe0bc85cd964b Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Sun, 10 Nov 2024 20:02:24 +0300
Subject: [PATCH 3/9] Use /// for comments in tests
---
lld/test/ELF/aarch64-tlsdesc-pauth.s | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/lld/test/ELF/aarch64-tlsdesc-pauth.s
b/lld/test/ELF/aarch64-tlsdesc-pauth.s
index 36505f652b0c52..3c920c98cac6d2 100644
--- a/lld/test/ELF/aarch64-tlsdesc-pauth.s
+++ b/lld/test/ELF/aarch64-tlsdesc-pauth.s
@@ -37,9 +37,9 @@ a:
// CHECK-NEXT: add x0, x0, #[[A]]
// CHECK-NEXT: blraa x16, x0
-// Create relocation against local TLS symbols where linker should
-// create target specific dynamic TLSDESC relocation where addend is
-// the symbol VMA in tls block.
+/// Create relocation against local TLS symbols where linker should
+/// create target specific dynamic TLSDESC relocation where addend is
+/// the symbol VMA in tls block.
adrp x0, :tlsdesc_auth:local1
ldr x16, [x0, :tlsdesc_auth_lo12:local1]
@@ -92,10 +92,10 @@ local2:
// REL-NEXT: 0x00[[P2]][[A2]] 00000000 00000080 00000000 000000a0
// REL-NEXT: 0x00[[P2]][[B2]] 00000000 00000080 00000000 000000a0
// REL-NEXT: 0x00[[P2]][[C2]] 00000000 00000080 00000000 000000a0
-// ^^
-// 0b10000000 bit 63 address
diversity = true, bits 61..60 key = IA
-// ^^
-// 0b10100000 bit
63 address diversity = true, bits 61..60 key = DA
+/// ^^
+/// 0b10000000 bit 63 address
diversity = true, bits 61..60 key = IA
+/// ^^
+/// 0b10100000 bit
63 address diversity = true, bits 61..60 key = DA
//--- err1.s
>From 2acceb168f6a2da68dde0a641b2b4a9ce0705994 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Sun, 10 Nov 2024 20:38:36 +0300
Subject: [PATCH 4/9] Use `Err(ctx)` instead of `fatal` and use `getLocation`
in error message
---
lld/ELF/Relocations.cpp | 19 +++++++++++--------
lld/test/ELF/aarch64-tlsdesc-pauth.s | 8 ++++++--
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 40f3881c25455c..1d46f4e071bc5d 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1342,10 +1342,11 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
return 1;
}
- auto fatalBothAuthAndNonAuth = [&sym]() {
- fatal("both AUTH and non-AUTH TLSDESC entries for '" + sym.getName() +
- "' requested, but only one type of TLSDESC entry per symbol is "
- "supported");
+ auto errBothAuthAndNonAuth = [this, &sym, offset]() {
+ Err(ctx) << "both AUTH and non-AUTH TLSDESC entries for '" << sym.getName()
+ << "' requested, but only one type of TLSDESC entry per symbol is
"
+ "supported"
+ << getLocation(ctx, *sec, sym, offset);
};
// Do not optimize signed TLSDESC (as described in pauthabielf64 to LE/IE).
@@ -1354,10 +1355,12 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(
expr)) {
assert(ctx.arg.emachine == EM_AARCH64);
- if (!sym.hasFlag(NEEDS_TLSDESC))
+ if (!sym.hasFlag(NEEDS_TLSDESC)) {
sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
- else if (!sym.hasFlag(NEEDS_TLSDESC_AUTH))
- fatalBothAuthAndNonAuth();
+ } else if (!sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
+ errBothAuthAndNonAuth();
+ return 1;
+ }
sec->addReloc({expr, type, offset, addend, &sym});
return 1;
}
@@ -1368,7 +1371,7 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
// with signed TLSDESC enabled since it does not give any value, but leave
a
// check against that just in case someone uses it.
if (expr != R_TLSDESC_CALL)
- fatalBothAuthAndNonAuth();
+ errBothAuthAndNonAuth();
return 1;
}
diff --git a/lld/test/ELF/aarch64-tlsdesc-pauth.s
b/lld/test/ELF/aarch64-tlsdesc-pauth.s
index 3c920c98cac6d2..92e54c02662e46 100644
--- a/lld/test/ELF/aarch64-tlsdesc-pauth.s
+++ b/lld/test/ELF/aarch64-tlsdesc-pauth.s
@@ -101,7 +101,9 @@ local2:
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err1.s -o
err1.o
// RUN: not ld.lld -shared err1.o -o err1.so 2>&1 | FileCheck
--check-prefix=ERR1 %s
-// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but
only one type of TLSDESC entry per symbol is supported
+// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
+// ERR1-NEXT: >>> defined in err1.o
+// ERR1-NEXT: >>> referenced by err1.o:(.text+0x10)
.text
adrp x0, :tlsdesc_auth:a
ldr x16, [x0, :tlsdesc_auth_lo12:a]
@@ -119,7 +121,9 @@ local2:
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err2.s -o
err2.o
// RUN: not ld.lld -shared err2.o -o err2.so 2>&1 | FileCheck
--check-prefix=ERR2 %s
-// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested, but
only one type of TLSDESC entry per symbol is supported
+// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
+// ERR2-NEXT: >>> defined in err2.o
+// ERR2-NEXT: >>> referenced by err2.o:(.text+0x10)
.text
adrp x0, :tlsdesc:a
ldr x1, [x0, :tlsdesc_lo12:a]
>From 9b632094d8428e3673adf43761c38fe91d6bffa9 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Sun, 10 Nov 2024 21:59:47 +0300
Subject: [PATCH 5/9] Check multiple errors emitted
---
lld/ELF/Relocations.cpp | 5 +++--
lld/test/ELF/aarch64-tlsdesc-pauth.s | 12 ++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 1d46f4e071bc5d..fa66a4d0c579b0 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1355,9 +1355,10 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(
expr)) {
assert(ctx.arg.emachine == EM_AARCH64);
- if (!sym.hasFlag(NEEDS_TLSDESC)) {
+ uint16_t flags = sym.flags.load(std::memory_order_relaxed);
+ if (!(flags & NEEDS_TLSDESC)) {
sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
- } else if (!sym.hasFlag(NEEDS_TLSDESC_AUTH)) {
+ } else if (!(flags & NEEDS_TLSDESC_AUTH)) {
errBothAuthAndNonAuth();
return 1;
}
diff --git a/lld/test/ELF/aarch64-tlsdesc-pauth.s
b/lld/test/ELF/aarch64-tlsdesc-pauth.s
index 92e54c02662e46..106a1b729fbf64 100644
--- a/lld/test/ELF/aarch64-tlsdesc-pauth.s
+++ b/lld/test/ELF/aarch64-tlsdesc-pauth.s
@@ -104,6 +104,12 @@ local2:
// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
// ERR1-NEXT: >>> defined in err1.o
// ERR1-NEXT: >>> referenced by err1.o:(.text+0x10)
+// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
+// ERR1-NEXT: >>> defined in err1.o
+// ERR1-NEXT: >>> referenced by err1.o:(.text+0x14)
+// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
+// ERR1-NEXT: >>> defined in err1.o
+// ERR1-NEXT: >>> referenced by err1.o:(.text+0x18)
.text
adrp x0, :tlsdesc_auth:a
ldr x16, [x0, :tlsdesc_auth_lo12:a]
@@ -124,6 +130,12 @@ local2:
// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
// ERR2-NEXT: >>> defined in err2.o
// ERR2-NEXT: >>> referenced by err2.o:(.text+0x10)
+// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
+// ERR2-NEXT: >>> defined in err2.o
+// ERR2-NEXT: >>> referenced by err2.o:(.text+0x14)
+// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
+// ERR2-NEXT: >>> defined in err2.o
+// ERR2-NEXT: >>> referenced by err2.o:(.text+0x18)
.text
adrp x0, :tlsdesc:a
ldr x1, [x0, :tlsdesc_lo12:a]
>From 458f748629d2d443ee2c56f6de049d9622181a13 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Mon, 2 Dec 2024 01:16:23 +0300
Subject: [PATCH 6/9] Use `Err(ctx)` instead of `fatal` and use `getLocation`
in error message
---
lld/ELF/Relocations.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index fa66a4d0c579b0..1024453d844fb3 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1343,10 +1343,11 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
}
auto errBothAuthAndNonAuth = [this, &sym, offset]() {
- Err(ctx) << "both AUTH and non-AUTH TLSDESC entries for '" << sym.getName()
- << "' requested, but only one type of TLSDESC entry per symbol is
"
- "supported"
- << getLocation(ctx, *sec, sym, offset);
+ auto diag = Err(ctx);
+ diag << "both AUTH and non-AUTH TLSDESC entries for '" << sym.getName()
+ << "' requested, but only one type of TLSDESC entry per symbol is "
+ "supported";
+ printLocation(diag, *sec, sym, offset);
};
// Do not optimize signed TLSDESC (as described in pauthabielf64 to LE/IE).
>From 72d6e0ca1b58c38f6d62493bf1d1567ed9c7e941 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Mon, 2 Dec 2024 01:23:21 +0300
Subject: [PATCH 7/9] Address review comments
---
lld/test/ELF/aarch64-tlsdesc-pauth.s | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/lld/test/ELF/aarch64-tlsdesc-pauth.s
b/lld/test/ELF/aarch64-tlsdesc-pauth.s
index 106a1b729fbf64..71106267f12820 100644
--- a/lld/test/ELF/aarch64-tlsdesc-pauth.s
+++ b/lld/test/ELF/aarch64-tlsdesc-pauth.s
@@ -2,14 +2,12 @@
// RUN: rm -rf %t && split-file %s %t && cd %t
//--- a.s
-
.section .tbss,"awT",@nobits
.global a
a:
.xword 0
//--- ok.s
-
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth ok.s -o
ok.o
// RUN: ld.lld -shared ok.o -o ok.so
// RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn ok.so | \
@@ -98,9 +96,8 @@ local2:
/// 0b10100000 bit
63 address diversity = true, bits 61..60 key = DA
//--- err1.s
-
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err1.s -o
err1.o
-// RUN: not ld.lld -shared err1.o -o err1.so 2>&1 | FileCheck
--check-prefix=ERR1 %s
+// RUN: not ld.lld -shared err1.o -o err1.so 2>&1 | FileCheck
--check-prefix=ERR1 --implicit-check-not=error: %s
// ERR1: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
// ERR1-NEXT: >>> defined in err1.o
// ERR1-NEXT: >>> referenced by err1.o:(.text+0x10)
@@ -124,9 +121,8 @@ local2:
blr x1
//--- err2.s
-
// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err2.s -o
err2.o
-// RUN: not ld.lld -shared err2.o -o err2.so 2>&1 | FileCheck
--check-prefix=ERR2 %s
+// RUN: not ld.lld -shared err2.o -o err2.so 2>&1 | FileCheck
--check-prefix=ERR2 --implicit-check-not=error: %s
// ERR2: error: both AUTH and non-AUTH TLSDESC entries for 'a' requested,
but only one type of TLSDESC entry per symbol is supported
// ERR2-NEXT: >>> defined in err2.o
// ERR2-NEXT: >>> referenced by err2.o:(.text+0x10)
>From a41e25d36f71591995ac7d97fa120395f7caf443 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Wed, 4 Dec 2024 14:55:52 +0300
Subject: [PATCH 8/9] Fix build after #118424
---
lld/ELF/InputSection.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lld/ELF/InputSection.cpp b/lld/ELF/InputSection.cpp
index 8b9f687b34f308..d44910dc3b5ffe 100644
--- a/lld/ELF/InputSection.cpp
+++ b/lld/ELF/InputSection.cpp
@@ -965,7 +965,7 @@ uint64_t InputSectionBase::getRelocTargetVA(Ctx &ctx, const
Relocation &r,
case R_SIZE:
return r.sym->getSize() + a;
case R_TLSDESC:
- case RelExpr::R_AARCH64_AUTH_TLSDESC:
+ case RE_AARCH64_AUTH_TLSDESC:
return ctx.in.got->getTlsDescAddr(*r.sym) + a;
case R_TLSDESC_PC:
return ctx.in.got->getTlsDescAddr(*r.sym) + a - p;
>From 01261d05229118c5aaf587554a3300a6593f580e Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkova...@accesssoftek.com>
Date: Wed, 4 Dec 2024 15:02:07 +0300
Subject: [PATCH 9/9] Fix formatting
---
lld/ELF/Relocations.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index 1024453d844fb3..c93f87038639bf 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1353,8 +1353,7 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr
expr, RelType type,
// Do not optimize signed TLSDESC (as described in pauthabielf64 to LE/IE).
//
https://github.com/ARM-software/abi-aa/blob/main/pauthabielf64/pauthabielf64.rst#general-restrictions
// > PAUTHELF64 only supports the descriptor based TLS (TLSDESC).
- if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(
- expr)) {
+ if (oneof<RE_AARCH64_AUTH_TLSDESC_PAGE, RE_AARCH64_AUTH_TLSDESC>(expr)) {
assert(ctx.arg.emachine == EM_AARCH64);
uint16_t flags = sym.flags.load(std::memory_order_relaxed);
if (!(flags & NEEDS_TLSDESC)) {
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
