[lld] [LLD][ELF][AArch64] Add support for SHF_AARCH64_PURECODE ELF section flag (3/3) (PR #125689)
Csanád Hajdú via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 21 08:59:07 PST 2025
https://github.com/Il-Capitano updated https://github.com/llvm/llvm-project/pull/125689
>From 796adeadc8c8090823ab2fe8b90d76e291801b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Tue, 4 Feb 2025 14:55:22 +0100
Subject: [PATCH 01/13] [LLD][ELF][AArch64] Add support for
SHF_AARCH64_PURECODE ELF section flag (3/3)
Add support for the new SHF_AARCH64_PURECODE ELF section flag: https://github.com/ARM-software/abi-aa/pull/304
The general implementation follows the existing one for ARM targets. The
output section only has the `SHF_AARCH64_PURECODE` flag set if all input
sections have it set.
---
lld/ELF/Config.h | 1 +
lld/ELF/Driver.cpp | 67 +++++++++++++++++++++++++++--
lld/ELF/OutputSections.cpp | 10 +++--
lld/ELF/ScriptParser.cpp | 1 +
lld/test/ELF/aarch64-execute-only.s | 33 ++++++++++++++
5 files changed, 105 insertions(+), 7 deletions(-)
create mode 100644 lld/test/ELF/aarch64-execute-only.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 70a293875f27b..21f444bbcd4de 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -461,6 +461,27 @@ static void checkOptions(Ctx &ctx) {
if (ctx.arg.zRetpolineplt && ctx.arg.zForceIbt)
ErrAlways(ctx) << "-z force-ibt may not be used with -z retpolineplt";
+
+ if (ctx.arg.emachine != EM_AARCH64) {
+ if (ctx.arg.zPacPlt)
+ ErrAlways(ctx) << "-z pac-plt only supported on AArch64";
+ if (ctx.arg.zForceBti)
+ ErrAlways(ctx) << "-z force-bti only supported on AArch64";
+ if (ctx.arg.zBtiReport != "none")
+ 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")
+ ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
+ if (ctx.arg.zGcs != GcsPolicy::Implicit)
+ ErrAlways(ctx) << "-z gcs only supported on AArch64";
+ if (ctx.arg.zExecuteOnlyReport != "none")
+ ErrAlways(ctx) << "-z execute-only-report only supported on AArch64";
+ }
+
+ if (ctx.arg.emachine != EM_386 && ctx.arg.emachine != EM_X86_64 &&
+ ctx.arg.zCetReport != "none")
+ ErrAlways(ctx) << "-z cet-report only supported on X86 and X86_64";
}
static const char *getReproduceOption(opt::InputArgList &args) {
@@ -1620,10 +1641,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("gcs-report", &ctx.arg.zGcsReport),
+ std::make_pair("pauth-report", &ctx.arg.zPauthReport),
+ std::make_pair("execute-only-report", &ctx.arg.zExecuteOnlyReport)};
for (opt::Arg *arg : args.filtered(OPT_z)) {
std::pair<StringRef, StringRef> option =
StringRef(arg->getValue()).split('=');
@@ -2906,6 +2929,40 @@ static void readSecurityNotes(Ctx &ctx) {
ctx.arg.andFeatures &= ~GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
}
+static void checkExecuteOnly(Ctx &ctx) {
+ if (ctx.arg.emachine != EM_AARCH64)
+ return;
+
+ auto report = [&](StringRef config) -> ELFSyncStream {
+ if (config == "error")
+ return {ctx, DiagLevel::Err};
+ if (config == "warning")
+ return {ctx, DiagLevel::Warn};
+ return {ctx, DiagLevel::None};
+ };
+ auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
+ if (cond)
+ return {ctx, DiagLevel::None};
+ return report(config);
+ };
+
+ for (ELFFileBase *file : ctx.objectFiles) {
+ for (InputSectionBase *section : file->getSections()) {
+ // Only check for executable sections.
+ if (!(section && section->flags & SHF_EXECINSTR))
+ continue;
+
+ OutputSection *outputSection = section->getOutputSection();
+ if (outputSection && outputSection->name == ".text") {
+ reportUnless(ctx.arg.zExecuteOnlyReport,
+ section->flags & SHF_AARCH64_PURECODE)
+ << file << ": -z execute-only-report: section " << section->name
+ << " does not have SHF_AARCH64_PURECODE flag set";
+ }
+ }
+ }
+}
+
static void initSectionsAndLocalSyms(ELFFileBase *file, bool ignoreComdats) {
switch (file->ekind) {
case ELF32LEKind:
@@ -3272,6 +3329,8 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
ctx.script->addOrphanSections();
}
+ checkExecuteOnly(ctx);
+
{
llvm::TimeTraceScope timeScope("Merge/finalize input sections");
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
index a2da5543d5867..c8dc0e5fe0335 100644
--- a/lld/ELF/OutputSections.cpp
+++ b/lld/ELF/OutputSections.cpp
@@ -42,7 +42,8 @@ using namespace lld::elf;
uint32_t OutputSection::getPhdrFlags() const {
uint32_t ret = 0;
- if (ctx.arg.emachine != EM_ARM || !(flags & SHF_ARM_PURECODE))
+ if ((ctx.arg.emachine != EM_ARM || !(flags & SHF_ARM_PURECODE)) &&
+ (ctx.arg.emachine != EM_AARCH64 || !(flags & SHF_AARCH64_PURECODE)))
ret |= PF_R;
if (flags & SHF_WRITE)
ret |= PF_W;
@@ -161,8 +162,11 @@ void OutputSection::commitSection(InputSection *isec) {
}
isec->parent = this;
- uint64_t andMask =
- ctx.arg.emachine == EM_ARM ? (uint64_t)SHF_ARM_PURECODE : 0;
+ uint64_t andMask = 0;
+ if (ctx.arg.emachine == EM_ARM)
+ andMask |= (uint64_t)SHF_ARM_PURECODE;
+ if (ctx.arg.emachine == EM_AARCH64)
+ andMask |= (uint64_t)SHF_AARCH64_PURECODE;
uint64_t orMask = ~andMask;
uint64_t andFlags = (flags & isec->flags) & andMask;
uint64_t orFlags = (flags | isec->flags) & orMask;
diff --git a/lld/ELF/ScriptParser.cpp b/lld/ELF/ScriptParser.cpp
index a10af9565a1d6..671a5ec4deccb 100644
--- a/lld/ELF/ScriptParser.cpp
+++ b/lld/ELF/ScriptParser.cpp
@@ -1411,6 +1411,7 @@ static std::optional<uint64_t> parseFlag(StringRef tok) {
.Case(CASE_ENT(SHF_COMPRESSED))
.Case(CASE_ENT(SHF_EXCLUDE))
.Case(CASE_ENT(SHF_ARM_PURECODE))
+ .Case(CASE_ENT(SHF_AARCH64_PURECODE))
.Default(std::nullopt);
#undef CASE_ENT
}
diff --git a/lld/test/ELF/aarch64-execute-only.s b/lld/test/ELF/aarch64-execute-only.s
new file mode 100644
index 0000000000000..e67bbf05ff2e2
--- /dev/null
+++ b/lld/test/ELF/aarch64-execute-only.s
@@ -0,0 +1,33 @@
+// REQUIRES: aarch64
+
+// RUN: llvm-mc -filetype=obj -triple=aarch64-linux-none %s -o %t.o
+// RUN: ld.lld %t.o -o %t.so -shared
+// RUN: llvm-readelf -l %t.so | FileCheck --implicit-check-not=LOAD %s
+
+// RUN: echo ".section .foo,\"ax\"; \
+// RUN: ret" > %t.s
+// RUN: llvm-mc -filetype=obj -triple=aarch64-linux-none %t.s -o %t2.o
+// RUN: ld.lld %t.o %t2.o -o %t.so -shared
+// RUN: llvm-readelf -l %t.so | FileCheck --check-prefix=DIFF --implicit-check-not=LOAD %s
+
+// CHECK: LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x000245 0x000245 R 0x10000
+// CHECK: LOAD 0x000248 0x0000000000010248 0x0000000000010248 0x{{.*}} 0x{{.*}} R E 0x10000
+// CHECK: LOAD 0x00024c 0x000000000002024c 0x000000000002024c 0x{{.*}} 0x{{.*}} E 0x10000
+// CHECK: LOAD 0x000250 0x0000000000030250 0x0000000000030250 0x000070 0x000db0 RW 0x10000
+
+// CHECK: 01 .dynsym .gnu.hash .hash .dynstr
+// CHECK: 02 .text
+// CHECK: 03 .foo
+// CHECK: 04 .dynamic
+
+// DIFF: LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x00020d 0x00020d R 0x10000
+// DIFF: LOAD 0x000210 0x0000000000010210 0x0000000000010210 0x00000c 0x00000c R E 0x10000
+// DIFF: LOAD 0x000220 0x0000000000020220 0x0000000000020220 0x000070 0x000de0 RW 0x10000
+
+// DIFF: 01 .dynsym .gnu.hash .hash .dynstr
+// DIFF: 02 .text .foo
+// DIFF: 03 .dynamic
+
+ ret
+ .section .foo,"axy"
+ ret
>From 53b6bdf7c66c70260c7a00bdf930fe1a838edff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Tue, 4 Feb 2025 16:46:48 +0100
Subject: [PATCH 02/13] Address some review feedback
---
lld/ELF/Driver.cpp | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 21f444bbcd4de..bce0a74d8dcc1 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -2933,22 +2933,18 @@ static void checkExecuteOnly(Ctx &ctx) {
if (ctx.arg.emachine != EM_AARCH64)
return;
- auto report = [&](StringRef config) -> ELFSyncStream {
+ auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
+ if (cond)
+ return {ctx, DiagLevel::None};
if (config == "error")
return {ctx, DiagLevel::Err};
if (config == "warning")
return {ctx, DiagLevel::Warn};
return {ctx, DiagLevel::None};
};
- auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
- if (cond)
- return {ctx, DiagLevel::None};
- return report(config);
- };
for (ELFFileBase *file : ctx.objectFiles) {
for (InputSectionBase *section : file->getSections()) {
- // Only check for executable sections.
if (!(section && section->flags & SHF_EXECINSTR))
continue;
>From 282ba84d8f27188dcddc78d18a7781198fb643b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Tue, 4 Feb 2025 17:14:23 +0100
Subject: [PATCH 03/13] Add tests for -z execute-only-report
---
.../ELF/aarch64-execute-only-report-error.s | 17 +++++++++++++++++
lld/test/ELF/aarch64-execute-only-report.s | 16 ++++++++++++++++
2 files changed, 33 insertions(+)
create mode 100644 lld/test/ELF/aarch64-execute-only-report-error.s
create mode 100644 lld/test/ELF/aarch64-execute-only-report.s
diff --git a/lld/test/ELF/aarch64-execute-only-report-error.s b/lld/test/ELF/aarch64-execute-only-report-error.s
new file mode 100644
index 0000000000000..3414e34a3a2cc
--- /dev/null
+++ b/lld/test/ELF/aarch64-execute-only-report-error.s
@@ -0,0 +1,17 @@
+// REQUIRES: x86
+
+// RUN: llvm-mc --triple=x86_64-pc-linux --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
+//
+// RUN: not ld.lld -z execute-only-report=something %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=REPORT_INVALID %s
+// REPORT_INVALID: error: -z execute-only-report= parameter something is not recognized
+
+ .globl _start
+_start:
+ ret
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..9c120997270ad
--- /dev/null
+++ b/lld/test/ELF/aarch64-execute-only-report.s
@@ -0,0 +1,16 @@
+// REQUIRES: aarch64
+
+// RUN: llvm-mc --triple=aarch64-linux-none --filetype=obj -o %t.o %s
+// RUN: ld.lld -z execute-only-report=none --fatal-warnings %t.o -o /dev/null 2>&1
+// RUN: ld.lld -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=WARNING %s
+// RUN: not ld.lld -z execute-only-report=error %t.o -o /dev/null 2>&1 \
+// RUN: | FileCheck --check-prefix=ERROR %s
+
+// WARNING: warning: {{.*}}.o: -z execute-only-report: section .text does not have SHF_AARCH64_PURECODE flag set
+// ERROR: error: {{.*}}.o: -z execute-only-report: section .text does not have SHF_AARCH64_PURECODE flag set
+
+ .section .text,"ax"
+ .globl _start
+_start:
+ ret
>From d1032b4a109fd351164a7639a6ab3e0e19f293af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Wed, 5 Feb 2025 10:04:48 +0100
Subject: [PATCH 04/13] Address review feedback from MaskRay
---
lld/ELF/Driver.cpp | 16 ++++++++--------
lld/ELF/OutputSections.cpp | 6 ++++--
lld/test/ELF/aarch64-execute-only-report.s | 4 ++--
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index bce0a74d8dcc1..7145aafecf451 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -1644,9 +1644,9 @@ static void readConfigs(Ctx &ctx, opt::InputArgList &args) {
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),
- 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('=');
@@ -2944,15 +2944,15 @@ static void checkExecuteOnly(Ctx &ctx) {
};
for (ELFFileBase *file : ctx.objectFiles) {
- for (InputSectionBase *section : file->getSections()) {
- if (!(section && section->flags & SHF_EXECINSTR))
+ for (InputSectionBase *sec : file->getSections()) {
+ if (!(sec && sec->flags & SHF_EXECINSTR))
continue;
- OutputSection *outputSection = section->getOutputSection();
- if (outputSection && outputSection->name == ".text") {
+ OutputSection *osec = sec->getOutputSection();
+ if (osec && osec->name == ".text") {
reportUnless(ctx.arg.zExecuteOnlyReport,
- section->flags & SHF_AARCH64_PURECODE)
- << file << ": -z execute-only-report: section " << section->name
+ sec->flags & SHF_AARCH64_PURECODE)
+ << "-z execute-only-report: " << sec
<< " does not have SHF_AARCH64_PURECODE flag set";
}
}
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp
index c8dc0e5fe0335..1020dd9f2569e 100644
--- a/lld/ELF/OutputSections.cpp
+++ b/lld/ELF/OutputSections.cpp
@@ -42,8 +42,10 @@ using namespace lld::elf;
uint32_t OutputSection::getPhdrFlags() const {
uint32_t ret = 0;
- if ((ctx.arg.emachine != EM_ARM || !(flags & SHF_ARM_PURECODE)) &&
- (ctx.arg.emachine != EM_AARCH64 || !(flags & SHF_AARCH64_PURECODE)))
+ bool purecode =
+ (ctx.arg.emachine == EM_ARM && (flags & SHF_ARM_PURECODE)) ||
+ (ctx.arg.emachine == EM_AARCH64 && (flags & SHF_AARCH64_PURECODE));
+ if (!purecode)
ret |= PF_R;
if (flags & SHF_WRITE)
ret |= PF_W;
diff --git a/lld/test/ELF/aarch64-execute-only-report.s b/lld/test/ELF/aarch64-execute-only-report.s
index 9c120997270ad..b385ab4a2935d 100644
--- a/lld/test/ELF/aarch64-execute-only-report.s
+++ b/lld/test/ELF/aarch64-execute-only-report.s
@@ -7,8 +7,8 @@
// RUN: not ld.lld -z execute-only-report=error %t.o -o /dev/null 2>&1 \
// RUN: | FileCheck --check-prefix=ERROR %s
-// WARNING: warning: {{.*}}.o: -z execute-only-report: section .text does not have SHF_AARCH64_PURECODE flag set
-// ERROR: error: {{.*}}.o: -z execute-only-report: section .text does not have SHF_AARCH64_PURECODE flag set
+// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
+// ERROR: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
.section .text,"ax"
.globl _start
>From 30ee1a7e06b586fe6321eb427151e1eff5d103fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Wed, 5 Feb 2025 10:42:10 +0100
Subject: [PATCH 05/13] Move -z execute-only-report checking into Writer.cpp
---
lld/ELF/Driver.cpp | 32 --------------------------------
lld/ELF/Writer.cpp | 30 ++++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index 7145aafecf451..a8480bb7cd763 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -2929,36 +2929,6 @@ static void readSecurityNotes(Ctx &ctx) {
ctx.arg.andFeatures &= ~GNU_PROPERTY_AARCH64_FEATURE_1_GCS;
}
-static void checkExecuteOnly(Ctx &ctx) {
- if (ctx.arg.emachine != EM_AARCH64)
- return;
-
- auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
- if (cond)
- return {ctx, DiagLevel::None};
- if (config == "error")
- return {ctx, DiagLevel::Err};
- if (config == "warning")
- return {ctx, DiagLevel::Warn};
- return {ctx, DiagLevel::None};
- };
-
- for (ELFFileBase *file : ctx.objectFiles) {
- for (InputSectionBase *sec : file->getSections()) {
- if (!(sec && sec->flags & SHF_EXECINSTR))
- continue;
-
- OutputSection *osec = sec->getOutputSection();
- if (osec && osec->name == ".text") {
- reportUnless(ctx.arg.zExecuteOnlyReport,
- sec->flags & SHF_AARCH64_PURECODE)
- << "-z execute-only-report: " << sec
- << " does not have SHF_AARCH64_PURECODE flag set";
- }
- }
- }
-}
-
static void initSectionsAndLocalSyms(ELFFileBase *file, bool ignoreComdats) {
switch (file->ekind) {
case ELF32LEKind:
@@ -3325,8 +3295,6 @@ template <class ELFT> void LinkerDriver::link(opt::InputArgList &args) {
ctx.script->addOrphanSections();
}
- checkExecuteOnly(ctx);
-
{
llvm::TimeTraceScope timeScope("Merge/finalize input sections");
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index a2c49343e5c8d..16e737681a3dc 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.
@@ -2177,6 +2179,34 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
"data and code";
}
+// Check that all input sections of .text have the SHF_AARCH64_PURECODE section
+// flag set.
+template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
+ if (ctx.arg.emachine != EM_AARCH64 || ctx.arg.zExecuteOnlyReport == "none")
+ return;
+
+ auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
+ if (cond)
+ return {ctx, DiagLevel::None};
+ if (config == "error")
+ return {ctx, DiagLevel::Err};
+ if (config == "warning")
+ return {ctx, DiagLevel::Warn};
+ return {ctx, DiagLevel::None};
+ };
+
+ SmallVector<InputSection *, 0> storage;
+ for (OutputSection *osec : ctx.outputSections) {
+ if (osec->name != ".text")
+ continue;
+ for (InputSection *sec : getInputSections(*osec, storage))
+ reportUnless(ctx.arg.zExecuteOnlyReport,
+ sec->flags & SHF_AARCH64_PURECODE)
+ << "-z execute-only-report: " << sec
+ << " does not have SHF_AARCH64_PURECODE 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() {
>From 0697de0270fbc52ae8f9a57f57634dc1bb936038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Fri, 14 Feb 2025 11:29:24 +0100
Subject: [PATCH 06/13] Resolve merge conflicts after rebase
---
lld/ELF/Driver.cpp | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp
index a8480bb7cd763..88934b2472d7f 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -404,6 +404,8 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
+ if (ctx.arg.zExecuteOnlyReport != "none")
+ ErrAlways(ctx) << "-z execute-only-report only supported on AArch64";
}
if (ctx.arg.emachine != EM_PPC64) {
@@ -461,27 +463,6 @@ static void checkOptions(Ctx &ctx) {
if (ctx.arg.zRetpolineplt && ctx.arg.zForceIbt)
ErrAlways(ctx) << "-z force-ibt may not be used with -z retpolineplt";
-
- if (ctx.arg.emachine != EM_AARCH64) {
- if (ctx.arg.zPacPlt)
- ErrAlways(ctx) << "-z pac-plt only supported on AArch64";
- if (ctx.arg.zForceBti)
- ErrAlways(ctx) << "-z force-bti only supported on AArch64";
- if (ctx.arg.zBtiReport != "none")
- 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")
- ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
- if (ctx.arg.zGcs != GcsPolicy::Implicit)
- ErrAlways(ctx) << "-z gcs only supported on AArch64";
- if (ctx.arg.zExecuteOnlyReport != "none")
- ErrAlways(ctx) << "-z execute-only-report only supported on AArch64";
- }
-
- if (ctx.arg.emachine != EM_386 && ctx.arg.emachine != EM_X86_64 &&
- ctx.arg.zCetReport != "none")
- ErrAlways(ctx) << "-z cet-report only supported on X86 and X86_64";
}
static const char *getReproduceOption(opt::InputArgList &args) {
>From 35b0fd59e4f505ab9c7fb1ac15596b951d0603db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Tue, 18 Feb 2025 11:19:04 +0100
Subject: [PATCH 07/13] Remove `-z execute-only-report`
---
lld/ELF/Config.h | 1 -
lld/ELF/Driver.cpp | 12 +++-----
lld/ELF/Writer.cpp | 30 -------------------
.../ELF/aarch64-execute-only-report-error.s | 17 -----------
lld/test/ELF/aarch64-execute-only-report.s | 16 ----------
5 files changed, 4 insertions(+), 72 deletions(-)
delete mode 100644 lld/test/ELF/aarch64-execute-only-report-error.s
delete mode 100644 lld/test/ELF/aarch64-execute-only-report.s
diff --git a/lld/ELF/Config.h b/lld/ELF/Config.h
index b5872b85efd3a..f132b11b20c63 100644
--- a/lld/ELF/Config.h
+++ b/lld/ELF/Config.h
@@ -229,7 +229,6 @@ 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 88934b2472d7f..70a293875f27b 100644
--- a/lld/ELF/Driver.cpp
+++ b/lld/ELF/Driver.cpp
@@ -404,8 +404,6 @@ static void checkOptions(Ctx &ctx) {
ErrAlways(ctx) << "-z gcs-report only supported on AArch64";
if (ctx.arg.zGcs != GcsPolicy::Implicit)
ErrAlways(ctx) << "-z gcs only supported on AArch64";
- if (ctx.arg.zExecuteOnlyReport != "none")
- ErrAlways(ctx) << "-z execute-only-report only supported on AArch64";
}
if (ctx.arg.emachine != EM_PPC64) {
@@ -1622,12 +1620,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("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 16e737681a3dc..a2c49343e5c8d 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -64,7 +64,6 @@ template <class ELFT> class Writer {
void sortOrphanSections();
void finalizeSections();
void checkExecuteOnly();
- void checkExecuteOnlyReport();
void setReservedSymbolSections();
SmallVector<std::unique_ptr<PhdrEntry>, 0> createPhdrs(Partition &part);
@@ -324,7 +323,6 @@ 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.
@@ -2179,34 +2177,6 @@ template <class ELFT> void Writer<ELFT>::checkExecuteOnly() {
"data and code";
}
-// Check that all input sections of .text have the SHF_AARCH64_PURECODE section
-// flag set.
-template <class ELFT> void Writer<ELFT>::checkExecuteOnlyReport() {
- if (ctx.arg.emachine != EM_AARCH64 || ctx.arg.zExecuteOnlyReport == "none")
- return;
-
- auto reportUnless = [&](StringRef config, bool cond) -> ELFSyncStream {
- if (cond)
- return {ctx, DiagLevel::None};
- if (config == "error")
- return {ctx, DiagLevel::Err};
- if (config == "warning")
- return {ctx, DiagLevel::Warn};
- return {ctx, DiagLevel::None};
- };
-
- SmallVector<InputSection *, 0> storage;
- for (OutputSection *osec : ctx.outputSections) {
- if (osec->name != ".text")
- continue;
- for (InputSection *sec : getInputSections(*osec, storage))
- reportUnless(ctx.arg.zExecuteOnlyReport,
- sec->flags & SHF_AARCH64_PURECODE)
- << "-z execute-only-report: " << sec
- << " does not have SHF_AARCH64_PURECODE 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-error.s b/lld/test/ELF/aarch64-execute-only-report-error.s
deleted file mode 100644
index 3414e34a3a2cc..0000000000000
--- a/lld/test/ELF/aarch64-execute-only-report-error.s
+++ /dev/null
@@ -1,17 +0,0 @@
-// REQUIRES: x86
-
-// RUN: llvm-mc --triple=x86_64-pc-linux --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
-//
-// RUN: not ld.lld -z execute-only-report=something %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=REPORT_INVALID %s
-// REPORT_INVALID: error: -z execute-only-report= parameter something is not recognized
-
- .globl _start
-_start:
- ret
diff --git a/lld/test/ELF/aarch64-execute-only-report.s b/lld/test/ELF/aarch64-execute-only-report.s
deleted file mode 100644
index b385ab4a2935d..0000000000000
--- a/lld/test/ELF/aarch64-execute-only-report.s
+++ /dev/null
@@ -1,16 +0,0 @@
-// REQUIRES: aarch64
-
-// RUN: llvm-mc --triple=aarch64-linux-none --filetype=obj -o %t.o %s
-// RUN: ld.lld -z execute-only-report=none --fatal-warnings %t.o -o /dev/null 2>&1
-// RUN: ld.lld -z execute-only-report=warning %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=WARNING %s
-// RUN: not ld.lld -z execute-only-report=error %t.o -o /dev/null 2>&1 \
-// RUN: | FileCheck --check-prefix=ERROR %s
-
-// WARNING: warning: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
-// ERROR: error: -z execute-only-report: {{.*}}.o:(.text) does not have SHF_AARCH64_PURECODE flag set
-
- .section .text,"ax"
- .globl _start
-_start:
- ret
>From f95bee6b94cd308c1c0920db4f3bfdfe7e24dfb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Tue, 18 Feb 2025 15:48:53 +0100
Subject: [PATCH 08/13] Add execute-only compatible thunks
---
lld/ELF/Thunks.cpp | 49 ++++++++++++++++++-
lld/test/ELF/Inputs/big-execute-only.s | 3 ++
.../ELF/aarch64-call26-thunk-execute-only.s | 22 +++++++++
.../ELF/aarch64-jump26-thunk-execute-only.s | 22 +++++++++
4 files changed, 94 insertions(+), 2 deletions(-)
create mode 100644 lld/test/ELF/Inputs/big-execute-only.s
create mode 100644 lld/test/ELF/aarch64-call26-thunk-execute-only.s
create mode 100644 lld/test/ELF/aarch64-jump26-thunk-execute-only.s
diff --git a/lld/ELF/Thunks.cpp b/lld/ELF/Thunks.cpp
index 4e4e0684a3f59..2b38ac8195221 100644
--- a/lld/ELF/Thunks.cpp
+++ b/lld/ELF/Thunks.cpp
@@ -91,6 +91,19 @@ class AArch64ABSLongThunk final : public AArch64Thunk {
ThunkSection *tsec = nullptr;
};
+// AArch64 long range Thunks compatible with execute-only code.
+class AArch64ABSXOLongThunk final : public AArch64Thunk {
+public:
+ AArch64ABSXOLongThunk(Ctx &ctx, Symbol &dest, int64_t addend,
+ bool mayNeedLandingPad)
+ : AArch64Thunk(ctx, dest, addend, mayNeedLandingPad) {}
+ uint32_t size() override { return getMayUseShortThunk() ? 4 : 20; }
+ void addSymbols(ThunkSection &sec) override;
+
+private:
+ void writeLong(uint8_t *buf) override;
+};
+
class AArch64ADRPThunk final : public AArch64Thunk {
public:
AArch64ADRPThunk(Ctx &ctx, Symbol &dest, int64_t addend,
@@ -663,6 +676,33 @@ void AArch64ABSLongThunk::addLongMapSyms() {
addSymbol("$d", STT_NOTYPE, 8, *tsec);
}
+void AArch64ABSXOLongThunk::writeLong(uint8_t *buf) {
+ const uint8_t data[] = {
+ 0x10, 0x00, 0x80, 0xd2, // movz x16, :abs_g0_nc:S, lsl #0
+ 0x10, 0x00, 0xa0, 0xf2, // movk x16, :abs_g1_nc:S, lsl #16
+ 0x10, 0x00, 0xc0, 0xf2, // movk x16, :abs_g2_nc:S, lsl #32
+ 0x10, 0x00, 0xe0, 0xf2, // movk x16, :abs_g3:S, lsl #48
+ 0x00, 0x02, 0x1f, 0xd6, // br x16
+ };
+ // If mayNeedLandingPad is true then destination is an
+ // AArch64BTILandingPadThunk that defines landingPad.
+ assert(!mayNeedLandingPad || landingPad != nullptr);
+ uint64_t s = mayNeedLandingPad
+ ? landingPad->getVA(ctx, 0)
+ : getAArch64ThunkDestVA(ctx, destination, addend);
+ memcpy(buf, data, sizeof(data));
+ ctx.target->relocateNoSym(buf + 0, R_AARCH64_MOVW_UABS_G0_NC, s);
+ ctx.target->relocateNoSym(buf + 4, R_AARCH64_MOVW_UABS_G1_NC, s);
+ ctx.target->relocateNoSym(buf + 8, R_AARCH64_MOVW_UABS_G2_NC, s);
+ ctx.target->relocateNoSym(buf + 12, R_AARCH64_MOVW_UABS_G3, s);
+}
+
+void AArch64ABSXOLongThunk::addSymbols(ThunkSection &sec) {
+ addSymbol(ctx.saver.save("__AArch64AbsXOLongThunk_" + destination.getName()),
+ STT_FUNC, 0, sec);
+ addSymbol("$x", STT_NOTYPE, 0, sec);
+}
+
// This Thunk has a maximum range of 4Gb, this is sufficient for all programs
// using the small code model, including pc-relative ones. At time of writing
// clang and gcc do not support the large code model for position independent
@@ -1482,15 +1522,20 @@ Thunk::Thunk(Ctx &ctx, Symbol &d, int64_t a)
Thunk::~Thunk() = default;
-static std::unique_ptr<Thunk> addThunkAArch64(Ctx &ctx, RelType type, Symbol &s,
+static std::unique_ptr<Thunk> addThunkAArch64(Ctx &ctx, const InputSection &sec,
+ RelType type, Symbol &s,
int64_t a) {
assert(is_contained({R_AARCH64_CALL26, R_AARCH64_JUMP26, R_AARCH64_PLT32},
type));
bool mayNeedLandingPad =
(ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) &&
!isAArch64BTILandingPad(ctx, s, a);
+ bool isPureCode = sec.getParent()->flags & SHF_AARCH64_PURECODE;
if (ctx.arg.picThunk)
return std::make_unique<AArch64ADRPThunk>(ctx, s, a, mayNeedLandingPad);
+ if (isPureCode)
+ return std::make_unique<AArch64ABSXOLongThunk>(ctx, s, a,
+ mayNeedLandingPad);
return std::make_unique<AArch64ABSLongThunk>(ctx, s, a, mayNeedLandingPad);
}
@@ -1702,7 +1747,7 @@ std::unique_ptr<Thunk> elf::addThunk(Ctx &ctx, const InputSection &isec,
switch (ctx.arg.emachine) {
case EM_AARCH64:
- return addThunkAArch64(ctx, rel.type, s, a);
+ return addThunkAArch64(ctx, isec, rel.type, s, a);
case EM_ARM:
return addThunkArm(ctx, isec, rel.type, s, a);
case EM_AVR:
diff --git a/lld/test/ELF/Inputs/big-execute-only.s b/lld/test/ELF/Inputs/big-execute-only.s
new file mode 100644
index 0000000000000..d39e2f8545060
--- /dev/null
+++ b/lld/test/ELF/Inputs/big-execute-only.s
@@ -0,0 +1,3 @@
+.section .text,"axy", at progbits,unique,0
+.global big
+big = 0x1111222233334444
diff --git a/lld/test/ELF/aarch64-call26-thunk-execute-only.s b/lld/test/ELF/aarch64-call26-thunk-execute-only.s
new file mode 100644
index 0000000000000..c57ad31fcaab0
--- /dev/null
+++ b/lld/test/ELF/aarch64-call26-thunk-execute-only.s
@@ -0,0 +1,22 @@
+// REQUIRES: aarch64
+// RUN: llvm-mc -filetype=obj -triple=aarch64 %S/Inputs/big-execute-only.s -o %tbig.o
+// RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
+// RUN: ld.lld %t.o %tbig.o -o %t
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+.section .text,"axy", at progbits,unique,0
+.globl _start
+_start:
+ bl big
+
+// CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
+// CHECK-NEXT: <_start>:
+// CHECK-NEXT: 210120: bl 0x210124
+// CHECK: <__AArch64AbsXOLongThunk_big>:
+// CHECK-NEXT: 210124: mov x16, #0x4444
+// CHECK-NEXT: 210128: movk x16, #0x3333, lsl #16
+// CHECK-NEXT: 21012c: movk x16, #0x2222, lsl #32
+// CHECK-NEXT: 210130: movk x16, #0x1111, lsl #48
+// CHECK-NEXT: 210134: br x16
+
diff --git a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
new file mode 100644
index 0000000000000..1063d6dcaa36d
--- /dev/null
+++ b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
@@ -0,0 +1,22 @@
+// REQUIRES: aarch64
+// RUN: llvm-mc -filetype=obj -triple=aarch64 %S/Inputs/big-execute-only.s -o %tbig.o
+// RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
+// RUN: ld.lld %t.o %tbig.o -o %t
+// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
+
+.section .text,"axy", at progbits,unique,0
+.globl _start
+_start:
+ b big
+
+// CHECK: Disassembly of section .text:
+// CHECK-EMPTY:
+// CHECK-NEXT: <_start>:
+// CHECK-NEXT: 210120: b 0x210124
+// CHECK: <__AArch64AbsXOLongThunk_big>:
+// CHECK-NEXT: 210124: mov x16, #0x4444
+// CHECK-NEXT: 210128: movk x16, #0x3333, lsl #16
+// CHECK-NEXT: 21012c: movk x16, #0x2222, lsl #32
+// CHECK-NEXT: 210130: movk x16, #0x1111, lsl #48
+// CHECK-NEXT: 210134: br x16
+
>From 0bc840dc32f9ad5ce1c983304ea8fbf88a3ea3b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Tue, 18 Feb 2025 17:07:43 +0100
Subject: [PATCH 09/13] Address review feedback
---
lld/ELF/Thunks.cpp | 3 +--
lld/test/ELF/Inputs/big-execute-only.s | 3 ---
.../ELF/aarch64-call26-thunk-execute-only.s | 19 +++++++++----------
.../ELF/aarch64-jump26-thunk-execute-only.s | 19 +++++++++----------
4 files changed, 19 insertions(+), 25 deletions(-)
delete mode 100644 lld/test/ELF/Inputs/big-execute-only.s
diff --git a/lld/ELF/Thunks.cpp b/lld/ELF/Thunks.cpp
index 2b38ac8195221..0008ee3a0de67 100644
--- a/lld/ELF/Thunks.cpp
+++ b/lld/ELF/Thunks.cpp
@@ -1530,10 +1530,9 @@ static std::unique_ptr<Thunk> addThunkAArch64(Ctx &ctx, const InputSection &sec,
bool mayNeedLandingPad =
(ctx.arg.andFeatures & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) &&
!isAArch64BTILandingPad(ctx, s, a);
- bool isPureCode = sec.getParent()->flags & SHF_AARCH64_PURECODE;
if (ctx.arg.picThunk)
return std::make_unique<AArch64ADRPThunk>(ctx, s, a, mayNeedLandingPad);
- if (isPureCode)
+ if (sec.getParent()->flags & SHF_AARCH64_PURECODE)
return std::make_unique<AArch64ABSXOLongThunk>(ctx, s, a,
mayNeedLandingPad);
return std::make_unique<AArch64ABSLongThunk>(ctx, s, a, mayNeedLandingPad);
diff --git a/lld/test/ELF/Inputs/big-execute-only.s b/lld/test/ELF/Inputs/big-execute-only.s
deleted file mode 100644
index d39e2f8545060..0000000000000
--- a/lld/test/ELF/Inputs/big-execute-only.s
+++ /dev/null
@@ -1,3 +0,0 @@
-.section .text,"axy", at progbits,unique,0
-.global big
-big = 0x1111222233334444
diff --git a/lld/test/ELF/aarch64-call26-thunk-execute-only.s b/lld/test/ELF/aarch64-call26-thunk-execute-only.s
index c57ad31fcaab0..aa26f9132064e 100644
--- a/lld/test/ELF/aarch64-call26-thunk-execute-only.s
+++ b/lld/test/ELF/aarch64-call26-thunk-execute-only.s
@@ -1,7 +1,6 @@
// REQUIRES: aarch64
-// RUN: llvm-mc -filetype=obj -triple=aarch64 %S/Inputs/big-execute-only.s -o %tbig.o
// RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
-// RUN: ld.lld %t.o %tbig.o -o %t
+// RUN: ld.lld %t.o --defsym big=0x1111222233334444 -o %t
// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
.section .text,"axy", at progbits,unique,0
@@ -11,12 +10,12 @@ _start:
// CHECK: Disassembly of section .text:
// CHECK-EMPTY:
-// CHECK-NEXT: <_start>:
-// CHECK-NEXT: 210120: bl 0x210124
-// CHECK: <__AArch64AbsXOLongThunk_big>:
-// CHECK-NEXT: 210124: mov x16, #0x4444
-// CHECK-NEXT: 210128: movk x16, #0x3333, lsl #16
-// CHECK-NEXT: 21012c: movk x16, #0x2222, lsl #32
-// CHECK-NEXT: 210130: movk x16, #0x1111, lsl #48
-// CHECK-NEXT: 210134: br x16
+// CHECK-LABEL: <_start>:
+// CHECK-NEXT: 210120: bl 0x210124
+// CHECK-LABEL: <__AArch64AbsXOLongThunk_big>:
+// CHECK-NEXT: 210124: mov x16, #0x4444
+// CHECK-NEXT: movk x16, #0x3333, lsl #16
+// CHECK-NEXT: movk x16, #0x2222, lsl #32
+// CHECK-NEXT: movk x16, #0x1111, lsl #48
+// CHECK-NEXT: br x16
diff --git a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
index 1063d6dcaa36d..1c909c1692e84 100644
--- a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
+++ b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
@@ -1,7 +1,6 @@
// REQUIRES: aarch64
-// RUN: llvm-mc -filetype=obj -triple=aarch64 %S/Inputs/big-execute-only.s -o %tbig.o
// RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
-// RUN: ld.lld %t.o %tbig.o -o %t
+// RUN: ld.lld %t.o --defsym big=0x1111222233334444 -o %t
// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
.section .text,"axy", at progbits,unique,0
@@ -11,12 +10,12 @@ _start:
// CHECK: Disassembly of section .text:
// CHECK-EMPTY:
-// CHECK-NEXT: <_start>:
-// CHECK-NEXT: 210120: b 0x210124
-// CHECK: <__AArch64AbsXOLongThunk_big>:
-// CHECK-NEXT: 210124: mov x16, #0x4444
-// CHECK-NEXT: 210128: movk x16, #0x3333, lsl #16
-// CHECK-NEXT: 21012c: movk x16, #0x2222, lsl #32
-// CHECK-NEXT: 210130: movk x16, #0x1111, lsl #48
-// CHECK-NEXT: 210134: br x16
+// CHECK-LABEL: <_start>:
+// CHECK-NEXT: 210120: b 0x210124
+// CHECK-LABEL: <__AArch64AbsXOLongThunk_big>:
+// CHECK-NEXT: 210124: mov x16, #0x4444
+// CHECK-NEXT: movk x16, #0x3333, lsl #16
+// CHECK-NEXT: movk x16, #0x2222, lsl #32
+// CHECK-NEXT: movk x16, #0x1111, lsl #48
+// CHECK-NEXT: br x16
>From 50d26bd56bdf22074dc9cb44dff2913790f29537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Wed, 19 Feb 2025 09:32:11 +0100
Subject: [PATCH 10/13] Address review feedback
---
lld/test/ELF/aarch64-call26-thunk-execute-only.s | 13 ++++++-------
lld/test/ELF/aarch64-execute-only.s | 7 +++----
lld/test/ELF/aarch64-jump26-thunk-execute-only.s | 5 ++---
lld/test/ELF/input-section-flags.s | 3 ++-
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/lld/test/ELF/aarch64-call26-thunk-execute-only.s b/lld/test/ELF/aarch64-call26-thunk-execute-only.s
index aa26f9132064e..2a267213a93f5 100644
--- a/lld/test/ELF/aarch64-call26-thunk-execute-only.s
+++ b/lld/test/ELF/aarch64-call26-thunk-execute-only.s
@@ -11,11 +11,10 @@ _start:
// CHECK: Disassembly of section .text:
// CHECK-EMPTY:
// CHECK-LABEL: <_start>:
-// CHECK-NEXT: 210120: bl 0x210124
+// CHECK-NEXT: bl {{.*}} <__AArch64AbsXOLongThunk_big>
// CHECK-LABEL: <__AArch64AbsXOLongThunk_big>:
-// CHECK-NEXT: 210124: mov x16, #0x4444
-// CHECK-NEXT: movk x16, #0x3333, lsl #16
-// CHECK-NEXT: movk x16, #0x2222, lsl #32
-// CHECK-NEXT: movk x16, #0x1111, lsl #48
-// CHECK-NEXT: br x16
-
+// CHECK-NEXT: mov x16, #0x4444
+// CHECK-NEXT: movk x16, #0x3333, lsl #16
+// CHECK-NEXT: movk x16, #0x2222, lsl #32
+// CHECK-NEXT: movk x16, #0x1111, lsl #48
+// CHECK-NEXT: br x16
diff --git a/lld/test/ELF/aarch64-execute-only.s b/lld/test/ELF/aarch64-execute-only.s
index e67bbf05ff2e2..1c6421c9dc9fe 100644
--- a/lld/test/ELF/aarch64-execute-only.s
+++ b/lld/test/ELF/aarch64-execute-only.s
@@ -1,12 +1,11 @@
// REQUIRES: aarch64
-// RUN: llvm-mc -filetype=obj -triple=aarch64-linux-none %s -o %t.o
+// RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
// RUN: ld.lld %t.o -o %t.so -shared
// RUN: llvm-readelf -l %t.so | FileCheck --implicit-check-not=LOAD %s
-// RUN: echo ".section .foo,\"ax\"; \
-// RUN: ret" > %t.s
-// RUN: llvm-mc -filetype=obj -triple=aarch64-linux-none %t.s -o %t2.o
+// RUN: echo ".section .foo,\"ax\"; ret" > %t.s
+// RUN: llvm-mc -filetype=obj -triple=aarch64 %t.s -o %t2.o
// RUN: ld.lld %t.o %t2.o -o %t.so -shared
// RUN: llvm-readelf -l %t.so | FileCheck --check-prefix=DIFF --implicit-check-not=LOAD %s
diff --git a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
index 1c909c1692e84..e020adcdbae22 100644
--- a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
+++ b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
@@ -11,11 +11,10 @@ _start:
// CHECK: Disassembly of section .text:
// CHECK-EMPTY:
// CHECK-LABEL: <_start>:
-// CHECK-NEXT: 210120: b 0x210124
+// CHECK-NEXT: b {{.*}} <__AArch64AbsXOLongThunk_big>
// CHECK-LABEL: <__AArch64AbsXOLongThunk_big>:
-// CHECK-NEXT: 210124: mov x16, #0x4444
+// CHECK-NEXT: mov x16, #0x4444
// CHECK-NEXT: movk x16, #0x3333, lsl #16
// CHECK-NEXT: movk x16, #0x2222, lsl #32
// CHECK-NEXT: movk x16, #0x1111, lsl #48
// CHECK-NEXT: br x16
-
diff --git a/lld/test/ELF/input-section-flags.s b/lld/test/ELF/input-section-flags.s
index f848d55e6fddc..c4496597ad53d 100644
--- a/lld/test/ELF/input-section-flags.s
+++ b/lld/test/ELF/input-section-flags.s
@@ -15,7 +15,8 @@
# RUN: .outsec3 : { INPUT_SECTION_FLAGS(SHF_WRITE) *(.sec.*) } \
# RUN: .outsec4 : { INPUT_SECTION_FLAGS(SHF_MERGE & !SHF_STRINGS) *(.sec.*) } \
# RUN: .outsec5 : { INPUT_SECTION_FLAGS(SHF_STRINGS) *(.sec.*) } \
-# RUN: .outsec6 : { INPUT_SECTION_FLAGS(!SHF_TLS & !SHF_EXCLUDE & !SHF_COMPRESSED & !SHF_ARM_PURECODE) *(.sec.*) } \
+# RUN: .outsec6 : { INPUT_SECTION_FLAGS(!SHF_TLS & !SHF_EXCLUDE & !SHF_COMPRESSED & \
+# RUN: !SHF_ARM_PURECODE & !SHF_AARCH64_PURECODE) *(.sec.*) } \
# RUN: } " > %t.script
# RUN: ld.lld -o %t1 --script %t.script %t.o
# RUN: llvm-readobj --symbols %t1 | FileCheck %s
>From e0358ebf0f2c2aea280ee3b3439703713cd90945 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i at maskray.me>
Date: Thu, 20 Feb 2025 08:35:19 -0800
Subject: [PATCH 11/13] improve test
---
lld/test/ELF/aarch64-execute-only.s | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/lld/test/ELF/aarch64-execute-only.s b/lld/test/ELF/aarch64-execute-only.s
index 1c6421c9dc9fe..20908ba9f754f 100644
--- a/lld/test/ELF/aarch64-execute-only.s
+++ b/lld/test/ELF/aarch64-execute-only.s
@@ -10,22 +10,22 @@
// RUN: llvm-readelf -l %t.so | FileCheck --check-prefix=DIFF --implicit-check-not=LOAD %s
// CHECK: LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x000245 0x000245 R 0x10000
-// CHECK: LOAD 0x000248 0x0000000000010248 0x0000000000010248 0x{{.*}} 0x{{.*}} R E 0x10000
-// CHECK: LOAD 0x00024c 0x000000000002024c 0x000000000002024c 0x{{.*}} 0x{{.*}} E 0x10000
-// CHECK: LOAD 0x000250 0x0000000000030250 0x0000000000030250 0x000070 0x000db0 RW 0x10000
+// CHECK-NEXT: LOAD 0x000248 0x0000000000010248 0x0000000000010248 0x{{.*}} 0x{{.*}} R E 0x10000
+// CHECK-NEXT: LOAD 0x00024c 0x000000000002024c 0x000000000002024c 0x{{.*}} 0x{{.*}} E 0x10000
+// CHECK-NEXT: LOAD 0x000250 0x0000000000030250 0x0000000000030250 0x000070 0x000db0 RW 0x10000
-// CHECK: 01 .dynsym .gnu.hash .hash .dynstr
-// CHECK: 02 .text
-// CHECK: 03 .foo
-// CHECK: 04 .dynamic
+// CHECK: 01 .dynsym .gnu.hash .hash .dynstr
+// CHECK-NEXT: 02 .text
+// CHECK-NEXT: 03 .foo
+// CHECK-NEXT: 04 .dynamic
// DIFF: LOAD 0x000000 0x0000000000000000 0x0000000000000000 0x00020d 0x00020d R 0x10000
-// DIFF: LOAD 0x000210 0x0000000000010210 0x0000000000010210 0x00000c 0x00000c R E 0x10000
-// DIFF: LOAD 0x000220 0x0000000000020220 0x0000000000020220 0x000070 0x000de0 RW 0x10000
+// DIFF-NEXT: LOAD 0x000210 0x0000000000010210 0x0000000000010210 0x00000c 0x00000c R E 0x10000
+// DIFF-NEXT: LOAD 0x000220 0x0000000000020220 0x0000000000020220 0x000070 0x000de0 RW 0x10000
-// DIFF: 01 .dynsym .gnu.hash .hash .dynstr
-// DIFF: 02 .text .foo
-// DIFF: 03 .dynamic
+// DIFF: 01 .dynsym .gnu.hash .hash .dynstr
+// DIFF-NEXT: 02 .text .foo
+// DIFF-NEXT: 03 .dynamic
ret
.section .foo,"axy"
>From 548d5dc7a437dcb142718dff89d22728998cb371 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Fri, 21 Feb 2025 10:41:39 +0100
Subject: [PATCH 12/13] Add test for a BTI landing pad target in execute-only
thunks
---
lld/test/ELF/aarch64-thunk-bti-execute-only.s | 75 +++++++++++++++++++
1 file changed, 75 insertions(+)
create mode 100644 lld/test/ELF/aarch64-thunk-bti-execute-only.s
diff --git a/lld/test/ELF/aarch64-thunk-bti-execute-only.s b/lld/test/ELF/aarch64-thunk-bti-execute-only.s
new file mode 100644
index 0000000000000..4c5bb2ae84365
--- /dev/null
+++ b/lld/test/ELF/aarch64-thunk-bti-execute-only.s
@@ -0,0 +1,75 @@
+// REQUIRES: aarch64
+// RUN: rm -rf %t && split-file %s %t && cd %t
+// RUN: llvm-mc -filetype=obj -triple=aarch64 asm -o a.o
+// RUN: ld.lld --script=lds a.o -o exe --defsym absolute=0xf0000000
+// RUN: llvm-objdump -d --no-show-raw-insn exe | FileCheck %s
+
+//--- asm
+.section ".note.gnu.property", "a"
+.p2align 3
+.long 4
+.long 0x10
+.long 0x5
+.asciz "GNU"
+
+/// Enable BTI.
+.long 0xc0000000 // GNU_PROPERTY_AARCH64_FEATURE_1_AND.
+.long 4
+.long 1 // GNU_PROPERTY_AARCH64_FEATURE_1_BTI.
+.long 0
+
+.section .text.0,"axy", at progbits
+.global _start
+.type _start, at function
+_start:
+/// Expect thunk to target a linker generated entry point with BTI landing pad.
+/// Two calls to make sure only one landing pad is created.
+ bl fn1
+ b fn1
+/// No BTI landing pad is added for absolute symbols.
+ bl absolute
+
+/// This function does not have a BTI compatible landing pad. Expect a linker
+/// generated landing pad for indirect branch thunks.
+.section .text.1,"axy", at progbits
+.hidden fn1
+.type fn1, at function
+fn1:
+ ret
+
+// CHECK-LABEL: <_start>:
+// CHECK-NEXT: 18001000: bl 0x1800100c <__AArch64AbsXOLongThunk_>
+// CHECK-NEXT: b 0x1800100c <__AArch64AbsXOLongThunk_>
+// CHECK-NEXT: bl 0x18001020 <__AArch64AbsXOLongThunk_absolute>
+
+// CHECK-LABEL: <__AArch64AbsXOLongThunk_>:
+// CHECK-NEXT: 1800100c: mov x16, #0x0
+// CHECK-NEXT: movk x16, #0x3000, lsl #16
+// CHECK-NEXT: movk x16, #0x0, lsl #32
+// CHECK-NEXT: movk x16, #0x0, lsl #48
+// CHECK-NEXT: br x16
+
+// CHECK-LABEL: <__AArch64AbsXOLongThunk_absolute>:
+// CHECK-NEXT: 18001020: mov x16, #0x0
+// CHECK-NEXT: movk x16, #0xf000, lsl #16
+// CHECK-NEXT: movk x16, #0x0, lsl #32
+// CHECK-NEXT: movk x16, #0x0, lsl #48
+// CHECK-NEXT: br x16
+
+// CHECK-LABEL: <__AArch64BTIThunk_>:
+// CHECK-NEXT: 30000000: bti c
+
+// CHECK-LABEL: <fn1>:
+// CHECK-NEXT: 30000004: ret
+
+//--- lds
+PHDRS {
+ low PT_LOAD FLAGS(0x1 | 0x4);
+ mid PT_LOAD FLAGS(0x1 | 0x4);
+ high PT_LOAD FLAGS(0x1 | 0x4);
+}
+SECTIONS {
+ .rodata 0x10000000 : { *(.note.gnu.property) } :low
+ .text 0x18001000 : { *(.text.0) } :mid
+ .text_high 0x30000000 : { *(.text.*) } :high
+}
>From d160ea36f8976b4f91255b3551f7e39170ed8579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Csan=C3=A1d=20Hajd=C3=BA?= <csanad.hajdu at arm.com>
Date: Fri, 21 Feb 2025 17:57:11 +0100
Subject: [PATCH 13/13] Merge aarch64-call26-thunk-execute-only.s and
aarch64-jump26-thunk-execute-only.s
---
.../ELF/aarch64-jump26-thunk-execute-only.s | 20 -------------------
...te-only.s => aarch64-thunk-execute-only.s} | 2 ++
2 files changed, 2 insertions(+), 20 deletions(-)
delete mode 100644 lld/test/ELF/aarch64-jump26-thunk-execute-only.s
rename lld/test/ELF/{aarch64-call26-thunk-execute-only.s => aarch64-thunk-execute-only.s} (89%)
diff --git a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s b/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
deleted file mode 100644
index e020adcdbae22..0000000000000
--- a/lld/test/ELF/aarch64-jump26-thunk-execute-only.s
+++ /dev/null
@@ -1,20 +0,0 @@
-// REQUIRES: aarch64
-// RUN: llvm-mc -filetype=obj -triple=aarch64 %s -o %t.o
-// RUN: ld.lld %t.o --defsym big=0x1111222233334444 -o %t
-// RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s
-
-.section .text,"axy", at progbits,unique,0
-.globl _start
-_start:
- b big
-
-// CHECK: Disassembly of section .text:
-// CHECK-EMPTY:
-// CHECK-LABEL: <_start>:
-// CHECK-NEXT: b {{.*}} <__AArch64AbsXOLongThunk_big>
-// CHECK-LABEL: <__AArch64AbsXOLongThunk_big>:
-// CHECK-NEXT: mov x16, #0x4444
-// CHECK-NEXT: movk x16, #0x3333, lsl #16
-// CHECK-NEXT: movk x16, #0x2222, lsl #32
-// CHECK-NEXT: movk x16, #0x1111, lsl #48
-// CHECK-NEXT: br x16
diff --git a/lld/test/ELF/aarch64-call26-thunk-execute-only.s b/lld/test/ELF/aarch64-thunk-execute-only.s
similarity index 89%
rename from lld/test/ELF/aarch64-call26-thunk-execute-only.s
rename to lld/test/ELF/aarch64-thunk-execute-only.s
index 2a267213a93f5..6591354938e32 100644
--- a/lld/test/ELF/aarch64-call26-thunk-execute-only.s
+++ b/lld/test/ELF/aarch64-thunk-execute-only.s
@@ -7,11 +7,13 @@
.globl _start
_start:
bl big
+ b big
// CHECK: Disassembly of section .text:
// CHECK-EMPTY:
// CHECK-LABEL: <_start>:
// CHECK-NEXT: bl {{.*}} <__AArch64AbsXOLongThunk_big>
+// CHECK-NEXT: b {{.*}} <__AArch64AbsXOLongThunk_big>
// CHECK-LABEL: <__AArch64AbsXOLongThunk_big>:
// CHECK-NEXT: mov x16, #0x4444
// CHECK-NEXT: movk x16, #0x3333, lsl #16
More information about the llvm-commits
mailing list