Respond to Review Comments

Author: Stylie777

lld/ELF/InputFiles.cpp

@@ -949,10 +949,6 @@ static void parseGnuPropertyNote(Ctx &ctx, ELFFileBase &f,
       f.andFeatures |= read32<ELFT::Endianness>(desc.data());
     } else if (ctx.arg.emachine == EM_AARCH64 &&
                type == GNU_PROPERTY_AARCH64_FEATURE_PAUTH) {
-      // If the file being parsed is a SharedFile, we cannot pass in
-      // the data variable as there is no InputSection to collect the
-      // data from. As such, these are ignored. They are needed either
-      // when loading a shared library oject.
       ArrayRef<uint8_t> contents = data ? *data : desc;
       if (!f.aarch64PauthAbiCoreInfo.empty()) {
         return void(
@@ -1448,11 +1444,8 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
 template <typename ELFT>
 void SharedFile::parseGnuAndFeatures(const uint8_t *base,
                                      const typename ELFT::PhdrRange headers) {
-  if (headers.size() == 0)
+  if (headers.size() == 0 || ctx.arg.emachine != EM_AARCH64)
     return;
-  uint32_t featureAndType = ctx.arg.emachine == EM_AARCH64
-                                ? GNU_PROPERTY_AARCH64_FEATURE_1_AND
-                                : GNU_PROPERTY_X86_FEATURE_1_AND;
 
   for (unsigned i = 0; i < headers.size(); i++) {
     if (headers[i].p_type != PT_GNU_PROPERTY)
@@ -1465,7 +1458,7 @@ void SharedFile::parseGnuAndFeatures(const uint8_t *base,
 
     // Read a body of a NOTE record, which consists of type-length-value fields.
     ArrayRef<uint8_t> desc = note.getDesc(headers[i].p_align);
-    parseGnuPropertyNote<ELFT>(ctx, *this, featureAndType, desc, base);
+    parseGnuPropertyNote<ELFT>(ctx, *this, /*featureAndType*/GNU_PROPERTY_AARCH64_FEATURE_1_AND, desc, base);
   }
 }
 

lld/docs/ReleaseNotes.rst

@@ -25,11 +25,10 @@ Non-comprehensive list of changes in this release
 
 ELF Improvements
 ----------------
-* For AArch64, support for the ``-zgcs-report-dynamic`` option has been added. This will provide users with
-  the ability to check any Dynamic Objects explicitly passed to LLD for the GNU GCS Attribute Flag. This is
-  required for all files when linking with GCS enabled. Unless defined by the user, ``-zgcs-report-dynamic``
-  inherits its value from the ``-zgcs-report`` option, capped at the ``warning`` level to ensure that a users
-  module can still compile. This behaviour is designed to match the GNU ld Linker.
+* For AArch64, added support for ``-zgcs-report-dynamic``, enabling checks for
+GNU GCS Attribute Flags in Dynamic Objects when GCS is enabled. Inherits value
+from ``-zgcs-report`` (capped at ``warning`` level) unless user-defined,
+ensuring compatibility with GNU ld linker.
 
 Breaking changes
 ----------------

lld/test/ELF/aarch64-feature-gcs.s

@@ -52,17 +52,9 @@
 ## gcs-report-dynamic should report any dynamic objects that does not have the gcs property. This also ensures the inhertance from gcs-report is working correctly.
 
 # RUN: ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report=warning -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-WARN-DYNAMIC %s
-# RUN: ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report-dynamic=warning -z gcs-report=warning -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-WARN-DYNAMIC %s
 # RUN: ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report=error -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-WARN-DYNAMIC %s
-# RUN: ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report=error -z gcs-report-dynamic=warning -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-WARN-DYNAMIC %s
 # RUN: ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report-dynamic=warning -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-WARN-DYNAMIC %s
-# RUN: ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report=error -z gcs-report-dynamic=warning -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-WARN-DYNAMIC %s
-# RUN: not ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report-dynamic=error -z gcs-report=error -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-ERROR-DYNAMIC %s
 # RUN: not ld.lld func1-gcs.o func3-gcs.o no-gcs.so force-gcs.so -z gcs-report-dynamic=error -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-ERROR-DYNAMIC %s
-# RUN: ld.lld func1-gcs.o func3-gcs.o force-gcs.so -z gcs-report-dynamic=error -z gcs-report=error -z gcs=always 2>&1 | count 0
-# RUN: ld.lld func1-gcs.o func3-gcs.o force-gcs.so -z gcs-report-dynamic=warning -z gcs-report=error -z gcs=always 2>&1 | count 0
-# RUN: ld.lld func1-gcs.o func3-gcs.o force-gcs.so -z gcs-report=warning -z gcs=always 2>&1 | count 0
-# RUN: ld.lld func1-gcs.o func3-gcs.o force-gcs.so -z gcs-report=error -z gcs=always 2>&1 | count 0
 # RUN: ld.lld func1-gcs.o func3-gcs.o force-gcs.so -z gcs-report-dynamic=warning -z gcs=always 2>&1 | count 0
 # RUN: ld.lld func1-gcs.o func3-gcs.o force-gcs.so -z gcs-report-dynamic=error -z gcs=always 2>&1 | count 0