[lld] [LLD][ELF] Add `-z execute-only-report` that checks PURECODE section flags (PR #128883)
Csanád Hajdú via llvm-commits
llvm-commits at lists.llvm.org
Sat Mar 1 12:08:32 PST 2025
https://github.com/Il-Capitano updated https://github.com/llvm/llvm-project/pull/128883
>From 69048e38b0f89d1921b9e5f96340e8d98049165d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Wed, 26 Feb 2025 15:27:52 +0100
Subject: [PATCH 1/5] [LLD][ELF] Add `-z execute-only-report` that checks
PURECODE flags
`-z execute-only-report` checks that all executable sections have either
the SHF_AARCH64_PURECODE or SHF_ARM_PURECODE section flag set on AArch64
and ARM respectively.
---
lld/ELF/Config.h | 1 +
lld/ELF/Driver.cpp | 15 +++++---
lld/ELF/Writer.cpp | 34 ++++++++++++++++++
lld/test/ELF/aarch64-execute-only-report.s | 40 ++++++++++++++++++++++
lld/test/ELF/arm-execute-only-report.s | 36 +++++++++++++++++++
lld/test/ELF/execute-only-report-error.s | 18 ++++++++++
6 files changed, 140 insertions(+), 4 deletions(-)
create mode 100644 lld/test/ELF/aarch64-execute-only-report.s
create mode 100644 lld/test/ELF/arm-execute-only-report.s
create mode 100644 lld/test/ELF/execute-only-report-error.s
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index f132b11b20c63..b5872b85efd3a 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -229,6 +229,7 @@ struct Config {
StringRef zCetReport = "none";
StringRef zPauthReport = "none";
StringRef zGcsReport = "none";
+ StringRef zExecuteOnlyReport = "none";
bool ltoBBAddrMap;
llvm::StringRef ltoBasicBlockSections;
std::pair<llvm::StringRef, llvm::StringRef> thinLTOObjectSuffixReplace;
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 862195098c1aa..c5de522daa177 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -406,6 +406,11 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z gcs only supported on AArch64";
}
+ if (ctx.arg.emachine != EM_AARCH64 && ctx.arg.emachine != EM_ARM &&
+ ctx.arg.zExecuteOnlyReport != "none")
+ ErrAlways(ctx)
+ << "-z execute-only-report only supported on AArch64 and ARM";
+
if (ctx.arg.emachine != EM_PPC64) {
if (ctx.arg.tocOptimize)
ErrAlways(ctx) << "--toc-optimize is only supported on PowerPC64 targets";
@@ -1620,10 +1625,12 @@ 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("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("gcs-report", &ctx.arg.zGcsReport),
+ 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/Writer.cpp b/lld/ELF/Writer.cpp
index 0d61e8d8d91a4..0d84ae518e571 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -64,6 +64,7 @@ template <class ELFT> class Writer {
void sortOrphanSections();
void finalizeSections();
void checkExecuteOnly();
+ void checkExecuteOnlyReport();
void setReservedSymbolSections();
SmallVector<std::unique_ptr<PhdrEntry>, 0> createPhdrs(Partition &part);
@@ -323,6 +324,7 @@ template <class ELFT> void Writer<ELFT>::run() {
// finalizeSections does that.
finalizeSections();
checkExecuteOnly();
+ checkExecuteOnlyReport();
// If --compressed-debug-sections is specified, compress .debug_* sections.
// Do it right now because it changes the size of output sections.
@@ -2176,6 +2178,38 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
"data and code";
}
+// Check which input sections of RX output sections don't have the
+// SHF_AARCH64_PURECODE or SHF_ARM_PURECODE flag set.
+template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
+ if ((ctx.arg.emachine != EM_AARCH64 && ctx.arg.emachine != EM_ARM) ||
+ ctx.arg.zExecuteOnlyReport == "none")
+ return;
+
+ auto reportUnless = [&](bool cond) -> ELFSyncStream {
+ if (cond)
+ return {ctx, DiagLevel::None};
+ if (ctx.arg.zExecuteOnlyReport == "error")
+ return {ctx, DiagLevel::Err};
+ if (ctx.arg.zExecuteOnlyReport == "warning")
+ return {ctx, DiagLevel::Warn};
+ return {ctx, DiagLevel::None};
+ };
+
+ uint64_t purecodeFlag =
+ ctx.arg.emachine == EM_AARCH64 ? SHF_AARCH64_PURECODE : SHF_ARM_PURECODE;
+ StringRef purecodeFlagName = ctx.arg.emachine == EM_AARCH64
+ ? "SHF_AARCH64_PURECODE"
+ : "SHF_ARM_PURECODE";
+ SmallVector<InputSection *, 0> storage;
+ for (OutputSection *osec : ctx.outputSections)
+ if (osec->getPhdrFlags() == (PF_R | PF_X))
+ for (InputSection *sec : getInputSections(*osec, storage))
+ if (sec->file && sec->file->getName() != "<internal>")
+ reportUnless(sec->flags & purecodeFlag)
+ << "-z execute-only-report: " << sec << " does not have "
+ << purecodeFlagName << " flag set";
+}
+
// The linker is expected to define SECNAME_start and SECNAME_end
// symbols for a few sections. This function defines them.
template <class ELFT> void Writer<ELFT>::addStartEndSymbols() {
diff --git a/lld/test/ELF/aarch64-execute-only-report.s b/lld/test/ELF/aarch64-execute-only-report.s
new file mode 100644
index 0000000000000..e56eed819d12b
--- /dev/null
+++ b/lld/test/ELF/aarch64-execute-only-report.s
@@ -0,0 +1,40 @@
+// REQUIRES: aarch64
+
+// RUN: llvm-mc --triple=aarch64 --filetype=obj -o %t.o %s
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings %t.o -o /dev/null
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=WARNING %s
+// RUN: ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=WARNING %s
+// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=ERROR %s
+// RUN: not ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=error %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=ERROR %s
+
+// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
+// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
+// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
+// WARNING-NOT: warning: -z execute-only-report: <internal>:({{.*}}) does not have SHF_AARCH64_PURECODE flag set
+
+// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
+// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
+// ERROR: error: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
+// ERROR-NOT: error: -z execute-only-report: <internal>:({{.*}}) does not have SHF_AARCH64_PURECODE flag set
+
+.section .text,"axy", at progbits,unique,0
+.globl _start
+_start:
+ bl foo
+ bl bar
+ bl absolute
+ ret
+
+.section .text.foo,"axy", at progbits,unique,0
+.globl foo
+foo:
+ ret
+
+.section .text.bar,"ax", at progbits,unique,0
+.globl bar
+bar:
+ ret
diff --git a/lld/test/ELF/arm-execute-only-report.s b/lld/test/ELF/arm-execute-only-report.s
new file mode 100644
index 0000000000000..1676a8f654552
--- /dev/null
+++ b/lld/test/ELF/arm-execute-only-report.s
@@ -0,0 +1,36 @@
+// REQUIRES: arm
+
+// RUN: llvm-mc --triple=armv7 --filetype=obj -o %t.o %s
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings %t.o -o /dev/null
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=WARNING %s
+// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=ERROR %s
+
+// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_ARM_PURECODE flag set
+// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
+// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
+// WARNING-NOT: warning: -z execute-only-report: <internal>:({{.*}}) does not have SHF_ARM_PURECODE flag set
+
+// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_ARM_PURECODE flag set
+// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
+// ERROR: error: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
+// ERROR-NOT: error: -z execute-only-report: <internal>:({{.*}}) does not have SHF_ARM_PURECODE flag set
+
+.section .text,"axy",%progbits,unique,0
+.globl _start
+_start:
+ bl foo
+ bl bar
+ bl absolute
+ bx lr
+
+.section .text.foo,"axy",%progbits,unique,0
+.globl foo
+foo:
+ bx lr
+
+.section .text.bar,"ax",%progbits,unique,0
+.globl bar
+bar:
+ bx lr
diff --git a/lld/test/ELF/execute-only-report-error.s b/lld/test/ELF/execute-only-report-error.s
new file mode 100644
index 0000000000000..91afd4edfc0d2
--- /dev/null
+++ b/lld/test/ELF/execute-only-report-error.s
@@ -0,0 +1,18 @@
+// REQUIRES: x86
+
+// RUN: llvm-mc --triple=x86_64 --filetype=obj -o %t.o %s
+// RUN: not ld.lld -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck %s
+// RUN: not ld.lld -z execute-only-report=error %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck %s
+
+// CHECK: error: -z execute-only-report only supported on AArch64 and ARM
+
+// RUN: not ld.lld -z execute-only-report=foo %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=INVALID %s
+
+// INVALID: error: -z execute-only-report= parameter foo is not recognized
+
+.globl _start
+_start:
+ ret
>From aae48337ed83e814bd39245bc16842390f00e1a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Thu, 27 Feb 2025 10:08:20 +0100
Subject: [PATCH 2/5] Address review feedback in tests
---
lld/test/ELF/aarch64-execute-only-report.s | 38 ++++++++++++----------
lld/test/ELF/arm-execute-only-report.s | 30 +++++++++--------
lld/test/ELF/execute-only-report-error.s | 18 ----------
lld/test/ELF/target-specific-options.s | 10 ++++++
4 files changed, 48 insertions(+), 48 deletions(-)
delete mode 100644 lld/test/ELF/execute-only-report-error.s
diff --git a/lld/test/ELF/aarch64-execute-only-report.s b/lld/test/ELF/aarch64-execute-only-report.s
index e56eed819d12b..8a3d56db840d8 100644
--- a/lld/test/ELF/aarch64-execute-only-report.s
+++ b/lld/test/ELF/aarch64-execute-only-report.s
@@ -1,24 +1,28 @@
// REQUIRES: aarch64
-// RUN: llvm-mc --triple=aarch64 --filetype=obj -o %t.o %s
-// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings %t.o -o /dev/null
-// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=WARNING %s
-// RUN: ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=WARNING %s
-// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=ERROR %s
-// RUN: not ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=error %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=ERROR %s
-
-// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
-// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
-// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
+// RUN: rm -rf %t && mkdir %t && cd %t
+// RUN: llvm-mc --triple=aarch64 --filetype=obj %s -o a.o
+
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings a.o
+
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning a.o 2>&1 | \
+// RUN: FileCheck --check-prefix=WARNING %s
+// RUN: ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=warning a.o 2>&1 | \
+// RUN: FileCheck --check-prefix=WARNING %s
+
+// WARNING-NOT: warning: -z execute-only-report: a.o:(.text) does not have SHF_AARCH64_PURECODE flag set
+// WARNING-NOT: warning: -z execute-only-report: a.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
+// WARNING: warning: -z execute-only-report: a.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
// WARNING-NOT: warning: -z execute-only-report: <internal>:({{.*}}) does not have SHF_AARCH64_PURECODE flag set
-// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
-// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
-// ERROR: error: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
+// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error a.o 2>&1 | \
+// RUN: FileCheck --check-prefix=ERROR %s
+// RUN: not ld.lld --defsym absolute=0xf0000000 --execute-only -z execute-only-report=error a.o 2>&1 | \
+// RUN: FileCheck --check-prefix=ERROR %s
+
+// ERROR-NOT: error: -z execute-only-report: a.o:(.text) does not have SHF_AARCH64_PURECODE flag set
+// ERROR-NOT: error: -z execute-only-report: a.o:(.text.foo) does not have SHF_AARCH64_PURECODE flag set
+// ERROR: error: -z execute-only-report: a.o:(.text.bar) does not have SHF_AARCH64_PURECODE flag set
// ERROR-NOT: error: -z execute-only-report: <internal>:({{.*}}) does not have SHF_AARCH64_PURECODE flag set
.section .text,"axy", at progbits,unique,0
diff --git a/lld/test/ELF/arm-execute-only-report.s b/lld/test/ELF/arm-execute-only-report.s
index 1676a8f654552..869aded71fb6f 100644
--- a/lld/test/ELF/arm-execute-only-report.s
+++ b/lld/test/ELF/arm-execute-only-report.s
@@ -1,20 +1,24 @@
// REQUIRES: arm
-// RUN: llvm-mc --triple=armv7 --filetype=obj -o %t.o %s
-// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings %t.o -o /dev/null
-// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=WARNING %s
-// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=ERROR %s
-
-// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_ARM_PURECODE flag set
-// WARNING-NOT: warning: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
-// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
+// RUN: rm -rf %t && mkdir %t && cd %t
+// RUN: llvm-mc --triple=armv7 --filetype=obj %s -o a.o
+
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=none --fatal-warnings a.o
+
+// RUN: ld.lld --defsym absolute=0xf0000000 -z execute-only-report=warning a.o 2>&1 | \
+// RUN: FileCheck --check-prefix=WARNING %s
+
+// WARNING-NOT: warning: -z execute-only-report: a.o:(.text) does not have SHF_ARM_PURECODE flag set
+// WARNING-NOT: warning: -z execute-only-report: a.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
+// WARNING: warning: -z execute-only-report: a.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
// WARNING-NOT: warning: -z execute-only-report: <internal>:({{.*}}) does not have SHF_ARM_PURECODE flag set
-// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_ARM_PURECODE flag set
-// ERROR-NOT: error: -z execute-only-report: {{.*}}.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
-// ERROR: error: -z execute-only-report: {{.*}}.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
+// RUN: not ld.lld --defsym absolute=0xf0000000 -z execute-only-report=error a.o 2>&1 | \
+// RUN: FileCheck --check-prefix=ERROR %s
+
+// ERROR-NOT: error: -z execute-only-report: a.o:(.text) does not have SHF_ARM_PURECODE flag set
+// ERROR-NOT: error: -z execute-only-report: a.o:(.text.foo) does not have SHF_ARM_PURECODE flag set
+// ERROR: error: -z execute-only-report: a.o:(.text.bar) does not have SHF_ARM_PURECODE flag set
// ERROR-NOT: error: -z execute-only-report: <internal>:({{.*}}) does not have SHF_ARM_PURECODE flag set
.section .text,"axy",%progbits,unique,0
diff --git a/lld/test/ELF/execute-only-report-error.s b/lld/test/ELF/execute-only-report-error.s
deleted file mode 100644
index 91afd4edfc0d2..0000000000000
--- a/lld/test/ELF/execute-only-report-error.s
+++ /dev/null
@@ -1,18 +0,0 @@
-// REQUIRES: x86
-
-// RUN: llvm-mc --triple=x86_64 --filetype=obj -o %t.o %s
-// RUN: not ld.lld -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck %s
-// RUN: not ld.lld -z execute-only-report=error %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck %s
-
-// CHECK: error: -z execute-only-report only supported on AArch64 and ARM
-
-// RUN: not ld.lld -z execute-only-report=foo %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=INVALID %s
-
-// INVALID: error: -z execute-only-report= parameter foo is not recognized
-
-.globl _start
-_start:
- ret
diff --git a/lld/test/ELF/target-specific-options.s b/lld/test/ELF/target-specific-options.s
index 0f126f0186f8b..2c19e41147b93 100644
--- a/lld/test/ELF/target-specific-options.s
+++ b/lld/test/ELF/target-specific-options.s
@@ -13,5 +13,15 @@
# RUN: not ld.lld %t --toc-optimize -o /dev/null 2>&1 | FileCheck %s --check-prefix=ERR-TOC
# ERR-TOC: error: --toc-optimize is only supported on PowerPC64 targets
+# RUN: not ld.lld %t -z execute-only-report=warning -o /dev/null 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY
+# RUN: not ld.lld %t -z execute-only-report=error -o /dev/null 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY
+# ERR-EXECUTE-ONLY: error: -z execute-only-report only supported on AArch64 and ARM
+
+# RUN: not ld.lld %t -z execute-only-report=foo -o /dev/null 2>&1 | \
+# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY-INVALID
+# ERR-EXECUTE-ONLY-INVALID: error: -z execute-only-report= parameter foo is not recognized
+
.globl _start
_start:
>From 144b93fe87ec1d3f93baec0cbcb531730096a0d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Thu, 27 Feb 2025 10:18:31 +0100
Subject: [PATCH 3/5] Address review feedback in Writer.cpp
---
lld/ELF/Writer.cpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 0d84ae518e571..89853eae84e1d 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2181,8 +2181,7 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
// Check which input sections of RX output sections don't have the
// SHF_AARCH64_PURECODE or SHF_ARM_PURECODE flag set.
template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
- if ((ctx.arg.emachine != EM_AARCH64 && ctx.arg.emachine != EM_ARM) ||
- ctx.arg.zExecuteOnlyReport == "none")
+ if (ctx.arg.zExecuteOnlyReport == "none")
return;
auto reportUnless = [&](bool cond) -> ELFSyncStream {
@@ -2204,7 +2203,7 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
for (OutputSection *osec : ctx.outputSections)
if (osec->getPhdrFlags() == (PF_R | PF_X))
for (InputSection *sec : getInputSections(*osec, storage))
- if (sec->file && sec->file->getName() != "<internal>")
+ if (!isa<SyntheticSection>(sec))
reportUnless(sec->flags & purecodeFlag)
<< "-z execute-only-report: " << sec << " does not have "
<< purecodeFlagName << " flag set";
>From ddaf54d4b425c5bc67079218c25fd16f1a0ca79d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Sat, 1 Mar 2025 19:30:09 +0100
Subject: [PATCH 4/5] Update unknown argument error message
---
lld/test/ELF/target-specific-options.s | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lld/test/ELF/target-specific-options.s b/lld/test/ELF/target-specific-options.s
index 2c19e41147b93..9d57776fcfbef 100644
--- a/lld/test/ELF/target-specific-options.s
+++ b/lld/test/ELF/target-specific-options.s
@@ -21,7 +21,7 @@
# RUN: not ld.lld %t -z execute-only-report=foo -o /dev/null 2>&1 | \
# RUN: FileCheck %s --check-prefix=ERR-EXECUTE-ONLY-INVALID
-# ERR-EXECUTE-ONLY-INVALID: error: -z execute-only-report= parameter foo is not recognized
+# ERR-EXECUTE-ONLY-INVALID: error: unknown -z execute-only-report= value: foo
.globl _start
_start:
>From 404ac5d9d5c723ee9eff0265bc4107476cf52e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Sat, 1 Mar 2025 21:07:05 +0100
Subject: [PATCH 5/5] Reduce indentation depth in checkExecuteOnlyReport
---
lld/ELF/Writer.cpp | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 89853eae84e1d..f249bb198e98d 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2200,13 +2200,17 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
? "SHF_AARCH64_PURECODE"
: "SHF_ARM_PURECODE";
SmallVector<InputSection *, 0> storage;
- for (OutputSection *osec : ctx.outputSections)
- if (osec->getPhdrFlags() == (PF_R | PF_X))
- for (InputSection *sec : getInputSections(*osec, storage))
- if (!isa<SyntheticSection>(sec))
- reportUnless(sec->flags & purecodeFlag)
- << "-z execute-only-report: " << sec << " does not have "
- << purecodeFlagName << " flag set";
+ for (OutputSection *osec : ctx.outputSections) {
+ if (osec->getPhdrFlags() != (PF_R | PF_X))
+ continue;
+ for (InputSection *sec : getInputSections(*osec, storage)) {
+ if (isa<SyntheticSection>(sec))
+ continue;
+ reportUnless(sec->flags & purecodeFlag)
+ << "-z execute-only-report: " << sec << " does not have "
+ << purecodeFlagName << " flag set";
+ }
+ }
}
// The linker is expected to define SECNAME_start and SECNAME_end
More information about the llvm-commits
mailing list