[lld] [lld][WebAssembly] Add RUNTIME_PATH support to wasm-ld (PR #129050)
Hood Chatham via llvm-commits
llvm-commits at lists.llvm.org
Fri Feb 28 10:44:58 PST 2025
https://github.com/hoodmane updated https://github.com/llvm/llvm-project/pull/129050
>From 7d7983507619b83e8751a1ebc8f84c8a6aeb38e0 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham at gmail.com>
Date: Thu, 27 Feb 2025 14:10:32 +0100
Subject: [PATCH 1/3] [lld][WebAssembly] Add RUNTIME_PATH support to wasm-ld
This finishes adding RPATH support for WebAssembly.
See my previous PR which added RPATH support to yaml2obj and obj2yaml:
https://github.com/llvm/llvm-project/pull/126080
See corresponding update to the WebAssembly/tool-conventions repo on dynamic
linking: https://github.com/WebAssembly/tool-conventions/pull/246
---
lld/test/wasm/rpath.s | 14 ++++++++++++++
lld/wasm/Config.h | 1 +
lld/wasm/Driver.cpp | 1 +
lld/wasm/Options.td | 3 +++
lld/wasm/SyntheticSections.cpp | 9 +++++++++
5 files changed, 28 insertions(+)
create mode 100644 lld/test/wasm/rpath.s
diff --git a/lld/test/wasm/rpath.s b/lld/test/wasm/rpath.s
new file mode 100644
index 0000000000000..1b430b40966a9
--- /dev/null
+++ b/lld/test/wasm/rpath.s
@@ -0,0 +1,14 @@
+# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
+# RUN: wasm-ld -shared -o %t1.wasm %t.o -rpath /a/b/c -rpath /x/y/z
+# RUN: obj2yaml %t1.wasm | FileCheck %s
+
+# CHECK: - Type: CUSTOM
+# CHECK-NEXT: Name: dylink.0
+# CHECK-NEXT: MemorySize: 0
+# CHECK-NEXT: MemoryAlignment: 0
+# CHECK-NEXT: TableSize: 0
+# CHECK-NEXT: TableAlignment: 0
+# CHECK-NEXT: Needed: []
+# CHECK-NEXT: RuntimePath:
+# CHECK-NEXT: - '/a/b/c'
+# CHECK-NEXT: - '/x/y/z'
diff --git a/lld/wasm/Config.h b/lld/wasm/Config.h
index 1fa6c42d9cd86..117ddc8650643 100644
--- a/lld/wasm/Config.h
+++ b/lld/wasm/Config.h
@@ -70,6 +70,7 @@ struct Config {
bool pie;
bool printGcSections;
bool relocatable;
+ llvm::SmallVector<llvm::StringRef, 0> rpath;
bool saveTemps;
bool shared;
bool shlibSigCheck;
diff --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index c3a74dde6480e..85ca1fb782844 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -583,6 +583,7 @@ static void readConfigs(opt::InputArgList &args) {
ctx.arg.optimize = args::getInteger(args, OPT_O, 1);
ctx.arg.outputFile = args.getLastArgValue(OPT_o);
ctx.arg.relocatable = args.hasArg(OPT_relocatable);
+ ctx.arg.rpath = args::getStrings(args, OPT_rpath);
ctx.arg.gcSections =
args.hasFlag(OPT_gc_sections, OPT_no_gc_sections, !ctx.arg.relocatable);
for (auto *arg : args.filtered(OPT_keep_section))
diff --git a/lld/wasm/Options.td b/lld/wasm/Options.td
index 1316dc5c70d93..3df46870a2319 100644
--- a/lld/wasm/Options.td
+++ b/lld/wasm/Options.td
@@ -132,6 +132,8 @@ def relocatable: F<"relocatable">, HelpText<"Create relocatable object file">;
defm reproduce: EEq<"reproduce", "Dump linker invocation and input files for debugging">;
+defm rpath: Eq<"rpath", "Add a DT_RUNPATH to the output">;
+
defm rsp_quoting: Eq<"rsp-quoting", "Quoting style for response files">,
MetaVarName<"[posix,windows]">;
@@ -289,6 +291,7 @@ def: Flag<["-"], "t">, Alias<trace>, HelpText<"Alias for --trace">;
def: JoinedOrSeparate<["-"], "y">, Alias<trace_symbol>, HelpText<"Alias for --trace-symbol">;
def: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
def: Flag<["-"], "V">, Alias<v>, HelpText<"Alias for -v">;
+def: JoinedOrSeparate<["-"], "R">, Alias<rpath>, HelpText<"Alias for --rpath">;
// LTO-related options.
def lto_O: JJ<"lto-O">, MetaVarName<"<opt-level>">,
diff --git a/lld/wasm/SyntheticSections.cpp b/lld/wasm/SyntheticSections.cpp
index 7fb44b9f0c009..28d814ee65024 100644
--- a/lld/wasm/SyntheticSections.cpp
+++ b/lld/wasm/SyntheticSections.cpp
@@ -16,6 +16,7 @@
#include "InputElement.h"
#include "OutputSegment.h"
#include "SymbolTable.h"
+#include "llvm/BinaryFormat/Wasm.h"
#include "llvm/Support/Path.h"
#include <optional>
@@ -133,6 +134,14 @@ void DylinkSection::writeBody() {
sub.writeTo(os);
}
+ if (!ctx.arg.rpath.empty()) {
+ SubSection sub(WASM_DYLINK_RUNTIME_PATH);
+ writeUleb128(sub.os, ctx.arg.rpath.size(), "num rpath entries");
+ for (const auto ref : ctx.arg.rpath) {
+ writeStr(sub.os, ref, "rpath entry");
+ }
+ sub.writeTo(os);
+ }
}
uint32_t TypeSection::registerType(const WasmSignature &sig) {
>From 7752deb79a13e031b48162037eb7ca054a8b6b43 Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham at gmail.com>
Date: Fri, 28 Feb 2025 11:42:40 +0100
Subject: [PATCH 2/3] Address review comments
---
lld/test/wasm/rpath.s | 2 +-
lld/wasm/Config.h | 2 +-
lld/wasm/Options.td | 1 -
lld/wasm/SyntheticSections.cpp | 4 ++--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lld/test/wasm/rpath.s b/lld/test/wasm/rpath.s
index 1b430b40966a9..53372f490e9ad 100644
--- a/lld/test/wasm/rpath.s
+++ b/lld/test/wasm/rpath.s
@@ -1,5 +1,5 @@
# RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown -o %t.o %s
-# RUN: wasm-ld -shared -o %t1.wasm %t.o -rpath /a/b/c -rpath /x/y/z
+# RUN: wasm-ld -shared -o %t1.wasm %t.o -rpath /a/b/c -rpath /x/y/z --experimental-pic
# RUN: obj2yaml %t1.wasm | FileCheck %s
# CHECK: - Type: CUSTOM
diff --git a/lld/wasm/Config.h b/lld/wasm/Config.h
index 117ddc8650643..d901b2a471ad8 100644
--- a/lld/wasm/Config.h
+++ b/lld/wasm/Config.h
@@ -70,7 +70,6 @@ struct Config {
bool pie;
bool printGcSections;
bool relocatable;
- llvm::SmallVector<llvm::StringRef, 0> rpath;
bool saveTemps;
bool shared;
bool shlibSigCheck;
@@ -125,6 +124,7 @@ struct Config {
std::optional<std::vector<std::string>> features;
std::optional<std::vector<std::string>> extraFeatures;
llvm::SmallVector<uint8_t, 0> buildIdVector;
+ llvm::SmallVector<llvm::StringRef, 0> rpath;
};
// The Ctx object hold all other (non-configuration) global state.
diff --git a/lld/wasm/Options.td b/lld/wasm/Options.td
index 3df46870a2319..19af82335d7b3 100644
--- a/lld/wasm/Options.td
+++ b/lld/wasm/Options.td
@@ -291,7 +291,6 @@ def: Flag<["-"], "t">, Alias<trace>, HelpText<"Alias for --trace">;
def: JoinedOrSeparate<["-"], "y">, Alias<trace_symbol>, HelpText<"Alias for --trace-symbol">;
def: JoinedOrSeparate<["-"], "u">, Alias<undefined>;
def: Flag<["-"], "V">, Alias<v>, HelpText<"Alias for -v">;
-def: JoinedOrSeparate<["-"], "R">, Alias<rpath>, HelpText<"Alias for --rpath">;
// LTO-related options.
def lto_O: JJ<"lto-O">, MetaVarName<"<opt-level>">,
diff --git a/lld/wasm/SyntheticSections.cpp b/lld/wasm/SyntheticSections.cpp
index 28d814ee65024..f5ec55946a591 100644
--- a/lld/wasm/SyntheticSections.cpp
+++ b/lld/wasm/SyntheticSections.cpp
@@ -134,12 +134,12 @@ void DylinkSection::writeBody() {
sub.writeTo(os);
}
+
if (!ctx.arg.rpath.empty()) {
SubSection sub(WASM_DYLINK_RUNTIME_PATH);
writeUleb128(sub.os, ctx.arg.rpath.size(), "num rpath entries");
- for (const auto ref : ctx.arg.rpath) {
+ for (const auto ref : ctx.arg.rpath)
writeStr(sub.os, ref, "rpath entry");
- }
sub.writeTo(os);
}
}
>From 8a222bb95e5ac6a8bbdd1392c8cd1901d9c1012d Mon Sep 17 00:00:00 2001
From: Hood Chatham <roberthoodchatham at gmail.com>
Date: Fri, 28 Feb 2025 19:44:47 +0100
Subject: [PATCH 3/3] Put rpath next to searchPaths
---
lld/wasm/Config.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lld/wasm/Config.h b/lld/wasm/Config.h
index d901b2a471ad8..0edb1fe6523b6 100644
--- a/lld/wasm/Config.h
+++ b/lld/wasm/Config.h
@@ -120,11 +120,11 @@ struct Config {
llvm::StringSet<> exportedSymbols;
std::vector<llvm::StringRef> requiredExports;
llvm::SmallVector<llvm::StringRef, 0> searchPaths;
+ llvm::SmallVector<llvm::StringRef, 0> rpath;
llvm::CachePruningPolicy thinLTOCachePolicy;
std::optional<std::vector<std::string>> features;
std::optional<std::vector<std::string>> extraFeatures;
llvm::SmallVector<uint8_t, 0> buildIdVector;
- llvm::SmallVector<llvm::StringRef, 0> rpath;
};
// The Ctx object hold all other (non-configuration) global state.
More information about the llvm-commits
mailing list