[llvm-branch-commits] [lld] [PAC][lld][AArch64][ELF] Support signed TLSDESC (PR #113817)

Daniil Kovalev via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Sun Dec 8 06:08:10 PST 2024


https://github.com/kovdan01 updated https://github.com/llvm/llvm-project/pull/113817

>From 717771ed63181be2935137304842c27f621acefd Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Fri, 25 Oct 2024 12:32:27 +0300
Subject: [PATCH 01/10] [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 1a13958c9b6c1b..42aa85f4bc61da 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1327,6 +1327,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,
@@ -1847,9 +1877,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 d993ab77adc3cc..346656c5d374d2 100644
--- a/lld/ELF/Relocations.h
+++ b/lld/ELF/Relocations.h
@@ -98,6 +98,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 776b82a6b53c8d..5472e66f50f124 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -53,6 +53,7 @@ enum {
   NEEDS_TLSIE = 1 << 8,
   NEEDS_GOT_AUTH = 1 << 9,
   NEEDS_GOT_NONAUTH = 1 << 10,
+  NEEDS_TLSDESC_AUTH = 1 << 11,
 };
 
 // The base class for real symbol classes.
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
index f69a27b946c9a5..3bdd65df7e5e85 100644
--- a/lld/ELF/SyntheticSections.cpp
+++ b/lld/ELF/SyntheticSections.cpp
@@ -678,6 +678,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", at 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", at nobits
+        .type   local1, at object
+        .p2align 2
+local1:
+        .word   0
+        .size   local1, 4
+
+        .type   local2, at 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 ed1b66c83fb94c2e75a8179597910c9cacf95a7c Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Fri, 1 Nov 2024 13:31:14 +0300
Subject: [PATCH 02/10] 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 42aa85f4bc61da..eef694120e0777 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1333,7 +1333,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 a0157179ce7345c129177786e142530d0531d617 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Sun, 10 Nov 2024 20:02:24 +0300
Subject: [PATCH 03/10] 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 b262e694990cdc42d0af1a4f50d6ec77e55a6f0e Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Sun, 10 Nov 2024 20:38:36 +0300
Subject: [PATCH 04/10] 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 eef694120e0777..b4e3527123fcb2 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1327,10 +1327,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).
@@ -1339,10 +1340,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;
   }
@@ -1353,7 +1356,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 1af224b54a54b617f5681ec5aec47de5e9004b2e Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Sun, 10 Nov 2024 21:59:47 +0300
Subject: [PATCH 05/10] 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 b4e3527123fcb2..043c4868280d05 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1340,9 +1340,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 a9b8335546910519dbcf3155c2574b1c786884e4 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Mon, 2 Dec 2024 01:16:23 +0300
Subject: [PATCH 06/10] 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 043c4868280d05..7458f57da1e4c0 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1328,10 +1328,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 e691533daeb360ad84f8f86b34e53d4058ef27df Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Mon, 2 Dec 2024 01:23:21 +0300
Subject: [PATCH 07/10] 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", at 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 48b0bc6c640854cf370fe25614db59aa09920a00 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Wed, 4 Dec 2024 14:55:52 +0300
Subject: [PATCH 08/10] 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 d665dd148f38cc14ed1bc8323143fb06c0ed5a15 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Wed, 4 Dec 2024 15:02:07 +0300
Subject: [PATCH 09/10] 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 7458f57da1e4c0..fb2421ebcffe28 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1338,8 +1338,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)) {

>From 43ea166c3b9ef8ff395f47de4ea3d24d4de0e440 Mon Sep 17 00:00:00 2001
From: Daniil Kovalev <dkovalev at accesssoftek.com>
Date: Sun, 8 Dec 2024 16:35:07 +0300
Subject: [PATCH 10/10] Address review comments

---
 lld/ELF/Relocations.cpp              | 41 ++++++++++------------------
 lld/ELF/Symbols.h                    |  1 +
 lld/ELF/SyntheticSections.cpp        | 10 +++----
 lld/ELF/SyntheticSections.h          |  1 +
 lld/test/ELF/aarch64-tlsdesc-pauth.s | 36 ++++++++----------------
 5 files changed, 33 insertions(+), 56 deletions(-)

diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp
index fb2421ebcffe28..4e22ee3ed1c384 100644
--- a/lld/ELF/Relocations.cpp
+++ b/lld/ELF/Relocations.cpp
@@ -1327,39 +1327,19 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
     return 1;
   }
 
-  auto errBothAuthAndNonAuth = [this, &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).
   // 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);
-    uint16_t flags = sym.flags.load(std::memory_order_relaxed);
-    if (!(flags & NEEDS_TLSDESC)) {
-      sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
-    } else if (!(flags & NEEDS_TLSDESC_AUTH)) {
-      errBothAuthAndNonAuth();
-      return 1;
-    }
+    sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_AUTH);
     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)
