motiejus/zig
1
Fork 0
Code Releases Activity

wasm-linker: correctly pass --shared and --pie

Browse Source 
When linking a WebAssembly binary using wasm-ld, we will now correctly pass
--shared when building a dynamic library and --pie when `-fpic` is given.
This is a breaking change and users who currently build dynamic libraries
for WebAssembly but wish to have an executable without a main, should use
build-exe instead while supplying `-fno-entry`.

We also verify the user does not supply --export-memory when -dynamic is
enabled. By default we set this flag now to 'false' when `-dynamic` is used
to ensure we do not enable it as it's enabled by default for regular
WebAssembly binaries.
This commit is contained in:
Luuk de Gram
2023-08-31 17:12:12 +02:00
parent 1cb7a01b25
commit 58618afaee
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/link/Wasm.zig
View File

@@ -4548,6 +4548,13 @@ fn linkWithLLD(wasm: *Wasm, comp: *Compilation, prog_node: *std.Progress.Node) !
try argv.append("--no-entry");
}
if (wasm.base.options.output_mode == .Lib and wasm.base.options.link_mode == .Dynamic) {
try argv.append("--shared");
}
if (wasm.base.options.pie) {
try argv.append("--pie");
}
// XXX - TODO: add when wasm-ld supports --build-id.
// if (wasm.base.options.build_id) {
// try argv.append("--build-id=tree");

10
src/main.zig
View File

@@ -2627,6 +2627,16 @@ fn buildOutputType(
if (single_threaded == null) {
single_threaded = true;
}
if (link_mode) |mode| {
if (mode == .Dynamic) {
if (linker_export_memory != null and linker_export_memory.?) {
fatal("flags '-dynamic' and '--export-memory' are incompatible", .{});
}
// User did not supply `--export-memory` which is incompatible with -dynamic, therefore
// set the flag to false to ensure it does not get enabled by default.
linker_export_memory = false;
}
}
if (wasi_exec_model) |model| {
if (model == .reactor) {
if (linker_no_entry != null and !linker_no_entry.?) {