Skip to content

Commit

Permalink
Really temporarily disable linking string merging. NFC (#14149)
Browse files Browse the repository at this point in the history
Followup to #14142, but apply to all calls to wasm-ld.

Fixes: #14147
  • Loading branch information
sbc100 committed May 11, 2021
1 parent 6b9ab59 commit 9d385d5
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tools/building.py
Expand Up @@ -360,11 +360,6 @@ def lld_flags_for_executable(external_symbols):
else:
cmd.append('--allow-undefined')

# Disable string merging in the linker, at least until we there is
# an upstream fix for https://bugs.llvm.org/show_bug.cgi?id=50291.
# (-O level only effect string merging in wasm-ld today).
cmd.append('-O0')

if settings.IMPORTED_MEMORY:
cmd.append('--import-memory')

Expand Down Expand Up @@ -447,6 +442,11 @@ def link_lld(args, target, external_symbols=None):
# grouping.
args = [a for a in args if a not in ('--start-group', '--end-group')]

# Disable string merging in the linker, at least until we there is
# an upstream fix for https://bugs.llvm.org/show_bug.cgi?id=50291.
# (-O level only effect string merging in wasm-ld today).
args.append('-O0')

# Emscripten currently expects linkable output (SIDE_MODULE/MAIN_MODULE) to
# include all archive contents.
if settings.LINKABLE:
Expand Down

0 comments on commit 9d385d5

Please sign in to comment.