Address review comments

Author: kovdan01

lld/ELF/Relocations.cpp

@@ -913,6 +913,7 @@ void elf::addGotEntry(Ctx &ctx, Symbol &sym) {
 
 static void addGotAuthEntry(Ctx &ctx, Symbol &sym) {
   ctx.in.got->addEntry(sym);
+  ctx.in.got->addAuthEntry(sym);
   uint64_t off = sym.getGotOffset(ctx);
 
   // If preemptible, emit a GLOB_DAT relocation.
@@ -1095,18 +1096,10 @@ void RelocationScanner::processAux(RelExpr expr, RelType type, uint64_t offset,
     } else if (!sym.isTls() || ctx.arg.emachine != EM_LOONGARCH) {
       // Many LoongArch TLS relocs reuse the RE_LOONGARCH_GOT type, in which
       // case the NEEDS_GOT flag shouldn't get set.
-      bool needsGotAuth =
-          (expr == RE_AARCH64_AUTH_GOT || expr == RE_AARCH64_AUTH_GOT_PAGE_PC);
-      uint16_t flags = sym.flags.load(std::memory_order_relaxed);
-      if (!(flags & NEEDS_GOT)) {
-        sym.setFlags(needsGotAuth ? (NEEDS_GOT | NEEDS_GOT_AUTH) : NEEDS_GOT);
-      } else if (needsGotAuth != static_cast<bool>(flags & NEEDS_GOT_AUTH)) {
-        auto diag = Err(ctx);
-        diag << "both AUTH and non-AUTH GOT entries for '" << sym.getName()
-             << "' requested, but only one type of GOT entry per symbol is "
-                "supported";
-        printLocation(diag, *sec, sym, offset);
-      }
+      if (expr == RE_AARCH64_AUTH_GOT || expr == RE_AARCH64_AUTH_GOT_PAGE_PC)
+        sym.setFlags(NEEDS_GOT | NEEDS_GOT_AUTH);
+      else
+        sym.setFlags(NEEDS_GOT | NEEDS_GOT_NONAUTH);
     }
   } else if (needsPlt(expr)) {
     sym.setFlags(NEEDS_PLT);
@@ -1807,6 +1800,12 @@ void elf::postScanRelocations(Ctx &ctx) {
     sym.allocateAux(ctx);
 
     if (flags & NEEDS_GOT) {
+      if ((flags & NEEDS_GOT_AUTH) && (flags & NEEDS_GOT_NONAUTH)) {
+        auto diag = Err(ctx);
+        diag << "both AUTH and non-AUTH GOT entries for '" << sym.getName()
+             << "' requested, but only one type of GOT entry per symbol is "
+                "supported";
+      }
       if (flags & NEEDS_GOT_AUTH)
         addGotAuthEntry(ctx, sym);
       else

lld/ELF/Symbols.h

@@ -52,6 +52,7 @@ enum {
   NEEDS_GOT_DTPREL = 1 << 7,
   NEEDS_TLSIE = 1 << 8,
   NEEDS_GOT_AUTH = 1 << 9,
+  NEEDS_GOT_NONAUTH = 1 << 10,
 };
 
 // The base class for real symbol classes.

lld/ELF/SyntheticSections.cpp

@@ -668,8 +668,10 @@ void GotSection::addConstant(const Relocation &r) { relocations.push_back(r); }
 void GotSection::addEntry(const Symbol &sym) {
   assert(sym.auxIdx == ctx.symAux.size() - 1);
   ctx.symAux.back().gotIdx = numEntries++;
-  if (sym.hasFlag(NEEDS_GOT_AUTH))
-    authEntries.push_back({(numEntries - 1) * ctx.arg.wordsize, sym.isFunc()});
+}
+
+void GotSection::addAuthEntry(const Symbol &sym) {
+  authEntries.push_back({(numEntries - 1) * ctx.arg.wordsize, sym.isFunc()});
 }
 
 bool GotSection::addTlsDescEntry(const Symbol &sym) {

lld/ELF/SyntheticSections.h

@@ -112,6 +112,7 @@ class GotSection final : public SyntheticSection {
 
   void addConstant(const Relocation &r);
   void addEntry(const Symbol &sym);
+  void addAuthEntry(const Symbol &sym);
   bool addTlsDescEntry(const Symbol &sym);
   bool addDynTlsEntry(const Symbol &sym);
   bool addTlsIndex();

lld/test/ELF/aarch64-got-relocations-pauth.s

@@ -79,15 +79,8 @@ _start:
 
 #--- err.s
 # RUN: llvm-mc -filetype=obj -triple=aarch64 err.s -o err.o
-
 # RUN: not ld.lld err.o a.so -pie -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR --implicit-check-not=error:
-
-# ERR:      error: both AUTH and non-AUTH GOT entries for 'bar' requested, but only one type of GOT entry per symbol is supported
-# ERR-NEXT: >>> defined in a.so
-# ERR-NEXT: >>> referenced by err.o:(.text+0x8)
-# ERR:      error: both AUTH and non-AUTH GOT entries for 'bar' requested, but only one type of GOT entry per symbol is supported
-# ERR-NEXT: >>> defined in a.so
-# ERR-NEXT: >>> referenced by err.o:(.text+0xc)
+# ERR: error: both AUTH and non-AUTH GOT entries for 'bar' requested, but only one type of GOT entry per symbol is supported
 
 .globl _start
 _start: