authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-15 20:41:50-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-15 20:41:50-04:00
log6692cbbe18ad108affccfb9cb85d53e2583408ec
tree8c0b515716c09408b166af28fd0aefe246a34417
parent579dd7411462a1359a08e8b4c0b4b9765d54a563
signature Commit is signed but in an unrecognized format.

disable threads when linking WebAssembly to work around an LLD bug

See #2283

1 files changed, 5 insertions(+), 0 deletions(-)

src/link.cpp+5
...@@ -1091,6 +1091,11 @@ static void construct_linker_job_wasm(LinkJob *lj) {...@@ -1091,6 +1091,11 @@ static void construct_linker_job_wasm(LinkJob *lj) {
1091 CodeGen *g = lj->codegen;1091 CodeGen *g = lj->codegen;
10921092
1093 lj->args.append("-error-limit=0");1093 lj->args.append("-error-limit=0");
1094
1095 // This works around a deadlock in LLD's wasm code.
1096 // See https://github.com/ziglang/zig/issues/2283.
1097 lj->args.append("--no-threads");
1098
1094 if (g->zig_target->os != OsWASI) {1099 if (g->zig_target->os != OsWASI) {
1095 lj->args.append("--no-entry"); // So lld doesn't look for _start.1100 lj->args.append("--no-entry"); // So lld doesn't look for _start.
1096 }1101 }