move AArch64 related code to AArch64.h

Author: sivan-shani

lld/ELF/Arch/AArch64.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "AArch64.h"
 #include "InputFiles.h"
 #include "OutputSections.h"
 #include "Symbols.h"
@@ -1259,3 +1260,29 @@ void elf::setAArch64TargetInfo(Ctx &ctx) {
   else
     ctx.target.reset(new AArch64(ctx));
 }
+
+AArch64BuildAttrSubsections
+extractBuildAttributesSubsections(const llvm::AArch64AttributeParser &attributes) {
+
+  AArch64BuildAttrSubsections subSections;
+  auto getPauthValue = [&](unsigned tag) -> unsigned {
+    return attributes.getAttributeValue("aeabi_pauthabi", tag).value_or(0);
+  };
+  subSections.pauth.tagPlatform =
+      getPauthValue(llvm::AArch64BuildAttributes::TAG_PAUTH_PLATFORM);
+  subSections.pauth.tagSchema =
+      getPauthValue(llvm::AArch64BuildAttributes::TAG_PAUTH_SCHEMA);
+
+  auto getFeatureValue = [&](unsigned tag) -> unsigned {
+    return attributes.getAttributeValue("aeabi_feature_and_bits", tag)
+        .value_or(0);
+  };
+  subSections.andFeatures |=
+      getFeatureValue(llvm::AArch64BuildAttributes::TAG_FEATURE_BTI);
+  subSections.andFeatures |=
+      getFeatureValue(llvm::AArch64BuildAttributes::TAG_FEATURE_PAC) << 1;
+  subSections.andFeatures |=
+      getFeatureValue(llvm::AArch64BuildAttributes::TAG_FEATURE_GCS) << 2;
+
+  return subSections;
+}

lld/ELF/Arch/AArch64.h

@@ -0,0 +1,22 @@
+//===- AARch64.h ---------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===---------------------------------------------------------------------===//
+
+#include <cstdint>
+#include "llvm/Support/AArch64AttributeParser.h"
+#include "llvm/Support/AArch64BuildAttributes.h"
+
+struct AArch64BuildAttrSubsections {
+  struct PauthSubSection {
+    uint64_t tagPlatform = 0;
+    uint64_t tagSchema = 0;
+  } pauth;
+  uint32_t andFeatures = 0;
+};
+
+AArch64BuildAttrSubsections
+extractBuildAttributesSubsections(const llvm::AArch64AttributeParser&);

lld/ELF/InputFiles.cpp

@@ -6,6 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Arch/AArch64.h"
 #include "InputFiles.h"
 #include "Config.h"
 #include "DWARF.h"
@@ -209,39 +210,6 @@ static void updateSupportedARMFeatures(Ctx &ctx,
   ctx.arg.armHasThumb2ISA |= thumb && *thumb >= ARMBuildAttrs::AllowThumb32;
 }
 
-struct AArch64BuildAttrSubsections {
-  struct PauthSubSection {
-    uint64_t tagPlatform = 0;
-    uint64_t tagSchema = 0;
-  } pauth;
-  uint32_t andFeatures = 0;
-};
-
-static AArch64BuildAttrSubsections
-extractBuildAttributesSubsections(const AArch64AttributeParser &attributes) {
-
-  AArch64BuildAttrSubsections subSections;
-  auto getPauthValue = [&](unsigned tag) -> unsigned {
-    return attributes.getAttributeValue("aeabi_pauthabi", tag).value_or(0);
-  };
-  subSections.pauth.tagPlatform =
-      getPauthValue(llvm::AArch64BuildAttributes::TAG_PAUTH_PLATFORM);
-  subSections.pauth.tagSchema =
-      getPauthValue(llvm::AArch64BuildAttributes::TAG_PAUTH_SCHEMA);
-
-  auto getFeatureValue = [&](unsigned tag) -> unsigned {
-    return attributes.getAttributeValue("aeabi_feature_and_bits", tag)
-        .value_or(0);
-  };
-  subSections.andFeatures |=
-      getFeatureValue(llvm::AArch64BuildAttributes::TAG_FEATURE_BTI);
-  subSections.andFeatures |=
-      getFeatureValue(llvm::AArch64BuildAttributes::TAG_FEATURE_PAC) << 1;
-  subSections.andFeatures |=
-      getFeatureValue(llvm::AArch64BuildAttributes::TAG_FEATURE_GCS) << 2;
-
-  return subSections;
-}
 
 InputFile::InputFile(Ctx &ctx, Kind k, MemoryBufferRef m)
     : ctx(ctx), mb(m), groupId(ctx.driver.nextGroupId), fileKind(k) {