[lld] [AArch64][GCS][LLD] Introduce -zgcs-report-dynamic Command Line Option (PR #127787)
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 10 20:54:57 PDT 2025
https://github.com/MaskRay updated https://github.com/llvm/llvm-project/pull/127787
>From c767b38a728428030d33966a32d693dfae83b376 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Tue, 18 Feb 2025 15:21:33 +0000
Subject: [PATCH 01/13] [AArch64][GCS] Convert -zgcs-report processing to use
an Enum
To enable easier processing of inheritance for the -zgcs-report-dynamic
option, the -zgcs-report option has been converted to use an Enum value
to define its setting rather than a StringRef value.
This adds the Enum class for defining the three options, None, Warning
and Error, along with the appropirate methods for processing the users
input. To enable the error messages, a new lambda function has been
added. This processes the Enum value and passes the appropriate string
into the `report` lambda function for the error message. Error messages
have been updated where required.
---
lld/ELF/Config.h | 5 +++-
lld/ELF/Driver.cpp | 46 ++++++++++++++++++++++++------
lld/test/ELF/aarch64-feature-gcs.s | 5 ++++
3 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index b5872b85efd3a..2bdf4e45db63b 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -136,6 +136,9 @@ enum LtoKind : uint8_t {UnifiedThin, UnifiedRegular, Default};
// For -z gcs=
enum class GcsPolicy { Implicit, Never, Always };
+// For -z gcs-report=
+enum class GcsReportPolicy { None, Warning, Error };
+
struct SymbolVersion {
llvm::StringRef name;
bool isExternCpp;
@@ -228,7 +231,6 @@ struct Config {
StringRef zBtiReport = "none";
StringRef zCetReport = "none";
StringRef zPauthReport = "none";
- StringRef zGcsReport = "none";
StringRef zExecuteOnlyReport = "none";
bool ltoBBAddrMap;
llvm::StringRef ltoBasicBlockSections;
@@ -394,6 +396,7 @@ struct Config {
UnresolvedPolicy unresolvedSymbolsInShlib;
Target2Policy target2;
GcsPolicy zGcs;
+ GcsReportPolicy zGcsReport;
bool power10Stubs;
ARMVFPArgKind armVFPArgs = ARMVFPArgKind::Default;
BuildIdKind buildId = BuildIdKind::None;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index c5de522daa177..a91babd360c95 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -400,7 +400,7 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z bti-report only supported on AArch64";
if (ctx.arg.zPauthReport != "none")
ErrAlways(ctx) << "-z pauth-report only supported on AArch64";
- if (ctx.arg.zGcsReport != "none")
+ if (ctx.arg.zGcsReport != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
@@ -574,6 +574,27 @@ static GcsPolicy getZGcs(Ctx &ctx, opt::InputArgList &args) {
return ret;
}
+static GcsReportPolicy getZGcsReport(Ctx &ctx, opt::InputArgList &args) {
+ GcsReportPolicy ret = GcsReportPolicy::None;
+
+ for (auto *arg : args.filtered(OPT_z)) {
+ std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
+ if (kv.first == "gcs-report") {
+ arg->claim();
+ if (kv.second == "none")
+ ret = GcsReportPolicy::None;
+ else if (kv.second == "warning")
+ ret = GcsReportPolicy::Warning;
+ else if (kv.second == "error")
+ ret = GcsReportPolicy::Error;
+ else
+ ErrAlways(ctx) << "unknown -z gcs-report= value: " << kv.second;
+ }
+ }
+
+ return ret;
+}
+
// Report a warning for an unknown -z option.
static void checkZOptions(Ctx &ctx, opt::InputArgList &args) {
// This function is called before getTarget(), when certain options are not
@@ -1553,6 +1574,7 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ctx.arg.zForceBti = hasZOption(args, "force-bti");
ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
ctx.arg.zGcs = getZGcs(ctx, args);
+ ctx.arg.zGcsReport = getZGcsReport(ctx, args);
ctx.arg.zGlobal = hasZOption(args, "global");
ctx.arg.zGnustack = getZGnuStack(args);
ctx.arg.zHazardplt = hasZOption(args, "hazardplt");
@@ -1625,12 +1647,10 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ErrAlways(ctx) << errPrefix << pat.takeError() << ": " << kv.first;
}
- auto reports = {
- std::make_pair("bti-report", &ctx.arg.zBtiReport),
- std::make_pair("cet-report", &ctx.arg.zCetReport),
- std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport),
- std::make_pair("gcs-report", &ctx.arg.zGcsReport),
- std::make_pair("pauth-report", &ctx.arg.zPauthReport)};
+ auto reports = {std::make_pair("bti-report", &ctx.arg.zBtiReport),
+ std::make_pair("cet-report", &ctx.arg.zCetReport),
+ std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport),
+ std::make_pair("pauth-report", &ctx.arg.zPauthReport)};
for (opt::Arg *arg : args.filtered(OPT_z)) {
std::pair<StringRef, StringRef> option =
StringRef(arg->getValue()).split('=');
@@ -2832,6 +2852,16 @@ static void readSecurityNotes(Ctx &ctx) {
return {ctx, DiagLevel::None};
return report(config);
};
+ auto reportGcsPolicy = [&](GcsReportPolicy config, bool cond) -> ELFSyncStream {
+ if (cond)
+ return {ctx, DiagLevel::None};
+ StringRef configString = "none";
+ if(config == GcsReportPolicy::Warning)
+ configString = "warning";
+ else if (config == GcsReportPolicy::Error)
+ configString = "error";
+ return report(configString);
+ };
for (ELFFileBase *f : ctx.objectFiles) {
uint32_t features = f->andFeatures;
@@ -2841,7 +2871,7 @@ static void readSecurityNotes(Ctx &ctx) {
<< ": -z bti-report: file does not have "
"GNU_PROPERTY_AARCH64_FEATURE_1_BTI property";
- reportUnless(ctx.arg.zGcsReport,
+ reportGcsPolicy(ctx.arg.zGcsReport,
features & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
<< f
<< ": -z gcs-report: file does not have "
diff --git a/lld/test/ELF/aarch64-feature-gcs.s b/lld/test/ELF/aarch64-feature-gcs.s
index b53a653dddaee..42d40f64d8896 100644
--- a/lld/test/ELF/aarch64-feature-gcs.s
+++ b/lld/test/ELF/aarch64-feature-gcs.s
@@ -54,6 +54,11 @@
# INVALID: error: unknown -z gcs= value: nonsense
+## An invalid gcs option should give an error
+# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs-report=nonsense 2>&1 | FileCheck --check-prefix=INVALID-GCS-REPORT %s
+
+# INVALID-GCS-REPORT: error: unknown -z gcs-report= value: nonsense
+
#--- func1-gcs.s
.section ".note.gnu.property", "a"
.long 4
>From 52a8e1f6de246476fd1fea03fd1d140827a3b2ff Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Mon, 17 Feb 2025 15:22:49 +0000
Subject: [PATCH 02/13] [AArch64][LLD] Parse Shared Files Program Headers for
GCS GNU Attribute
To enable the checking of the GNU GCS Attributes when linking together
an application, LLD needs to be able to parse a Shared Files program
headers. This will enable a new option, allowing the user to output
diagnostic information relating to if there are shared files being
used that do not support the GCS extension.
To define if a shared file support GCS, the GNU GCS Attribute will
be stored within the Program Header, so this is parsed and, if
found, the `andFeatures` value updated to reflect the support level.
---
lld/ELF/InputFiles.cpp | 23 +++++++++++++++++++++++
lld/ELF/InputFiles.h | 8 ++++++++
2 files changed, 31 insertions(+)
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index d43de8ce6dfef..055dd5ae0a668 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -18,8 +18,10 @@
#include "Target.h"
#include "lld/Common/CommonLinkerContext.h"
#include "lld/Common/DWARF.h"
+#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/CachedHashString.h"
#include "llvm/ADT/STLExtras.h"
+#include "llvm/BinaryFormat/ELF.h"
#include "llvm/LTO/LTO.h"
#include "llvm/Object/IRObjectFile.h"
#include "llvm/Support/ARMAttributeParser.h"
@@ -502,6 +504,7 @@ void ELFFileBase::init() {
template <class ELFT> void ELFFileBase::init(InputFile::Kind k) {
using Elf_Shdr = typename ELFT::Shdr;
using Elf_Sym = typename ELFT::Sym;
+ using Elf_Phdr = typename ELFT::Phdr;
// Initialize trivial attributes.
const ELFFile<ELFT> &obj = getObj<ELFT>();
@@ -513,6 +516,10 @@ template <class ELFT> void ELFFileBase::init(InputFile::Kind k) {
elfShdrs = sections.data();
numELFShdrs = sections.size();
+ ArrayRef<Elf_Phdr> pHeaders = CHECK2(obj.program_headers(), this);
+ elfPhdrs = pHeaders.data();
+ numElfPhdrs = pHeaders.size();
+
// Find a symbol table.
const Elf_Shdr *symtabSec =
findSection(sections, k == SharedKind ? SHT_DYNSYM : SHT_SYMTAB);
@@ -1418,6 +1425,21 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
return verneeds;
}
+// To determine if a shared file can support the AArch64 GCS extension, the program headers for the object
+// need to be read. This ensures when input options are read, appropriate warning/error messages can be
+// emitted depending on the user's command line options.
+template <typename ELFT>
+uint64_t SharedFile::parseGnuAttributes(const typename ELFT::PhdrRange headers) {
+ if(numElfPhdrs == 0)
+ return 0;
+ uint64_t attributes = 0;
+ for (unsigned i = 0; i < numElfPhdrs; i++)
+ if(headers[i].p_type == PT_GNU_PROPERTY && headers[i].p_flags & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ attributes |= GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
+
+ return attributes;
+}
+
// We do not usually care about alignments of data in shared object
// files because the loader takes care of it. However, if we promote a
// DSO symbol to point to .bss due to copy relocation, we need to keep
@@ -1528,6 +1550,7 @@ template <class ELFT> void SharedFile::parse() {
verdefs = parseVerdefs<ELFT>(obj.base(), verdefSec);
std::vector<uint32_t> verneeds = parseVerneed<ELFT>(obj, verneedSec);
+ this->andFeatures = parseGnuAttributes<ELFT>(getELFPhdrs<ELFT>());
// Parse ".gnu.version" section which is a parallel array for the symbol
// table. If a given file doesn't have a ".gnu.version" section, we use
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 0b186db1ba0d1..99b1842326622 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -206,6 +206,10 @@ class ELFFileBase : public InputFile {
return typename ELFT::ShdrRange(
reinterpret_cast<const typename ELFT::Shdr *>(elfShdrs), numELFShdrs);
}
+ template <typename ELFT> typename ELFT::PhdrRange getELFPhdrs() const {
+ return typename ELFT::PhdrRange(
+ reinterpret_cast<const typename ELFT::Phdr *>(elfPhdrs), numElfPhdrs);
+ }
template <typename ELFT> typename ELFT::SymRange getELFSyms() const {
return typename ELFT::SymRange(
reinterpret_cast<const typename ELFT::Sym *>(elfSyms), numSymbols);
@@ -224,8 +228,10 @@ class ELFFileBase : public InputFile {
StringRef stringTable;
const void *elfShdrs = nullptr;
const void *elfSyms = nullptr;
+ const void *elfPhdrs = nullptr;
uint32_t numELFShdrs = 0;
uint32_t firstGlobal = 0;
+ uint32_t numElfPhdrs = 0;
// Below are ObjFile specific members.
@@ -364,6 +370,8 @@ class SharedFile : public ELFFileBase {
template <typename ELFT>
std::vector<uint32_t> parseVerneed(const llvm::object::ELFFile<ELFT> &obj,
const typename ELFT::Shdr *sec);
+ template <typename ELFT>
+ uint64_t parseGnuAttributes(const typename ELFT::PhdrRange headers);
};
class BinaryFile : public InputFile {
>From 3cf3994831c470e1e7c5c857cbc07c8f519c6660 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Thu, 30 Jan 2025 13:19:28 +0000
Subject: [PATCH 03/13] [AArch64][GCS][LLD] Introduce -z gcs-report-dynamic
option
When GCS was introduced to LLD, the gcs-report option allowed
for a user to gain information relating to if their relocatable objects
supported the feature. For an executable or shared-library to support
GCS, all relocatable objects must declare that they support GCS.
The gcs-report checks were only done on relocatable object files,
however for a program to enable GCS, the executable and all
shared libraries that it loads must enable GCS.
gcs-report-dynamic enables checks to be performed on all shared
objects loaded by LLD, and in cases where GCS is not supported,
a warning or error will be emitted.
It should be noted that only shared files directly passed to LLD
are checked for GCS support. Files that are noted in the `DT_NEEDED`
tags are assumed to have had their GCS support checked when they
were created.
The behaviour of the -zgcs-dynamic-report option matches that of
GNU ld. The behaviour is as follows unless the user explicitly
sets the value:
* -zgcs-report=warning or -zgcs-report=error implies
-zgcs-report-dynamic=warning.
This approach avoids inheriting an error level if the
user wishes to continue building a module without rebuilding all
the shared libraries. The same approach was taken for the GNU ld
linker, so behaviour is identical across the toolchains.
This implementation matches the error message and command
line interface used within the GNU ld Linker. See here:
https://inbox.sourceware.org/binutils/20241206153746.3760179-2-matthieu.longo@arm.com/
---
lld/ELF/Config.h | 3 +-
lld/ELF/Driver.cpp | 48 ++++++++++++++++++++++++++++++
lld/docs/ReleaseNotes.rst | 5 ++++
lld/test/ELF/aarch64-feature-gcs.s | 21 +++++++++++++
4 files changed, 76 insertions(+), 1 deletion(-)
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 2bdf4e45db63b..a5282a477d01b 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -136,7 +136,7 @@ enum LtoKind : uint8_t {UnifiedThin, UnifiedRegular, Default};
// For -z gcs=
enum class GcsPolicy { Implicit, Never, Always };
-// For -z gcs-report=
+// For -z gcs-report= and -zgcs-report-dynamic
enum class GcsReportPolicy { None, Warning, Error };
struct SymbolVersion {
@@ -397,6 +397,7 @@ struct Config {
Target2Policy target2;
GcsPolicy zGcs;
GcsReportPolicy zGcsReport;
+ GcsReportPolicy zGcsReportDynamic;
bool power10Stubs;
ARMVFPArgKind armVFPArgs = ARMVFPArgKind::Default;
BuildIdKind buildId = BuildIdKind::None;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index a91babd360c95..0fb059f213081 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -49,11 +49,15 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
+#include "llvm/BinaryFormat/ELF.h"
#include "llvm/Config/llvm-config.h"
#include "llvm/LTO/LTO.h"
#include "llvm/Object/Archive.h"
+#include "llvm/Object/ELFTypes.h"
#include "llvm/Object/IRObjectFile.h"
+#include "llvm/Option/ArgList.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/SaveAndRestore.h"
@@ -68,6 +72,7 @@
#include "llvm/Support/TimeProfiler.h"
#include "llvm/Support/raw_ostream.h"
#include <cstdlib>
+#include <memory>
#include <tuple>
#include <utility>
@@ -402,6 +407,8 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z pauth-report only supported on AArch64";
if (ctx.arg.zGcsReport != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
+ if(ctx.arg.zGcsReportDynamic != GcsReportPolicy::None)
+ ErrAlways(ctx) << "-z gcs-report-dynamic only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
}
@@ -595,6 +602,36 @@ static GcsReportPolicy getZGcsReport(Ctx &ctx, opt::InputArgList &args) {
return ret;
}
+static GcsReportPolicy getZGcsReportDynamic(Ctx &ctx, opt::InputArgList &args) {
+ GcsReportPolicy ret = GcsReportPolicy::None;
+ for (auto *arg : args.filtered(OPT_z)) {
+ std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
+ if (kv.first == "gcs-report-dynamic") {
+ arg->claim();
+ if (kv.second == "none")
+ ret = GcsReportPolicy::None;
+ else if (kv.second == "warning")
+ ret = GcsReportPolicy::Warning;
+ else if (kv.second == "error")
+ ret = GcsReportPolicy::Error;
+ else
+ ErrAlways(ctx) << "unknown -z gcs-report-dynamic= value: " << kv.second;
+ // once the gcs-report-dynamic option has been processed, we want to break
+ // from the loop to ensure we do not overwrite the return value if the
+ // user has also passed a value for the gcs-report option.
+ break;
+ }
+ // If the user has not defined a value for gcs-report-dynamic, but has for
+ // gcs-report, we want to inherit that value for gcs-report-dynamic. This is
+ // capped at a warning to ensure a users module can still build, while providing
+ // information relating to if a dynamic object supports GCS.
+ if (kv.first == "gcs-report" && (kv.second == "warning" || kv.second == "error"))
+ ret = GcsReportPolicy::Warning;
+ }
+
+ return ret;
+}
+
// Report a warning for an unknown -z option.
static void checkZOptions(Ctx &ctx, opt::InputArgList &args) {
// This function is called before getTarget(), when certain options are not
@@ -1575,6 +1612,7 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
ctx.arg.zGcs = getZGcs(ctx, args);
ctx.arg.zGcsReport = getZGcsReport(ctx, args);
+ ctx.arg.zGcsReportDynamic = getZGcsReportDynamic(ctx, args);
ctx.arg.zGlobal = hasZOption(args, "global");
ctx.arg.zGnustack = getZGnuStack(args);
ctx.arg.zHazardplt = hasZOption(args, "hazardplt");
@@ -2941,6 +2979,16 @@ static void readSecurityNotes(Ctx &ctx) {
ctx.arg.andFeatures |= GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
else if (ctx.arg.zGcs == GcsPolicy::Never)
ctx.arg.andFeatures &= ~GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
+
+ // If we are utilising GCS at any stage, the sharedFiles should be checked to ensure they also support this feature.
+ // The gcs-report-dynamic option is used to indicate if the user wants information relating to this, and will be set
+ // depending on the user's input, or warning if gcs-report is set to either `warning` or `error`.
+ if(ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ for (SharedFile *f : ctx.sharedFiles)
+ reportGcsPolicy(ctx.arg.zGcsReportDynamic, f->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS) << f
+ << ": GCS is required by -z gcs, but this shared library lacks the necessary property note. The "
+ << "dynamic loader might not enable GCS or refuse to load the program unless all shared library "
+ << "dependancies have the GCS marking.";
}
static void initSectionsAndLocalSyms(ELFFileBase *file, bool ignoreComdats) {
diff --git a/lld/docs/ReleaseNotes.rst b/lld/docs/ReleaseNotes.rst
index 6f60efd87c975..a321b5234ee79 100644
--- a/lld/docs/ReleaseNotes.rst
+++ b/lld/docs/ReleaseNotes.rst
@@ -25,6 +25,11 @@ 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.
Breaking changes
----------------
diff --git a/lld/test/ELF/aarch64-feature-gcs.s b/lld/test/ELF/aarch64-feature-gcs.s
index 42d40f64d8896..7d2bc6ae8c49d 100644
--- a/lld/test/ELF/aarch64-feature-gcs.s
+++ b/lld/test/ELF/aarch64-feature-gcs.s
@@ -49,6 +49,22 @@
# REPORT-WARN: warning: func2.o: -z gcs-report: file does not have GNU_PROPERTY_AARCH64_FEATURE_1_GCS property
# REPORT-ERROR: error: func3.o: -z gcs-report: file does not have GNU_PROPERTY_AARCH64_FEATURE_1_GCS property
+## 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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -z gcs-report-dynamic=error -z gcs=always 2>&1 | FileCheck --check-prefix=REPORT-ERROR-DYNAMIC %s
+
+# REPORT-WARN-DYNAMIC: warning: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
+# REPORT-WARN-DYNAMIC-NOT: warning: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
+# REPORT-ERROR-DYNAMIC: error: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
+# REPORT-ERROR-DYNAMIC-NOT: error: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
+
## An invalid gcs option should give an error
# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs=nonsense 2>&1 | FileCheck --check-prefix=INVALID %s
@@ -59,6 +75,11 @@
# INVALID-GCS-REPORT: error: unknown -z gcs-report= value: nonsense
+## An invalid gcs-report-dynamic option should give an error
+# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs-report-dynamic=nonsense 2>&1 | FileCheck --check-prefix=INVALID-GCS-REPORT-DYNAMIC %s
+
+# INVALID-GCS-REPORT-DYNAMIC: error: unknown -z gcs-report-dynamic= value: nonsense
+
#--- func1-gcs.s
.section ".note.gnu.property", "a"
.long 4
>From fe17c80743e7b913fa0873ac9c141f64ada8372c Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Wed, 19 Feb 2025 11:50:03 +0000
Subject: [PATCH 04/13] Update ReleaseNotes
---
lld/docs/ReleaseNotes.rst | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lld/docs/ReleaseNotes.rst b/lld/docs/ReleaseNotes.rst
index a321b5234ee79..176b110af4c18 100644
--- a/lld/docs/ReleaseNotes.rst
+++ b/lld/docs/ReleaseNotes.rst
@@ -26,10 +26,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.
+ 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.
Breaking changes
----------------
>From 91713d765cd2e66d602b458b09e60bd8804906e2 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Wed, 19 Feb 2025 11:50:18 +0000
Subject: [PATCH 05/13] Formatting fixes
---
lld/ELF/Driver.cpp | 40 ++++++++++++++++++++++++----------------
lld/ELF/InputFiles.cpp | 15 +++++++++------
lld/ELF/InputFiles.h | 2 +-
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 0fb059f213081..aec9ec98dcef5 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -60,13 +60,13 @@
#include "llvm/Option/ArgList.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
-#include "llvm/Support/SaveAndRestore.h"
#include "llvm/Support/Compression.h"
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/GlobPattern.h"
#include "llvm/Support/LEB128.h"
#include "llvm/Support/Parallel.h"
#include "llvm/Support/Path.h"
+#include "llvm/Support/SaveAndRestore.h"
#include "llvm/Support/TarWriter.h"
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/TimeProfiler.h"
@@ -407,7 +407,7 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z pauth-report only supported on AArch64";
if (ctx.arg.zGcsReport != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
- if(ctx.arg.zGcsReportDynamic != GcsReportPolicy::None)
+ if (ctx.arg.zGcsReportDynamic != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report-dynamic only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
@@ -623,9 +623,10 @@ static GcsReportPolicy getZGcsReportDynamic(Ctx &ctx, opt::InputArgList &args) {
}
// If the user has not defined a value for gcs-report-dynamic, but has for
// gcs-report, we want to inherit that value for gcs-report-dynamic. This is
- // capped at a warning to ensure a users module can still build, while providing
- // information relating to if a dynamic object supports GCS.
- if (kv.first == "gcs-report" && (kv.second == "warning" || kv.second == "error"))
+ // capped at a warning to ensure a users module can still build, while
+ // providing information relating to if a dynamic object supports GCS.
+ if (kv.first == "gcs-report" &&
+ (kv.second == "warning" || kv.second == "error"))
ret = GcsReportPolicy::Warning;
}
@@ -2890,11 +2891,12 @@ static void readSecurityNotes(Ctx &ctx) {
return {ctx, DiagLevel::None};
return report(config);
};
- auto reportGcsPolicy = [&](GcsReportPolicy config, bool cond) -> ELFSyncStream {
+ auto reportGcsPolicy = [&](GcsReportPolicy config,
+ bool cond) -> ELFSyncStream {
if (cond)
return {ctx, DiagLevel::None};
StringRef configString = "none";
- if(config == GcsReportPolicy::Warning)
+ if (config == GcsReportPolicy::Warning)
configString = "warning";
else if (config == GcsReportPolicy::Error)
configString = "error";
@@ -2910,7 +2912,7 @@ static void readSecurityNotes(Ctx &ctx) {
"GNU_PROPERTY_AARCH64_FEATURE_1_BTI property";
reportGcsPolicy(ctx.arg.zGcsReport,
- features & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ features & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
<< f
<< ": -z gcs-report: file does not have "
"GNU_PROPERTY_AARCH64_FEATURE_1_GCS property";
@@ -2980,15 +2982,21 @@ static void readSecurityNotes(Ctx &ctx) {
else if (ctx.arg.zGcs == GcsPolicy::Never)
ctx.arg.andFeatures &= ~GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
- // If we are utilising GCS at any stage, the sharedFiles should be checked to ensure they also support this feature.
- // The gcs-report-dynamic option is used to indicate if the user wants information relating to this, and will be set
- // depending on the user's input, or warning if gcs-report is set to either `warning` or `error`.
- if(ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ // If we are utilising GCS at any stage, the sharedFiles should be checked to
+ // ensure they also support this feature. The gcs-report-dynamic option is
+ // used to indicate if the user wants information relating to this, and will
+ // be set depending on the user's input, or warning if gcs-report is set to
+ // either `warning` or `error`.
+ if (ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
for (SharedFile *f : ctx.sharedFiles)
- reportGcsPolicy(ctx.arg.zGcsReportDynamic, f->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS) << f
- << ": GCS is required by -z gcs, but this shared library lacks the necessary property note. The "
- << "dynamic loader might not enable GCS or refuse to load the program unless all shared library "
- << "dependancies have the GCS marking.";
+ reportGcsPolicy(ctx.arg.zGcsReportDynamic,
+ f->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ << f
+ << ": GCS is required by -z gcs, but this shared library lacks the "
+ "necessary property note. The "
+ << "dynamic loader might not enable GCS or refuse to load the "
+ "program unless all shared library "
+ << "dependancies have the GCS marking.";
}
static void initSectionsAndLocalSyms(ELFFileBase *file, bool ignoreComdats) {
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 055dd5ae0a668..71fa5d6cfd09d 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1425,16 +1425,19 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
return verneeds;
}
-// To determine if a shared file can support the AArch64 GCS extension, the program headers for the object
-// need to be read. This ensures when input options are read, appropriate warning/error messages can be
-// emitted depending on the user's command line options.
+// To determine if a shared file can support the AArch64 GCS extension, the
+// program headers for the object need to be read. This ensures when input
+// options are read, appropriate warning/error messages can be emitted depending
+// on the user's command line options.
template <typename ELFT>
-uint64_t SharedFile::parseGnuAttributes(const typename ELFT::PhdrRange headers) {
- if(numElfPhdrs == 0)
+uint64_t
+SharedFile::parseGnuAttributes(const typename ELFT::PhdrRange headers) {
+ if (numElfPhdrs == 0)
return 0;
uint64_t attributes = 0;
for (unsigned i = 0; i < numElfPhdrs; i++)
- if(headers[i].p_type == PT_GNU_PROPERTY && headers[i].p_flags & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ if (headers[i].p_type == PT_GNU_PROPERTY &&
+ headers[i].p_flags & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
attributes |= GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
return attributes;
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 99b1842326622..604aa84429d53 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -208,7 +208,7 @@ class ELFFileBase : public InputFile {
}
template <typename ELFT> typename ELFT::PhdrRange getELFPhdrs() const {
return typename ELFT::PhdrRange(
- reinterpret_cast<const typename ELFT::Phdr *>(elfPhdrs), numElfPhdrs);
+ reinterpret_cast<const typename ELFT::Phdr *>(elfPhdrs), numElfPhdrs);
}
template <typename ELFT> typename ELFT::SymRange getELFSyms() const {
return typename ELFT::SymRange(
>From aa218d1e97852ec8715dd9dbdb53ec763d370564 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Thu, 27 Feb 2025 16:15:00 +0000
Subject: [PATCH 06/13] Respond to review comments.
Summary of changes
* GcsReportPolicy enum has been changed to a struct. This allows for
the use of a `toString()` function so the values can be passed
to existing error lamdba functions within the Driver.cpp file.
* Removed uneeded additional includes
* `getZGcsReport` now supports the parsing of both `-zgcs-report`
and `-zgcs-report-dynamic`. The GNU inheritance rules are also
included in this function.
* `SharedFile::parseGnuAttributes` now correctly parses the
`.note.gnu.properties` section for the GCS Attributes.
* Release notes updated.
* aarch64-feature-gcs.s updated to be more streamline as per
review comments.
---
lld/ELF/Config.h | 23 +++++++-
lld/ELF/Driver.cpp | 88 ++++++++----------------------
lld/ELF/InputFiles.cpp | 81 +++++++++++++++++++++------
lld/ELF/InputFiles.h | 4 +-
lld/docs/ReleaseNotes.rst | 6 +-
lld/test/ELF/aarch64-feature-gcs.s | 30 ++++------
6 files changed, 124 insertions(+), 108 deletions(-)
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index a5282a477d01b..1a627260a8e9e 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -137,7 +137,24 @@ enum LtoKind : uint8_t {UnifiedThin, UnifiedRegular, Default};
enum class GcsPolicy { Implicit, Never, Always };
// For -z gcs-report= and -zgcs-report-dynamic
-enum class GcsReportPolicy { None, Warning, Error };
+struct GcsReportPolicy {
+ enum Options { None, Warning, Error, Unknown } value;
+ GcsReportPolicy(GcsReportPolicy::Options valueInput) : value(valueInput) {};
+
+ StringRef toString() {
+ StringRef ret;
+ if (value == Warning)
+ ret = "warning";
+ else if (value == Error)
+ ret = "error";
+ else
+ ret = "none";
+
+ return ret;
+ }
+
+ GcsReportPolicy::Options getValue() { return value; }
+};
struct SymbolVersion {
llvm::StringRef name;
@@ -396,8 +413,8 @@ struct Config {
UnresolvedPolicy unresolvedSymbolsInShlib;
Target2Policy target2;
GcsPolicy zGcs;
- GcsReportPolicy zGcsReport;
- GcsReportPolicy zGcsReportDynamic;
+ GcsReportPolicy zGcsReport = GcsReportPolicy::None;
+ GcsReportPolicy zGcsReportDynamic = GcsReportPolicy::None;
bool power10Stubs;
ARMVFPArgKind armVFPArgs = ARMVFPArgKind::Default;
BuildIdKind buildId = BuildIdKind::None;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index aec9ec98dcef5..4606c82d6bfc7 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -49,15 +49,11 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/StringExtras.h"
-#include "llvm/ADT/StringRef.h"
#include "llvm/ADT/StringSwitch.h"
-#include "llvm/BinaryFormat/ELF.h"
#include "llvm/Config/llvm-config.h"
#include "llvm/LTO/LTO.h"
#include "llvm/Object/Archive.h"
-#include "llvm/Object/ELFTypes.h"
#include "llvm/Object/IRObjectFile.h"
-#include "llvm/Option/ArgList.h"
#include "llvm/Remarks/HotnessThresholdParser.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Compression.h"
@@ -72,7 +68,6 @@
#include "llvm/Support/TimeProfiler.h"
#include "llvm/Support/raw_ostream.h"
#include <cstdlib>
-#include <memory>
#include <tuple>
#include <utility>
@@ -405,9 +400,9 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z bti-report only supported on AArch64";
if (ctx.arg.zPauthReport != "none")
ErrAlways(ctx) << "-z pauth-report only supported on AArch64";
- if (ctx.arg.zGcsReport != GcsReportPolicy::None)
+ if (ctx.arg.zGcsReport.getValue() != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
- if (ctx.arg.zGcsReportDynamic != GcsReportPolicy::None)
+ if (ctx.arg.zGcsReportDynamic.getValue() != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report-dynamic only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
@@ -581,54 +576,29 @@ static GcsPolicy getZGcs(Ctx &ctx, opt::InputArgList &args) {
return ret;
}
-static GcsReportPolicy getZGcsReport(Ctx &ctx, opt::InputArgList &args) {
+static GcsReportPolicy
+getZGcsReport(Ctx &ctx, opt::InputArgList &args, bool isReportDynamic,
+ GcsReportPolicy gcsReportValue = GcsReportPolicy::None) {
GcsReportPolicy ret = GcsReportPolicy::None;
for (auto *arg : args.filtered(OPT_z)) {
std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
- if (kv.first == "gcs-report") {
+ if ((!isReportDynamic && kv.first == "gcs-report") ||
+ (isReportDynamic && kv.first == "gcs-report-dynamic")) {
arg->claim();
- if (kv.second == "none")
- ret = GcsReportPolicy::None;
- else if (kv.second == "warning")
- ret = GcsReportPolicy::Warning;
- else if (kv.second == "error")
- ret = GcsReportPolicy::Error;
- else
- ErrAlways(ctx) << "unknown -z gcs-report= value: " << kv.second;
+ ret = StringSwitch<GcsReportPolicy>(kv.second)
+ .Case("none", GcsReportPolicy::None)
+ .Case("warning", GcsReportPolicy::Warning)
+ .Case("error", GcsReportPolicy::Error)
+ .Default(GcsReportPolicy::Unknown);
+ if (ret.getValue() == GcsReportPolicy::Unknown)
+ ErrAlways(ctx) << "unknown -z " << kv.first << "= value: " << kv.second;
}
}
- return ret;
-}
-
-static GcsReportPolicy getZGcsReportDynamic(Ctx &ctx, opt::InputArgList &args) {
- GcsReportPolicy ret = GcsReportPolicy::None;
- for (auto *arg : args.filtered(OPT_z)) {
- std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
- if (kv.first == "gcs-report-dynamic") {
- arg->claim();
- if (kv.second == "none")
- ret = GcsReportPolicy::None;
- else if (kv.second == "warning")
- ret = GcsReportPolicy::Warning;
- else if (kv.second == "error")
- ret = GcsReportPolicy::Error;
- else
- ErrAlways(ctx) << "unknown -z gcs-report-dynamic= value: " << kv.second;
- // once the gcs-report-dynamic option has been processed, we want to break
- // from the loop to ensure we do not overwrite the return value if the
- // user has also passed a value for the gcs-report option.
- break;
- }
- // If the user has not defined a value for gcs-report-dynamic, but has for
- // gcs-report, we want to inherit that value for gcs-report-dynamic. This is
- // capped at a warning to ensure a users module can still build, while
- // providing information relating to if a dynamic object supports GCS.
- if (kv.first == "gcs-report" &&
- (kv.second == "warning" || kv.second == "error"))
- ret = GcsReportPolicy::Warning;
- }
+ if (isReportDynamic && gcsReportValue.getValue() != GcsReportPolicy::None &&
+ ret.getValue() == GcsReportPolicy::None)
+ ret = GcsReportPolicy::Warning;
return ret;
}
@@ -1612,8 +1582,9 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ctx.arg.zForceBti = hasZOption(args, "force-bti");
ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
ctx.arg.zGcs = getZGcs(ctx, args);
- ctx.arg.zGcsReport = getZGcsReport(ctx, args);
- ctx.arg.zGcsReportDynamic = getZGcsReportDynamic(ctx, args);
+ ctx.arg.zGcsReport = getZGcsReport(ctx, args, false);
+ ctx.arg.zGcsReportDynamic =
+ getZGcsReport(ctx, args, true, ctx.arg.zGcsReport);
ctx.arg.zGlobal = hasZOption(args, "global");
ctx.arg.zGnustack = getZGnuStack(args);
ctx.arg.zHazardplt = hasZOption(args, "hazardplt");
@@ -2891,17 +2862,6 @@ static void readSecurityNotes(Ctx &ctx) {
return {ctx, DiagLevel::None};
return report(config);
};
- auto reportGcsPolicy = [&](GcsReportPolicy config,
- bool cond) -> ELFSyncStream {
- if (cond)
- return {ctx, DiagLevel::None};
- StringRef configString = "none";
- if (config == GcsReportPolicy::Warning)
- configString = "warning";
- else if (config == GcsReportPolicy::Error)
- configString = "error";
- return report(configString);
- };
for (ELFFileBase *f : ctx.objectFiles) {
uint32_t features = f->andFeatures;
@@ -2911,8 +2871,8 @@ static void readSecurityNotes(Ctx &ctx) {
<< ": -z bti-report: file does not have "
"GNU_PROPERTY_AARCH64_FEATURE_1_BTI property";
- reportGcsPolicy(ctx.arg.zGcsReport,
- features & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ reportUnless(ctx.arg.zGcsReport.toString(),
+ features & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
<< f
<< ": -z gcs-report: file does not have "
"GNU_PROPERTY_AARCH64_FEATURE_1_GCS property";
@@ -2989,8 +2949,8 @@ static void readSecurityNotes(Ctx &ctx) {
// either `warning` or `error`.
if (ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
for (SharedFile *f : ctx.sharedFiles)
- reportGcsPolicy(ctx.arg.zGcsReportDynamic,
- f->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
+ reportUnless(ctx.arg.zGcsReportDynamic.toString(),
+ f->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
<< f
<< ": GCS is required by -z gcs, but this shared library lacks the "
"necessary property note. The "
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 71fa5d6cfd09d..70f0dd5a839e4 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -18,10 +18,8 @@
#include "Target.h"
#include "lld/Common/CommonLinkerContext.h"
#include "lld/Common/DWARF.h"
-#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/CachedHashString.h"
#include "llvm/ADT/STLExtras.h"
-#include "llvm/BinaryFormat/ELF.h"
#include "llvm/LTO/LTO.h"
#include "llvm/Object/IRObjectFile.h"
#include "llvm/Support/ARMAttributeParser.h"
@@ -1425,22 +1423,65 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
return verneeds;
}
-// To determine if a shared file can support the AArch64 GCS extension, the
-// program headers for the object need to be read. This ensures when input
-// options are read, appropriate warning/error messages can be emitted depending
-// on the user's command line options.
+// To determine if a shared file can support any of the GNU Attributes,
+// the .note.gnu.properties section need to be read. This has to be done
+// differently for SharedFiles as the information available is not as
+// extensive as a normal object input file. This will take the program
+// headers, along with the SHT_NOTE section header to find the relevant
+// information. This uses a similar process to the readGnuProperty
+// function, but designed specifically for SharedFiles.
template <typename ELFT>
-uint64_t
-SharedFile::parseGnuAttributes(const typename ELFT::PhdrRange headers) {
- if (numElfPhdrs == 0)
- return 0;
- uint64_t attributes = 0;
- for (unsigned i = 0; i < numElfPhdrs; i++)
- if (headers[i].p_type == PT_GNU_PROPERTY &&
- headers[i].p_flags & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
- attributes |= GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
-
- return attributes;
+void SharedFile::parseGnuAttributes(const uint8_t *base,
+ const typename ELFT::PhdrRange headers,
+ const typename ELFT::Shdr *sHeader) {
+ auto err = [&](const uint8_t *place) -> ELFSyncStream {
+ auto diag = Err(ctx);
+ diag << this->getName() << ":(" << ".note.gnu.properties" << "+0x"
+ << Twine::utohexstr(place - base) << "): ";
+ return diag;
+ };
+
+ if (numElfPhdrs == 0 || sHeader == nullptr)
+ 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 < numElfPhdrs; i++) {
+ if (headers[i].p_type != PT_GNU_PROPERTY)
+ continue;
+
+ const typename ELFT::Note note(
+ *reinterpret_cast<const typename ELFT::Nhdr *>(base +
+ headers[i].p_vaddr));
+ if (note.getType() != NT_GNU_PROPERTY_TYPE_0 || note.getName() != "GNU")
+ continue;
+
+ // Read a body of a NOTE record, which consists of type-length-value fields.
+ ArrayRef<uint8_t> desc = note.getDesc(sHeader->sh_addralign);
+ while (!desc.empty()) {
+ const uint8_t *place = desc.data();
+ if (desc.size() < 8)
+ return void(err(place) << "program property is too short");
+ uint32_t type = read32(ctx, desc.data());
+ uint32_t size = read32(ctx, desc.data() + 4);
+ desc = desc.slice(8);
+ if (desc.size() < size)
+ return void(err(place) << "program property is too short");
+
+ // We found a FEATURE_1_AND field. There may be more than one of these
+ // in a .note.gnu.property section, for a relocatable object we
+ // accumulate the bits set.
+ if (type == featureAndType) {
+ if (size < 4)
+ return void(err(place) << "FEATURE_1_AND entry is too short");
+ this->andFeatures |= read32(ctx, desc.data());
+ }
+
+ // Padding is present in the note descriptor, if necessary.
+ desc = desc.slice(alignTo<(ELFT::Is64Bits ? 8 : 4)>(size));
+ }
+ }
}
// We do not usually care about alignments of data in shared object
@@ -1487,6 +1528,7 @@ template <class ELFT> void SharedFile::parse() {
const Elf_Shdr *versymSec = nullptr;
const Elf_Shdr *verdefSec = nullptr;
const Elf_Shdr *verneedSec = nullptr;
+ const Elf_Shdr *noteSec = nullptr;
symbols = std::make_unique<Symbol *[]>(numSymbols);
// Search for .dynsym, .dynamic, .symtab, .gnu.version and .gnu.version_d.
@@ -1507,6 +1549,9 @@ template <class ELFT> void SharedFile::parse() {
case SHT_GNU_verneed:
verneedSec = &sec;
break;
+ case SHT_NOTE:
+ noteSec = &sec;
+ break;
}
}
@@ -1553,7 +1598,7 @@ template <class ELFT> void SharedFile::parse() {
verdefs = parseVerdefs<ELFT>(obj.base(), verdefSec);
std::vector<uint32_t> verneeds = parseVerneed<ELFT>(obj, verneedSec);
- this->andFeatures = parseGnuAttributes<ELFT>(getELFPhdrs<ELFT>());
+ parseGnuAttributes<ELFT>(obj.base(), getELFPhdrs<ELFT>(), noteSec);
// Parse ".gnu.version" section which is a parallel array for the symbol
// table. If a given file doesn't have a ".gnu.version" section, we use
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 604aa84429d53..45b07b3f3df2c 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -371,7 +371,9 @@ class SharedFile : public ELFFileBase {
std::vector<uint32_t> parseVerneed(const llvm::object::ELFFile<ELFT> &obj,
const typename ELFT::Shdr *sec);
template <typename ELFT>
- uint64_t parseGnuAttributes(const typename ELFT::PhdrRange headers);
+ void parseGnuAttributes(const uint8_t *base,
+ const typename ELFT::PhdrRange headers,
+ const typename ELFT::Shdr *sHeader);
};
class BinaryFile : public InputFile {
diff --git a/lld/docs/ReleaseNotes.rst b/lld/docs/ReleaseNotes.rst
index 176b110af4c18..ac524ff030644 100644
--- a/lld/docs/ReleaseNotes.rst
+++ b/lld/docs/ReleaseNotes.rst
@@ -25,10 +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
+* 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
+ 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.
Breaking changes
diff --git a/lld/test/ELF/aarch64-feature-gcs.s b/lld/test/ELF/aarch64-feature-gcs.s
index 7d2bc6ae8c49d..ad6a31b6d447f 100644
--- a/lld/test/ELF/aarch64-feature-gcs.s
+++ b/lld/test/ELF/aarch64-feature-gcs.s
@@ -51,14 +51,14 @@
## 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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 -o /dev/null -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 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
# REPORT-WARN-DYNAMIC: warning: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
# REPORT-WARN-DYNAMIC-NOT: warning: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
@@ -66,19 +66,11 @@
# REPORT-ERROR-DYNAMIC-NOT: error: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
## An invalid gcs option should give an error
-# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs=nonsense 2>&1 | FileCheck --check-prefix=INVALID %s
+# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs=nonsense -z gcs-report=nonsense -z gcs-report-dynamic=nonsense 2>&1 | FileCheck --check-prefix=INVALID %s
# INVALID: error: unknown -z gcs= value: nonsense
-
-## An invalid gcs option should give an error
-# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs-report=nonsense 2>&1 | FileCheck --check-prefix=INVALID-GCS-REPORT %s
-
-# INVALID-GCS-REPORT: error: unknown -z gcs-report= value: nonsense
-
-## An invalid gcs-report-dynamic option should give an error
-# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs-report-dynamic=nonsense 2>&1 | FileCheck --check-prefix=INVALID-GCS-REPORT-DYNAMIC %s
-
-# INVALID-GCS-REPORT-DYNAMIC: error: unknown -z gcs-report-dynamic= value: nonsense
+# INVALID: error: unknown -z gcs-report= value: nonsense
+# INVALID: error: unknown -z gcs-report-dynamic= value: nonsense
#--- func1-gcs.s
.section ".note.gnu.property", "a"
>From 0621179375893f8b7d6f074f46512bda04820d7a Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Tue, 4 Mar 2025 13:49:14 +0000
Subject: [PATCH 07/13] Updates after second round of review comments
Summary of changes:
* Storing of Phdrs is now done within the SharedFile class as they
are not present within a `.o` file, so should only be processed
for `.so` files.
* Added comment in `getZGcsReport` to explain the inheritance logic
that matches GNU ld.
* Added comments in the function calls for `getZGcsReport` with the
variable name for the boolean value
* Updated error message with dependent not depedant
* Refactored the parsing of a GNU Property Note. Common logic between
`readGnuProperty` and `SharedFiles::parseGnuAndFeatures` have been
refactored into their own static function to redude maintainability.
* Expanded testing after some feedback from reviewers
---
lld/ELF/Driver.cpp | 10 +-
lld/ELF/InputFiles.cpp | 145 +++++++++++++----------------
lld/ELF/InputFiles.h | 17 ++--
lld/test/ELF/aarch64-feature-gcs.s | 16 +++-
4 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 4606c82d6bfc7..5a44be9722e41 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -596,6 +596,10 @@ getZGcsReport(Ctx &ctx, opt::InputArgList &args, bool isReportDynamic,
}
}
+ // The behaviour of -zgnu-report-dynamic matches that of GNU ld. When -zgcs-report
+ // is set to `warning` or `error`, -zgcs-report-dynamic will inherit this value if
+ // there is no user set value. This detects shared libraries without the GCS
+ // property but does not the shared-libraries to be rebuilt for successful linking
if (isReportDynamic && gcsReportValue.getValue() != GcsReportPolicy::None &&
ret.getValue() == GcsReportPolicy::None)
ret = GcsReportPolicy::Warning;
@@ -1582,9 +1586,9 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ctx.arg.zForceBti = hasZOption(args, "force-bti");
ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
ctx.arg.zGcs = getZGcs(ctx, args);
- ctx.arg.zGcsReport = getZGcsReport(ctx, args, false);
+ ctx.arg.zGcsReport = getZGcsReport(ctx, args, /* isReportDynamic */ false);
ctx.arg.zGcsReportDynamic =
- getZGcsReport(ctx, args, true, ctx.arg.zGcsReport);
+ getZGcsReport(ctx, args, /* isReportDynamic */ true, ctx.arg.zGcsReport);
ctx.arg.zGlobal = hasZOption(args, "global");
ctx.arg.zGnustack = getZGnuStack(args);
ctx.arg.zHazardplt = hasZOption(args, "hazardplt");
@@ -2956,7 +2960,7 @@ static void readSecurityNotes(Ctx &ctx) {
"necessary property note. The "
<< "dynamic loader might not enable GCS or refuse to load the "
"program unless all shared library "
- << "dependancies have the GCS marking.";
+ << "dependencies have the GCS marking.";
}
static void initSectionsAndLocalSyms(ELFFileBase *file, bool ignoreComdats) {
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 70f0dd5a839e4..7c285a379c986 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -502,7 +502,6 @@ void ELFFileBase::init() {
template <class ELFT> void ELFFileBase::init(InputFile::Kind k) {
using Elf_Shdr = typename ELFT::Shdr;
using Elf_Sym = typename ELFT::Sym;
- using Elf_Phdr = typename ELFT::Phdr;
// Initialize trivial attributes.
const ELFFile<ELFT> &obj = getObj<ELFT>();
@@ -514,10 +513,6 @@ template <class ELFT> void ELFFileBase::init(InputFile::Kind k) {
elfShdrs = sections.data();
numELFShdrs = sections.size();
- ArrayRef<Elf_Phdr> pHeaders = CHECK2(obj.program_headers(), this);
- elfPhdrs = pHeaders.data();
- numElfPhdrs = pHeaders.size();
-
// Find a symbol table.
const Elf_Shdr *symtabSec =
findSection(sections, k == SharedKind ? SHT_DYNSYM : SHT_SYMTAB);
@@ -923,6 +918,56 @@ void ObjFile<ELFT>::initializeSections(bool ignoreComdats,
handleSectionGroup<ELFT>(this->sections, entries);
}
+template <typename ELFT>
+static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType, ArrayRef<uint8_t> &desc, ELFFileBase *f, const uint8_t *base, ArrayRef<uint8_t> *data = nullptr) {
+ auto err = [&](const uint8_t *place) -> ELFSyncStream {
+ auto diag = Err(ctx);
+ diag << f->getName() << ":(" << ".note.gnu.properties" << "+0x"
+ << Twine::utohexstr(place - base) << "): ";
+ return diag;
+ };
+
+ while (!desc.empty()) {
+ const uint8_t *place = desc.data();
+ if (desc.size() < 8)
+ return void(err(place) << "program property is too short");
+ uint32_t type = read32<ELFT::Endianness>(desc.data());
+ uint32_t size = read32<ELFT::Endianness>(desc.data() + 4);
+ desc = desc.slice(8);
+ if (desc.size() < size)
+ return void(err(place) << "program property is too short");
+
+ if (type == featureAndType) {
+ // We found a FEATURE_1_AND field. There may be more than one of these
+ // in a .note.gnu.property section, for a relocatable object we
+ // accumulate the bits set.
+ if (size < 4)
+ return void(err(place) << "FEATURE_1_AND entry is too short");
+ 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.
+ if (!f->aarch64PauthAbiCoreInfo.empty() && data != nullptr) {
+ return void(
+ err(data->data())
+ << "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
+ "not supported");
+ } else if (size != 16 && data != nullptr) {
+ return void(err(data->data())
+ << "GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry "
+ "is invalid: expected 16 bytes, but got "
+ << size);
+ }
+ f->aarch64PauthAbiCoreInfo = desc;
+ }
+
+ // Padding is present in the note descriptor, if necessary.
+ desc = desc.slice(alignTo<(ELFT::Is64Bits ? 8 : 4)>(size));
+ }
+}
// Read the following info from the .note.gnu.property section and write it to
// the corresponding fields in `ObjFile`:
// - Feature flags (32 bits) representing x86 or AArch64 features for
@@ -960,42 +1005,8 @@ static void readGnuProperty(Ctx &ctx, const InputSection &sec,
// Read a body of a NOTE record, which consists of type-length-value fields.
ArrayRef<uint8_t> desc = note.getDesc(sec.addralign);
- while (!desc.empty()) {
- const uint8_t *place = desc.data();
- if (desc.size() < 8)
- return void(err(place) << "program property is too short");
- uint32_t type = read32<ELFT::Endianness>(desc.data());
- uint32_t size = read32<ELFT::Endianness>(desc.data() + 4);
- desc = desc.slice(8);
- if (desc.size() < size)
- return void(err(place) << "program property is too short");
-
- if (type == featureAndType) {
- // We found a FEATURE_1_AND field. There may be more than one of these
- // in a .note.gnu.property section, for a relocatable object we
- // accumulate the bits set.
- if (size < 4)
- return void(err(place) << "FEATURE_1_AND entry is too short");
- f.andFeatures |= read32<ELFT::Endianness>(desc.data());
- } else if (ctx.arg.emachine == EM_AARCH64 &&
- type == GNU_PROPERTY_AARCH64_FEATURE_PAUTH) {
- if (!f.aarch64PauthAbiCoreInfo.empty()) {
- return void(
- err(data.data())
- << "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
- "not supported");
- } else if (size != 16) {
- return void(err(data.data())
- << "GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry "
- "is invalid: expected 16 bytes, but got "
- << size);
- }
- f.aarch64PauthAbiCoreInfo = desc;
- }
-
- // Padding is present in the note descriptor, if necessary.
- desc = desc.slice(alignTo<(ELFT::Is64Bits ? 8 : 4)>(size));
- }
+ const uint8_t *base = f.getObj().base();
+ parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data);
// Go to next NOTE record to look for more FEATURE_1_AND descriptions.
data = data.slice(nhdr->getSize(sec.addralign));
@@ -1424,23 +1435,16 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
}
// To determine if a shared file can support any of the GNU Attributes,
-// the .note.gnu.properties section need to be read. This has to be done
-// differently for SharedFiles as the information available is not as
-// extensive as a normal object input file. This will take the program
-// headers, along with the SHT_NOTE section header to find the relevant
-// information. This uses a similar process to the readGnuProperty
-// function, but designed specifically for SharedFiles.
+// the .note.gnu.properties section need to be read. The appropriate
+// location in memory is located then the GnuPropertyNote can be parsed.
+// This is the same process as is used for readGnuProperty, however we
+// do not pass the data variable as, without an InputSection, its value
+// is unknown in a SharedFile. This is ok as the information that would
+// be collected from this is irrelevant for a dynamic object.
template <typename ELFT>
-void SharedFile::parseGnuAttributes(const uint8_t *base,
+void SharedFile::parseGnuAndFeatures(const uint8_t *base,
const typename ELFT::PhdrRange headers,
const typename ELFT::Shdr *sHeader) {
- auto err = [&](const uint8_t *place) -> ELFSyncStream {
- auto diag = Err(ctx);
- diag << this->getName() << ":(" << ".note.gnu.properties" << "+0x"
- << Twine::utohexstr(place - base) << "): ";
- return diag;
- };
-
if (numElfPhdrs == 0 || sHeader == nullptr)
return;
uint32_t featureAndType = ctx.arg.emachine == EM_AARCH64
@@ -1450,7 +1454,6 @@ void SharedFile::parseGnuAttributes(const uint8_t *base,
for (unsigned i = 0; i < numElfPhdrs; i++) {
if (headers[i].p_type != PT_GNU_PROPERTY)
continue;
-
const typename ELFT::Note note(
*reinterpret_cast<const typename ELFT::Nhdr *>(base +
headers[i].p_vaddr));
@@ -1459,28 +1462,7 @@ void SharedFile::parseGnuAttributes(const uint8_t *base,
// Read a body of a NOTE record, which consists of type-length-value fields.
ArrayRef<uint8_t> desc = note.getDesc(sHeader->sh_addralign);
- while (!desc.empty()) {
- const uint8_t *place = desc.data();
- if (desc.size() < 8)
- return void(err(place) << "program property is too short");
- uint32_t type = read32(ctx, desc.data());
- uint32_t size = read32(ctx, desc.data() + 4);
- desc = desc.slice(8);
- if (desc.size() < size)
- return void(err(place) << "program property is too short");
-
- // We found a FEATURE_1_AND field. There may be more than one of these
- // in a .note.gnu.property section, for a relocatable object we
- // accumulate the bits set.
- if (type == featureAndType) {
- if (size < 4)
- return void(err(place) << "FEATURE_1_AND entry is too short");
- this->andFeatures |= read32(ctx, desc.data());
- }
-
- // Padding is present in the note descriptor, if necessary.
- desc = desc.slice(alignTo<(ELFT::Is64Bits ? 8 : 4)>(size));
- }
+ parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, this, base);
}
}
@@ -1520,11 +1502,16 @@ template <class ELFT> void SharedFile::parse() {
using Elf_Sym = typename ELFT::Sym;
using Elf_Verdef = typename ELFT::Verdef;
using Elf_Versym = typename ELFT::Versym;
+ using Elf_Phdr = typename ELFT::Phdr;
ArrayRef<Elf_Dyn> dynamicTags;
const ELFFile<ELFT> obj = this->getObj<ELFT>();
ArrayRef<Elf_Shdr> sections = getELFShdrs<ELFT>();
+ ArrayRef<Elf_Phdr> pHeaders = CHECK2(obj.program_headers(), this);
+ elfPhdrs = pHeaders.data();
+ numElfPhdrs = pHeaders.size();
+
const Elf_Shdr *versymSec = nullptr;
const Elf_Shdr *verdefSec = nullptr;
const Elf_Shdr *verneedSec = nullptr;
@@ -1598,7 +1585,7 @@ template <class ELFT> void SharedFile::parse() {
verdefs = parseVerdefs<ELFT>(obj.base(), verdefSec);
std::vector<uint32_t> verneeds = parseVerneed<ELFT>(obj, verneedSec);
- parseGnuAttributes<ELFT>(obj.base(), getELFPhdrs<ELFT>(), noteSec);
+ parseGnuAndFeatures<ELFT>(obj.base(), getELFPhdrs<ELFT>(), noteSec);
// Parse ".gnu.version" section which is a parallel array for the symbol
// table. If a given file doesn't have a ".gnu.version" section, we use
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 45b07b3f3df2c..c578b93d1f29d 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -206,10 +206,6 @@ class ELFFileBase : public InputFile {
return typename ELFT::ShdrRange(
reinterpret_cast<const typename ELFT::Shdr *>(elfShdrs), numELFShdrs);
}
- template <typename ELFT> typename ELFT::PhdrRange getELFPhdrs() const {
- return typename ELFT::PhdrRange(
- reinterpret_cast<const typename ELFT::Phdr *>(elfPhdrs), numElfPhdrs);
- }
template <typename ELFT> typename ELFT::SymRange getELFSyms() const {
return typename ELFT::SymRange(
reinterpret_cast<const typename ELFT::Sym *>(elfSyms), numSymbols);
@@ -228,10 +224,8 @@ class ELFFileBase : public InputFile {
StringRef stringTable;
const void *elfShdrs = nullptr;
const void *elfSyms = nullptr;
- const void *elfPhdrs = nullptr;
uint32_t numELFShdrs = 0;
uint32_t firstGlobal = 0;
- uint32_t numElfPhdrs = 0;
// Below are ObjFile specific members.
@@ -366,12 +360,21 @@ class SharedFile : public ELFFileBase {
// parsed. Only filled for `--no-allow-shlib-undefined`.
SmallVector<Symbol *, 0> requiredSymbols;
+ template <typename ELFT> typename ELFT::PhdrRange getELFPhdrs() const {
+ return typename ELFT::PhdrRange(
+ reinterpret_cast<const typename ELFT::Phdr *>(elfPhdrs), numElfPhdrs);
+ }
+
+protected:
+ const void *elfPhdrs = nullptr;
+ uint32_t numElfPhdrs = 0;
+
private:
template <typename ELFT>
std::vector<uint32_t> parseVerneed(const llvm::object::ELFFile<ELFT> &obj,
const typename ELFT::Shdr *sec);
template <typename ELFT>
- void parseGnuAttributes(const uint8_t *base,
+ void parseGnuAndFeatures(const uint8_t *base,
const typename ELFT::PhdrRange headers,
const typename ELFT::Shdr *sHeader);
};
diff --git a/lld/test/ELF/aarch64-feature-gcs.s b/lld/test/ELF/aarch64-feature-gcs.s
index ad6a31b6d447f..9bca95b11b7b4 100644
--- a/lld/test/ELF/aarch64-feature-gcs.s
+++ b/lld/test/ELF/aarch64-feature-gcs.s
@@ -59,11 +59,17 @@
# 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
-
-# REPORT-WARN-DYNAMIC: warning: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
-# REPORT-WARN-DYNAMIC-NOT: warning: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
-# REPORT-ERROR-DYNAMIC: error: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
-# REPORT-ERROR-DYNAMIC-NOT: error: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependancies have the GCS marking.
+# 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
+
+# REPORT-WARN-DYNAMIC: warning: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependencies have the GCS marking.
+# REPORT-WARN-DYNAMIC-NOT: warning: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependencies have the GCS marking.
+# REPORT-ERROR-DYNAMIC: error: no-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependencies have the GCS marking.
+# REPORT-ERROR-DYNAMIC-NOT: error: force-gcs.so: GCS is required by -z gcs, but this shared library lacks the necessary property note. The dynamic loader might not enable GCS or refuse to load the program unless all shared library dependencies have the GCS marking.
## An invalid gcs option should give an error
# RUN: not ld.lld func1-gcs.o func2-gcs.o func3-gcs.o -z gcs=nonsense -z gcs-report=nonsense -z gcs-report-dynamic=nonsense 2>&1 | FileCheck --check-prefix=INVALID %s
>From c8787ea120ba69d919e9e66030655ed5b397cd44 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Tue, 4 Mar 2025 14:41:42 +0000
Subject: [PATCH 08/13] formatting fixes
---
lld/ELF/Driver.cpp | 18 +++++----
lld/ELF/InputFiles.cpp | 85 ++++++++++++++++++++++--------------------
lld/ELF/InputFiles.h | 4 +-
3 files changed, 56 insertions(+), 51 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 5a44be9722e41..477d915e3bf76 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -596,10 +596,11 @@ getZGcsReport(Ctx &ctx, opt::InputArgList &args, bool isReportDynamic,
}
}
- // The behaviour of -zgnu-report-dynamic matches that of GNU ld. When -zgcs-report
- // is set to `warning` or `error`, -zgcs-report-dynamic will inherit this value if
- // there is no user set value. This detects shared libraries without the GCS
- // property but does not the shared-libraries to be rebuilt for successful linking
+ // The behaviour of -zgnu-report-dynamic matches that of GNU ld. When
+ // -zgcs-report is set to `warning` or `error`, -zgcs-report-dynamic will
+ // inherit this value if there is no user set value. This detects shared
+ // libraries without the GCS property but does not the shared-libraries to be
+ // rebuilt for successful linking
if (isReportDynamic && gcsReportValue.getValue() != GcsReportPolicy::None &&
ret.getValue() == GcsReportPolicy::None)
ret = GcsReportPolicy::Warning;
@@ -1661,10 +1662,11 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ErrAlways(ctx) << errPrefix << pat.takeError() << ": " << kv.first;
}
- auto reports = {std::make_pair("bti-report", &ctx.arg.zBtiReport),
- std::make_pair("cet-report", &ctx.arg.zCetReport),
- std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport),
- std::make_pair("pauth-report", &ctx.arg.zPauthReport)};
+ auto reports = {
+ std::make_pair("bti-report", &ctx.arg.zBtiReport),
+ std::make_pair("cet-report", &ctx.arg.zCetReport),
+ std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport),
+ std::make_pair("pauth-report", &ctx.arg.zPauthReport)};
for (opt::Arg *arg : args.filtered(OPT_z)) {
std::pair<StringRef, StringRef> option =
StringRef(arg->getValue()).split('=');
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 7c285a379c986..89ab823d781e2 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -919,7 +919,10 @@ void ObjFile<ELFT>::initializeSections(bool ignoreComdats,
}
template <typename ELFT>
-static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType, ArrayRef<uint8_t> &desc, ELFFileBase *f, const uint8_t *base, ArrayRef<uint8_t> *data = nullptr) {
+static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
+ ArrayRef<uint8_t> &desc, ELFFileBase *f,
+ const uint8_t *base,
+ ArrayRef<uint8_t> *data = nullptr) {
auto err = [&](const uint8_t *place) -> ELFSyncStream {
auto diag = Err(ctx);
diag << f->getName() << ":(" << ".note.gnu.properties" << "+0x"
@@ -927,46 +930,46 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType, ArrayRef<ui
return diag;
};
- while (!desc.empty()) {
- const uint8_t *place = desc.data();
- if (desc.size() < 8)
- return void(err(place) << "program property is too short");
- uint32_t type = read32<ELFT::Endianness>(desc.data());
- uint32_t size = read32<ELFT::Endianness>(desc.data() + 4);
- desc = desc.slice(8);
- if (desc.size() < size)
- return void(err(place) << "program property is too short");
-
- if (type == featureAndType) {
- // We found a FEATURE_1_AND field. There may be more than one of these
- // in a .note.gnu.property section, for a relocatable object we
- // accumulate the bits set.
- if (size < 4)
- return void(err(place) << "FEATURE_1_AND entry is too short");
- 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.
- if (!f->aarch64PauthAbiCoreInfo.empty() && data != nullptr) {
- return void(
- err(data->data())
- << "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
- "not supported");
- } else if (size != 16 && data != nullptr) {
- return void(err(data->data())
- << "GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry "
- "is invalid: expected 16 bytes, but got "
- << size);
- }
- f->aarch64PauthAbiCoreInfo = desc;
+ while (!desc.empty()) {
+ const uint8_t *place = desc.data();
+ if (desc.size() < 8)
+ return void(err(place) << "program property is too short");
+ uint32_t type = read32<ELFT::Endianness>(desc.data());
+ uint32_t size = read32<ELFT::Endianness>(desc.data() + 4);
+ desc = desc.slice(8);
+ if (desc.size() < size)
+ return void(err(place) << "program property is too short");
+
+ if (type == featureAndType) {
+ // We found a FEATURE_1_AND field. There may be more than one of these
+ // in a .note.gnu.property section, for a relocatable object we
+ // accumulate the bits set.
+ if (size < 4)
+ return void(err(place) << "FEATURE_1_AND entry is too short");
+ 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.
+ if (!f->aarch64PauthAbiCoreInfo.empty() && data != nullptr) {
+ return void(
+ err(data->data())
+ << "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
+ "not supported");
+ } else if (size != 16 && data != nullptr) {
+ return void(err(data->data())
+ << "GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry "
+ "is invalid: expected 16 bytes, but got "
+ << size);
}
-
- // Padding is present in the note descriptor, if necessary.
- desc = desc.slice(alignTo<(ELFT::Is64Bits ? 8 : 4)>(size));
+ f->aarch64PauthAbiCoreInfo = desc;
}
+
+ // Padding is present in the note descriptor, if necessary.
+ desc = desc.slice(alignTo<(ELFT::Is64Bits ? 8 : 4)>(size));
+ }
}
// Read the following info from the .note.gnu.property section and write it to
// the corresponding fields in `ObjFile`:
@@ -1443,8 +1446,8 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
// be collected from this is irrelevant for a dynamic object.
template <typename ELFT>
void SharedFile::parseGnuAndFeatures(const uint8_t *base,
- const typename ELFT::PhdrRange headers,
- const typename ELFT::Shdr *sHeader) {
+ const typename ELFT::PhdrRange headers,
+ const typename ELFT::Shdr *sHeader) {
if (numElfPhdrs == 0 || sHeader == nullptr)
return;
uint32_t featureAndType = ctx.arg.emachine == EM_AARCH64
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index c578b93d1f29d..5f4b04d5aff08 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -375,8 +375,8 @@ class SharedFile : public ELFFileBase {
const typename ELFT::Shdr *sec);
template <typename ELFT>
void parseGnuAndFeatures(const uint8_t *base,
- const typename ELFT::PhdrRange headers,
- const typename ELFT::Shdr *sHeader);
+ const typename ELFT::PhdrRange headers,
+ const typename ELFT::Shdr *sHeader);
};
class BinaryFile : public InputFile {
>From c18fe32c4578be170acad1ec88676953eddfddb6 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Tue, 4 Mar 2025 15:48:42 +0000
Subject: [PATCH 09/13] Fix failing tests & ensure section name is carried
through for obj files
This ensures that the section name is correct for the error messages when parsing Obj files, keeping the same behaviour
as was present previously
---
lld/ELF/InputFiles.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 89ab823d781e2..cf4332e4ec1bd 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -922,10 +922,11 @@ template <typename ELFT>
static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
ArrayRef<uint8_t> &desc, ELFFileBase *f,
const uint8_t *base,
- ArrayRef<uint8_t> *data = nullptr) {
+ ArrayRef<uint8_t> *data = nullptr,
+ StringRef sectionName = ".note.gnu.property") {
auto err = [&](const uint8_t *place) -> ELFSyncStream {
auto diag = Err(ctx);
- diag << f->getName() << ":(" << ".note.gnu.properties" << "+0x"
+ diag << f->getName() << ":(" << sectionName << "+0x"
<< Twine::utohexstr(place - base) << "): ";
return diag;
};
@@ -1008,8 +1009,8 @@ static void readGnuProperty(Ctx &ctx, const InputSection &sec,
// Read a body of a NOTE record, which consists of type-length-value fields.
ArrayRef<uint8_t> desc = note.getDesc(sec.addralign);
- const uint8_t *base = f.getObj().base();
- parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data);
+ const uint8_t *base = sec.content().data();
+ parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data, sec.name);
// Go to next NOTE record to look for more FEATURE_1_AND descriptions.
data = data.slice(nhdr->getSize(sec.addralign));
>From 718e71ccac365d59894a8d8402390e1bcc0e0775 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Wed, 5 Mar 2025 09:14:53 +0000
Subject: [PATCH 10/13] formatting fixes
---
lld/ELF/InputFiles.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index cf4332e4ec1bd..07c918a69b7f4 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1010,7 +1010,8 @@ static void readGnuProperty(Ctx &ctx, const InputSection &sec,
// Read a body of a NOTE record, which consists of type-length-value fields.
ArrayRef<uint8_t> desc = note.getDesc(sec.addralign);
const uint8_t *base = sec.content().data();
- parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data, sec.name);
+ parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data,
+ sec.name);
// Go to next NOTE record to look for more FEATURE_1_AND descriptions.
data = data.slice(nhdr->getSize(sec.addralign));
>From 986cd718d25eb1baf1a41ff8a04b4245c210163c Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Thu, 6 Mar 2025 11:15:53 +0000
Subject: [PATCH 11/13] Respond to review comments
Summary of changes:
* Removed sectionName parameter from
parseGnuPropertyNote function.
* For the PAUTH error messages, parseGnuPropertyNote will
now select data based on off data is present, rather than
skipping the errors is data is a nullptr. If data is not present,
`desc` is used instead.
* Use of the section header when finding the
`.note.gnu.property` section in a Shared File has been
removed. They are not always present, so should solely rely
on a program header here.
* Changed to using the `p_offset` value when finding the
Note header for the `.note.gnu.property` section. `p_vaddr`
may not always be present, or a reliable source, whereas
`p_offset` will always point to the section.
---
lld/ELF/InputFiles.cpp | 32 +++++++++++++-------------------
lld/ELF/InputFiles.h | 3 +--
2 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 07c918a69b7f4..46b0cfade57cf 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -922,11 +922,10 @@ template <typename ELFT>
static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
ArrayRef<uint8_t> &desc, ELFFileBase *f,
const uint8_t *base,
- ArrayRef<uint8_t> *data = nullptr,
- StringRef sectionName = ".note.gnu.property") {
+ ArrayRef<uint8_t> *data = nullptr) {
auto err = [&](const uint8_t *place) -> ELFSyncStream {
auto diag = Err(ctx);
- diag << f->getName() << ":(" << sectionName << "+0x"
+ diag << f->getName() << ":(" << ".note.gnu.property+0x"
<< Twine::utohexstr(place - base) << "): ";
return diag;
};
@@ -954,13 +953,14 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
// 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.
- if (!f->aarch64PauthAbiCoreInfo.empty() && data != nullptr) {
+ ArrayRef<uint8_t> contents = data ? *data : desc;
+ if (!f->aarch64PauthAbiCoreInfo.empty()) {
return void(
- err(data->data())
+ err(contents.data())
<< "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
"not supported");
- } else if (size != 16 && data != nullptr) {
- return void(err(data->data())
+ } else if (size != 16) {
+ return void(err(contents.data())
<< "GNU_PROPERTY_AARCH64_FEATURE_PAUTH entry "
"is invalid: expected 16 bytes, but got "
<< size);
@@ -1010,8 +1010,7 @@ static void readGnuProperty(Ctx &ctx, const InputSection &sec,
// Read a body of a NOTE record, which consists of type-length-value fields.
ArrayRef<uint8_t> desc = note.getDesc(sec.addralign);
const uint8_t *base = sec.content().data();
- parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data,
- sec.name);
+ parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data);
// Go to next NOTE record to look for more FEATURE_1_AND descriptions.
data = data.slice(nhdr->getSize(sec.addralign));
@@ -1448,9 +1447,8 @@ std::vector<uint32_t> SharedFile::parseVerneed(const ELFFile<ELFT> &obj,
// be collected from this is irrelevant for a dynamic object.
template <typename ELFT>
void SharedFile::parseGnuAndFeatures(const uint8_t *base,
- const typename ELFT::PhdrRange headers,
- const typename ELFT::Shdr *sHeader) {
- if (numElfPhdrs == 0 || sHeader == nullptr)
+ const typename ELFT::PhdrRange headers) {
+ if (numElfPhdrs == 0)
return;
uint32_t featureAndType = ctx.arg.emachine == EM_AARCH64
? GNU_PROPERTY_AARCH64_FEATURE_1_AND
@@ -1461,12 +1459,12 @@ void SharedFile::parseGnuAndFeatures(const uint8_t *base,
continue;
const typename ELFT::Note note(
*reinterpret_cast<const typename ELFT::Nhdr *>(base +
- headers[i].p_vaddr));
+ headers[i].p_offset));
if (note.getType() != NT_GNU_PROPERTY_TYPE_0 || note.getName() != "GNU")
continue;
// Read a body of a NOTE record, which consists of type-length-value fields.
- ArrayRef<uint8_t> desc = note.getDesc(sHeader->sh_addralign);
+ ArrayRef<uint8_t> desc = note.getDesc(headers[i].p_align);
parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, this, base);
}
}
@@ -1520,7 +1518,6 @@ template <class ELFT> void SharedFile::parse() {
const Elf_Shdr *versymSec = nullptr;
const Elf_Shdr *verdefSec = nullptr;
const Elf_Shdr *verneedSec = nullptr;
- const Elf_Shdr *noteSec = nullptr;
symbols = std::make_unique<Symbol *[]>(numSymbols);
// Search for .dynsym, .dynamic, .symtab, .gnu.version and .gnu.version_d.
@@ -1541,9 +1538,6 @@ template <class ELFT> void SharedFile::parse() {
case SHT_GNU_verneed:
verneedSec = &sec;
break;
- case SHT_NOTE:
- noteSec = &sec;
- break;
}
}
@@ -1590,7 +1584,7 @@ template <class ELFT> void SharedFile::parse() {
verdefs = parseVerdefs<ELFT>(obj.base(), verdefSec);
std::vector<uint32_t> verneeds = parseVerneed<ELFT>(obj, verneedSec);
- parseGnuAndFeatures<ELFT>(obj.base(), getELFPhdrs<ELFT>(), noteSec);
+ parseGnuAndFeatures<ELFT>(obj.base(), getELFPhdrs<ELFT>());
// Parse ".gnu.version" section which is a parallel array for the symbol
// table. If a given file doesn't have a ".gnu.version" section, we use
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 5f4b04d5aff08..3d91c29319b1c 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -375,8 +375,7 @@ class SharedFile : public ELFFileBase {
const typename ELFT::Shdr *sec);
template <typename ELFT>
void parseGnuAndFeatures(const uint8_t *base,
- const typename ELFT::PhdrRange headers,
- const typename ELFT::Shdr *sHeader);
+ const typename ELFT::PhdrRange headers);
};
class BinaryFile : public InputFile {
>From 3a03477e513644c037a2d135ec1a811ee20004e9 Mon Sep 17 00:00:00 2001
From: Jack Styles <jack.styles at arm.com>
Date: Mon, 10 Mar 2025 11:29:37 +0000
Subject: [PATCH 12/13] Responding to Review Comments
Summary of changes:
* Release Notes syntax fix
* GcsReportPolicy has been reverted to an enum, with a function
available for converting the value from an enum to string
* getZGcsReport can now process both `-zgces-report` and
`-zgcs-report-dynamic` at the same time, applying the values where
the user has defined them, or the GNU Inheritance rules where
appropriate
* `elfPhdrs`, `numElfPhdrs` and `getElfPhdrs()` all removed as
the information can be easily access from other locations.
---
lld/ELF/Config.h | 31 ++++++++++--------------
lld/ELF/Driver.cpp | 51 +++++++++++++++++++++------------------
lld/ELF/InputFiles.cpp | 9 +++----
lld/ELF/InputFiles.h | 9 -------
lld/docs/ReleaseNotes.rst | 6 ++---
5 files changed, 46 insertions(+), 60 deletions(-)
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 1a627260a8e9e..3f5a605f7afea 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -137,24 +137,7 @@ enum LtoKind : uint8_t {UnifiedThin, UnifiedRegular, Default};
enum class GcsPolicy { Implicit, Never, Always };
// For -z gcs-report= and -zgcs-report-dynamic
-struct GcsReportPolicy {
- enum Options { None, Warning, Error, Unknown } value;
- GcsReportPolicy(GcsReportPolicy::Options valueInput) : value(valueInput) {};
-
- StringRef toString() {
- StringRef ret;
- if (value == Warning)
- ret = "warning";
- else if (value == Error)
- ret = "error";
- else
- ret = "none";
-
- return ret;
- }
-
- GcsReportPolicy::Options getValue() { return value; }
-};
+enum class GcsReportPolicy { None, Warning, Error, Unknown };
struct SymbolVersion {
llvm::StringRef name;
@@ -767,6 +750,18 @@ uint64_t errCount(Ctx &ctx);
ELFSyncStream InternalErr(Ctx &ctx, const uint8_t *buf);
+inline StringRef gcsReportPolicytoString(GcsReportPolicy value) {
+ StringRef ret;
+ if (value == GcsReportPolicy::Warning)
+ ret = "warning";
+ else if (value == GcsReportPolicy::Error)
+ ret = "error";
+ else
+ ret = "none";
+
+ return ret;
+}
+
#define CHECK2(E, S) lld::check2((E), [&] { return toStr(ctx, S); })
} // namespace lld::elf
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 477d915e3bf76..805e9cfd9548f 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -400,9 +400,9 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z bti-report only supported on AArch64";
if (ctx.arg.zPauthReport != "none")
ErrAlways(ctx) << "-z pauth-report only supported on AArch64";
- if (ctx.arg.zGcsReport.getValue() != GcsReportPolicy::None)
+ if (ctx.arg.zGcsReport != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
- if (ctx.arg.zGcsReportDynamic.getValue() != GcsReportPolicy::None)
+ if (ctx.arg.zGcsReportDynamic != GcsReportPolicy::None)
ErrAlways(ctx) << "-z gcs-report-dynamic only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
@@ -576,23 +576,27 @@ static GcsPolicy getZGcs(Ctx &ctx, opt::InputArgList &args) {
return ret;
}
-static GcsReportPolicy
-getZGcsReport(Ctx &ctx, opt::InputArgList &args, bool isReportDynamic,
- GcsReportPolicy gcsReportValue = GcsReportPolicy::None) {
- GcsReportPolicy ret = GcsReportPolicy::None;
+static void getZGcsReport(Ctx &ctx, opt::InputArgList &args) {
+ bool reportDynamicDefined = false;
for (auto *arg : args.filtered(OPT_z)) {
std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
- if ((!isReportDynamic && kv.first == "gcs-report") ||
- (isReportDynamic && kv.first == "gcs-report-dynamic")) {
+ if ((kv.first == "gcs-report") || kv.first == "gcs-report-dynamic") {
arg->claim();
- ret = StringSwitch<GcsReportPolicy>(kv.second)
- .Case("none", GcsReportPolicy::None)
- .Case("warning", GcsReportPolicy::Warning)
- .Case("error", GcsReportPolicy::Error)
- .Default(GcsReportPolicy::Unknown);
- if (ret.getValue() == GcsReportPolicy::Unknown)
+ GcsReportPolicy value = StringSwitch<GcsReportPolicy>(kv.second)
+ .Case("none", GcsReportPolicy::None)
+ .Case("warning", GcsReportPolicy::Warning)
+ .Case("error", GcsReportPolicy::Error)
+ .Default(GcsReportPolicy::Unknown);
+ if (value == GcsReportPolicy::Unknown)
ErrAlways(ctx) << "unknown -z " << kv.first << "= value: " << kv.second;
+
+ if (kv.first == "gcs-report")
+ ctx.arg.zGcsReport = value;
+ else if (kv.first == "gcs-report-dynamic") {
+ ctx.arg.zGcsReportDynamic = value;
+ reportDynamicDefined = true;
+ }
}
}
@@ -601,11 +605,9 @@ getZGcsReport(Ctx &ctx, opt::InputArgList &args, bool isReportDynamic,
// inherit this value if there is no user set value. This detects shared
// libraries without the GCS property but does not the shared-libraries to be
// rebuilt for successful linking
- if (isReportDynamic && gcsReportValue.getValue() != GcsReportPolicy::None &&
- ret.getValue() == GcsReportPolicy::None)
- ret = GcsReportPolicy::Warning;
-
- return ret;
+ if (!reportDynamicDefined && ctx.arg.zGcsReport != GcsReportPolicy::None &&
+ ctx.arg.zGcsReportDynamic == GcsReportPolicy::None)
+ ctx.arg.zGcsReportDynamic = GcsReportPolicy::Warning;
}
// Report a warning for an unknown -z option.
@@ -1587,9 +1589,10 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ctx.arg.zForceBti = hasZOption(args, "force-bti");
ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
ctx.arg.zGcs = getZGcs(ctx, args);
- ctx.arg.zGcsReport = getZGcsReport(ctx, args, /* isReportDynamic */ false);
- ctx.arg.zGcsReportDynamic =
- getZGcsReport(ctx, args, /* isReportDynamic */ true, ctx.arg.zGcsReport);
+ // getZGcsReport assings the values for `ctx.arg.zGcsReport` and
+ // `ctx.arg.zGcsReportDynamic within the function. By doing this, it saves
+ // calling the function twice, as both values can be parsed at once.
+ getZGcsReport(ctx, args);
ctx.arg.zGlobal = hasZOption(args, "global");
ctx.arg.zGnustack = getZGnuStack(args);
ctx.arg.zHazardplt = hasZOption(args, "hazardplt");
@@ -2877,7 +2880,7 @@ static void readSecurityNotes(Ctx &ctx) {
<< ": -z bti-report: file does not have "
"GNU_PROPERTY_AARCH64_FEATURE_1_BTI property";
- reportUnless(ctx.arg.zGcsReport.toString(),
+ reportUnless(gcsReportPolicytoString(ctx.arg.zGcsReport),
features & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
<< f
<< ": -z gcs-report: file does not have "
@@ -2955,7 +2958,7 @@ static void readSecurityNotes(Ctx &ctx) {
// either `warning` or `error`.
if (ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
for (SharedFile *f : ctx.sharedFiles)
- reportUnless(ctx.arg.zGcsReportDynamic.toString(),
+ reportUnless(gcsReportPolicytoString(ctx.arg.zGcsReportDynamic),
f->andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_GCS)
<< f
<< ": GCS is required by -z gcs, but this shared library lacks the "
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index 46b0cfade57cf..caab41ed24264 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1448,13 +1448,13 @@ 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 (numElfPhdrs == 0)
+ if (headers.size() == 0)
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 < numElfPhdrs; i++) {
+ for (unsigned i = 0; i < headers.size(); i++) {
if (headers[i].p_type != PT_GNU_PROPERTY)
continue;
const typename ELFT::Note note(
@@ -1510,10 +1510,7 @@ template <class ELFT> void SharedFile::parse() {
ArrayRef<Elf_Dyn> dynamicTags;
const ELFFile<ELFT> obj = this->getObj<ELFT>();
ArrayRef<Elf_Shdr> sections = getELFShdrs<ELFT>();
-
ArrayRef<Elf_Phdr> pHeaders = CHECK2(obj.program_headers(), this);
- elfPhdrs = pHeaders.data();
- numElfPhdrs = pHeaders.size();
const Elf_Shdr *versymSec = nullptr;
const Elf_Shdr *verdefSec = nullptr;
@@ -1584,7 +1581,7 @@ template <class ELFT> void SharedFile::parse() {
verdefs = parseVerdefs<ELFT>(obj.base(), verdefSec);
std::vector<uint32_t> verneeds = parseVerneed<ELFT>(obj, verneedSec);
- parseGnuAndFeatures<ELFT>(obj.base(), getELFPhdrs<ELFT>());
+ parseGnuAndFeatures<ELFT>(obj.base(), pHeaders);
// Parse ".gnu.version" section which is a parallel array for the symbol
// table. If a given file doesn't have a ".gnu.version" section, we use
diff --git a/lld/ELF/InputFiles.h b/lld/ELF/InputFiles.h
index 3d91c29319b1c..579f33ee306e6 100644
--- a/lld/ELF/InputFiles.h
+++ b/lld/ELF/InputFiles.h
@@ -360,15 +360,6 @@ class SharedFile : public ELFFileBase {
// parsed. Only filled for `--no-allow-shlib-undefined`.
SmallVector<Symbol *, 0> requiredSymbols;
- template <typename ELFT> typename ELFT::PhdrRange getELFPhdrs() const {
- return typename ELFT::PhdrRange(
- reinterpret_cast<const typename ELFT::Phdr *>(elfPhdrs), numElfPhdrs);
- }
-
-protected:
- const void *elfPhdrs = nullptr;
- uint32_t numElfPhdrs = 0;
-
private:
template <typename ELFT>
std::vector<uint32_t> parseVerneed(const llvm::object::ELFFile<ELFT> &obj,
diff --git a/lld/docs/ReleaseNotes.rst b/lld/docs/ReleaseNotes.rst
index ac524ff030644..de77b3d30d334 100644
--- a/lld/docs/ReleaseNotes.rst
+++ b/lld/docs/ReleaseNotes.rst
@@ -25,10 +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
+* 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
+ 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.
Breaking changes
>From 34668ed90ad902e9e5ce3f02626ae877be55e262 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Mon, 10 Mar 2025 20:28:15 -0700
Subject: [PATCH 13/13] Simplify code
---
lld/ELF/Config.h | 12 ----------
lld/ELF/Driver.cpp | 52 +++++++++++++++++++++++-------------------
lld/ELF/InputFiles.cpp | 18 +++++++--------
3 files changed, 38 insertions(+), 44 deletions(-)
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index 3f5a605f7afea..235b44fea425d 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -750,18 +750,6 @@ uint64_t errCount(Ctx &ctx);
ELFSyncStream InternalErr(Ctx &ctx, const uint8_t *buf);
-inline StringRef gcsReportPolicytoString(GcsReportPolicy value) {
- StringRef ret;
- if (value == GcsReportPolicy::Warning)
- ret = "warning";
- else if (value == GcsReportPolicy::Error)
- ret = "error";
- else
- ret = "none";
-
- return ret;
-}
-
#define CHECK2(E, S) lld::check2((E), [&] { return toStr(ctx, S); })
} // namespace lld::elf
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 805e9cfd9548f..037f3643e7835 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -578,31 +578,29 @@ static GcsPolicy getZGcs(Ctx &ctx, opt::InputArgList &args) {
static void getZGcsReport(Ctx &ctx, opt::InputArgList &args) {
bool reportDynamicDefined = false;
-
for (auto *arg : args.filtered(OPT_z)) {
std::pair<StringRef, StringRef> kv = StringRef(arg->getValue()).split('=');
- if ((kv.first == "gcs-report") || kv.first == "gcs-report-dynamic") {
- arg->claim();
- GcsReportPolicy value = StringSwitch<GcsReportPolicy>(kv.second)
- .Case("none", GcsReportPolicy::None)
- .Case("warning", GcsReportPolicy::Warning)
- .Case("error", GcsReportPolicy::Error)
- .Default(GcsReportPolicy::Unknown);
- if (value == GcsReportPolicy::Unknown)
- ErrAlways(ctx) << "unknown -z " << kv.first << "= value: " << kv.second;
-
- if (kv.first == "gcs-report")
- ctx.arg.zGcsReport = value;
- else if (kv.first == "gcs-report-dynamic") {
- ctx.arg.zGcsReportDynamic = value;
- reportDynamicDefined = true;
- }
+ if (kv.first != "gcs-report" && kv.first != "gcs-report-dynamic")
+ continue;
+ arg->claim();
+ auto value = StringSwitch<GcsReportPolicy>(kv.second)
+ .Case("none", GcsReportPolicy::None)
+ .Case("warning", GcsReportPolicy::Warning)
+ .Case("error", GcsReportPolicy::Error)
+ .Default(GcsReportPolicy::Unknown);
+ if (value == GcsReportPolicy::Unknown)
+ ErrAlways(ctx) << "unknown -z " << kv.first << "= value: " << kv.second;
+
+ if (kv.first == "gcs-report") {
+ ctx.arg.zGcsReport = value;
+ } else if (kv.first == "gcs-report-dynamic") {
+ ctx.arg.zGcsReportDynamic = value;
+ reportDynamicDefined = true;
}
}
- // The behaviour of -zgnu-report-dynamic matches that of GNU ld. When
- // -zgcs-report is set to `warning` or `error`, -zgcs-report-dynamic will
- // inherit this value if there is no user set value. This detects shared
+ // When -zgcs-report is set to `warning` or `error`, -zgcs-report-dynamic will
+ // inherit this value if unspecified, matching GNU ld. This detects shared
// libraries without the GCS property but does not the shared-libraries to be
// rebuilt for successful linking
if (!reportDynamicDefined && ctx.arg.zGcsReport != GcsReportPolicy::None &&
@@ -1589,9 +1587,6 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
ctx.arg.zForceBti = hasZOption(args, "force-bti");
ctx.arg.zForceIbt = hasZOption(args, "force-ibt");
ctx.arg.zGcs = getZGcs(ctx, args);
- // getZGcsReport assings the values for `ctx.arg.zGcsReport` and
- // `ctx.arg.zGcsReportDynamic within the function. By doing this, it saves
- // calling the function twice, as both values can be parsed at once.
getZGcsReport(ctx, args);
ctx.arg.zGlobal = hasZOption(args, "global");
ctx.arg.zGnustack = getZGnuStack(args);
@@ -2827,6 +2822,17 @@ static void redirectSymbols(Ctx &ctx, ArrayRef<WrappedSymbol> wrapped) {
ctx.symtab->wrap(w.sym, w.real, w.wrap);
}
+static StringRef gcsReportPolicytoString(GcsReportPolicy value) {
+ StringRef ret;
+ if (value == GcsReportPolicy::Warning)
+ ret = "warning";
+ else if (value == GcsReportPolicy::Error)
+ ret = "error";
+ else
+ ret = "none";
+ return ret;
+}
+
// To enable CET (x86's hardware-assisted control flow enforcement), each
// source file must be compiled with -fcf-protection. Object files compiled
// with the flag contain feature flags indicating that they are compatible
diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
index caab41ed24264..31c36ca58191d 100644
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -919,13 +919,13 @@ void ObjFile<ELFT>::initializeSections(bool ignoreComdats,
}
template <typename ELFT>
-static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
- ArrayRef<uint8_t> &desc, ELFFileBase *f,
- const uint8_t *base,
+static void parseGnuPropertyNote(Ctx &ctx, ELFFileBase &f,
+ uint32_t featureAndType,
+ ArrayRef<uint8_t> &desc, const uint8_t *base,
ArrayRef<uint8_t> *data = nullptr) {
auto err = [&](const uint8_t *place) -> ELFSyncStream {
auto diag = Err(ctx);
- diag << f->getName() << ":(" << ".note.gnu.property+0x"
+ diag << &f << ":(" << ".note.gnu.property+0x"
<< Twine::utohexstr(place - base) << "): ";
return diag;
};
@@ -946,7 +946,7 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
// accumulate the bits set.
if (size < 4)
return void(err(place) << "FEATURE_1_AND entry is too short");
- f->andFeatures |= read32<ELFT::Endianness>(desc.data());
+ 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
@@ -954,7 +954,7 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
// 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()) {
+ if (!f.aarch64PauthAbiCoreInfo.empty()) {
return void(
err(contents.data())
<< "multiple GNU_PROPERTY_AARCH64_FEATURE_PAUTH entries are "
@@ -965,7 +965,7 @@ static void parseGnuPropertyNote(Ctx &ctx, uint32_t &featureAndType,
"is invalid: expected 16 bytes, but got "
<< size);
}
- f->aarch64PauthAbiCoreInfo = desc;
+ f.aarch64PauthAbiCoreInfo = desc;
}
// Padding is present in the note descriptor, if necessary.
@@ -1010,7 +1010,7 @@ static void readGnuProperty(Ctx &ctx, const InputSection &sec,
// Read a body of a NOTE record, which consists of type-length-value fields.
ArrayRef<uint8_t> desc = note.getDesc(sec.addralign);
const uint8_t *base = sec.content().data();
- parseGnuPropertyNote<ELFT>(ctx, featureAndType, desc, &f, base, &data);
+ parseGnuPropertyNote<ELFT>(ctx, f, featureAndType, desc, base, &data);
// Go to next NOTE record to look for more FEATURE_1_AND descriptions.
data = data.slice(nhdr->getSize(sec.addralign));
@@ -1465,7 +1465,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, featureAndType, desc, this, base);
+ parseGnuPropertyNote<ELFT>(ctx, *this, featureAndType, desc, base);
}
}
More information about the llvm-commits
mailing list