[lld] [llvm] [lld][AArch64][Build Attributes] Add support for converting AArch64 Build Attributes to GNU Properties (PR #131990)

[Peter Smith via llvm-commits]

================
@@ -638,25 +807,73 @@ template <class ELFT> void ObjFile<ELFT>::parse(bool ignoreComdats) {
         }
       }
       break;
-    case EM_AARCH64:
-      // FIXME: BuildAttributes have been implemented in llvm, but not yet in
-      // lld. Remove the section so that it does not accumulate in the output
-      // file. When support is implemented we expect not to output a build
-      // attributes section in files of type ET_EXEC or ET_SHARED, but ld -r
-      // ouptut will need a single merged attributes section.
-      if (sec.sh_type == SHT_AARCH64_ATTRIBUTES)
+    case EM_AARCH64: {
+      // The specification states that if a file contains both GNU properties
+      // and AArch64 build attributes, they must be identical. Therefore, if a
+      // file contains GNU properties, the AArch64 build attributes are ignored.
+      // If a file does not contain GNU properties, we leverage the existing GNU
+      // properties mechanism by populating the corresponding data structures,
+      // which will later be handled by Driver.cpp::readSecurityNotes. This
+      // ensures that AArch64 build attributes are represented in the linked
+      // object file as GNU properties, which are already supported by the Linux
+      // kernel and the dynamic dispatcher.
+      if (sec.sh_type == SHT_AARCH64_ATTRIBUTES) {
+        StringRef name = check(obj.getSectionName(sec, shstrtab));
+        AArch64AttributeParser attributes;
+        ArrayRef<uint8_t> contents = check(obj.getSectionContents(sec));
+        if (Error e = attributes.parse(contents, ELFT::Endianness)) {
+          InputSection isec(*this, sec, name);
+          Warn(ctx) << &isec << ": " << std::move(e);
+        } else {
+          // for functions that has to warn/err/report
+          InputSection isec(*this, sec, name);
+          const SmallVector<llvm::BuildAttributeSubSection, 8>
+              buildAttributesSubSections =
+                  attributes.getBuildAttributesSection();
+          auto subsections = extractBuildAttributesSubsection(
+              ctx, buildAttributesSubSections, isec);
+          mergeAArch64BuildAttributes(ctx, subsections, isec);
+          if (!hasGnuProperties) {
+            ObjFile<ELFT> &f = *this;
+            auto [pauthSubSection, fAndBSubSection] = subsections;
+            if (pauthSubSection) {
+              assert(
+                  (pauthSubSection->Content.size() == 2) &&
+                  "pauthSubSection must contain exactly two build attributes");
+              // sanitizePauthSubSection already sorts
+              f.aarch64PauthAbiCoreInfoStorage =
+                  std::make_unique<std::array<uint8_t, 16>>();
+              uint64_t values[2] = {
+                  static_cast<uint64_t>(pauthSubSection->Content[0].IntValue),
+                  static_cast<uint64_t>(pauthSubSection->Content[1].IntValue)};
+              std::memcpy(f.aarch64PauthAbiCoreInfoStorage->data(), &values[0],
+                          sizeof(values));
+              f.aarch64PauthAbiCoreInfo = *f.aarch64PauthAbiCoreInfoStorage;
+            }
+            if (fAndBSubSection) {
+              assert((fAndBSubSection->Content.size() == 3) &&
+                     "fAndBSubSection must contain exactly three build "
+                     "attributes");
+              // sanitizeFAndBSubSection already sorts
+              f.andFeatures = 0;
+              f.andFeatures |= (fAndBSubSection->Content[0].IntValue) << 0;
+              f.andFeatures |= (fAndBSubSection->Content[1].IntValue) << 1;
+              f.andFeatures |= (fAndBSubSection->Content[2].IntValue) << 2;
+            }
+          }
+        }
         sections[i] = &InputSection::discarded;
-      // Producing a static binary with MTE globals is not currently supported,
-      // remove all SHT_AARCH64_MEMTAG_GLOBALS_STATIC sections as they're unused
-      // medatada, and we don't want them to end up in the output file for
-      // static executables.
+      }
----------------
smithp35 wrote:

More formatting not part of this patch?, and the break below?

https://github.com/llvm/llvm-project/pull/131990