-      errBothAuthAndNonAuth();
-    return 1;
-  }
+  // TLSDESC_CALL hint relocation should not be emitted by compiler with signed
+  // TLSDESC enabled.
+  if (expr == R_TLSDESC_CALL)
+    sym.setFlags(NEEDS_TLSDESC_NONAUTH);
 
   bool isRISCV = ctx.arg.emachine == EM_RISCV;
 
@@ -1370,7 +1350,7 @@ unsigned RelocationScanner::handleTlsRelocation(RelExpr expr, RelType type,
     // set NEEDS_TLSDESC on the label.
     if (expr != R_TLSDESC_CALL) {
       if (!isRISCV || type == R_RISCV_TLSDESC_HI20)
-        sym.setFlags(NEEDS_TLSDESC);
+        sym.setFlags(NEEDS_TLSDESC | NEEDS_TLSDESC_NONAUTH);
       sec->addReloc({expr, type, offset, addend, &sym});
     }
     return 1;
@@ -1880,10 +1860,17 @@ void elf::postScanRelocations(Ctx &ctx) {
     GotSection *got = ctx.in.got.get();
 
     if (flags & NEEDS_TLSDESC) {
+      if ((flags & NEEDS_TLSDESC_AUTH) && (flags & NEEDS_TLSDESC_NONAUTH)) {
+        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";
+        return;
+      }
       got->addTlsDescEntry(sym);
       RelType tlsDescRel = ctx.target->tlsDescRel;
       if (flags & NEEDS_TLSDESC_AUTH) {
-        assert(ctx.arg.emachine == EM_AARCH64);
+        got->addTlsDescAuthEntry();
         tlsDescRel = ELF::R_AARCH64_AUTH_TLSDESC;
       }
       ctx.mainPart->relaDyn->addAddendOnlyRelocIfNonPreemptible(
diff --git a/lld/ELF/Symbols.h b/lld/ELF/Symbols.h
index 5472e66f50f124..16aa6672a26cbb 100644
--- a/lld/ELF/Symbols.h
+++ b/lld/ELF/Symbols.h
@@ -54,6 +54,7 @@ enum {
   NEEDS_GOT_AUTH = 1 << 9,
   NEEDS_GOT_NONAUTH = 1 << 10,
   NEEDS_TLSDESC_AUTH = 1 << 11,
+  NEEDS_TLSDESC_NONAUTH = 1 << 12,
 };
 
 // The base class for real symbol classes.
diff --git a/lld/ELF/SyntheticSections.cpp b/lld/ELF/SyntheticSections.cpp
index 3bdd65df7e5e85..e3cd5a4687c087 100644
--- a/lld/ELF/SyntheticSections.cpp
+++ b/lld/ELF/SyntheticSections.cpp
@@ -678,14 +678,14 @@ 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;
 }
 
+void GotSection::addTlsDescAuthEntry() {
+  authEntries.push_back({(numEntries - 2) * ctx.arg.wordsize, true});
+  authEntries.push_back({(numEntries - 1) * ctx.arg.wordsize, false});
+}
+
 bool GotSection::addDynTlsEntry(const Symbol &sym) {
   assert(sym.auxIdx == ctx.symAux.size() - 1);
   ctx.symAux.back().tlsGdIdx = numEntries;
diff --git a/lld/ELF/SyntheticSections.h b/lld/ELF/SyntheticSections.h
index fd496a68f6bd99..c161f3f9c747e8 100644
--- a/lld/ELF/SyntheticSections.h
+++ b/lld/ELF/SyntheticSections.h
@@ -114,6 +114,7 @@ class GotSection final : public SyntheticSection {
   void addEntry(const Symbol &sym);
   void addAuthEntry(const Symbol &sym);
   bool addTlsDescEntry(const Symbol &sym);
+  void addTlsDescAuthEntry();
   bool addDynTlsEntry(const Symbol &sym);
   bool addTlsIndex();
   uint32_t getTlsDescOffset(const Symbol &sym) const;
diff --git a/lld/test/ELF/aarch64-tlsdesc-pauth.s b/lld/test/ELF/aarch64-tlsdesc-pauth.s
index 71106267f12820..dca57241d7f18a 100644
--- a/lld/test/ELF/aarch64-tlsdesc-pauth.s
+++ b/lld/test/ELF/aarch64-tlsdesc-pauth.s
@@ -27,7 +27,6 @@ a:
         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
@@ -42,7 +41,6 @@ a:
         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
@@ -53,7 +51,6 @@ a:
         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
@@ -98,47 +95,38 @@ local2:
 //--- 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 --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)
-// 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)
+// 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 --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)
-// 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)
+// 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
+        blraa   x16, x0
+
+//--- err3.s
+// RUN: llvm-mc -filetype=obj -triple=aarch64-pc-linux -mattr=+pauth err3.s -o err3.o
+// RUN: not ld.lld -shared err3.o -o err3.so 2>&1 | FileCheck --check-prefix=ERR3 --implicit-check-not=error: %s
+// ERR3: 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



More information about the llvm-branch-commits mailing list