Skip to content

Commit 7cbb230

Browse files
authored
Remove temporary setting of WASM_BIGINT in dylink tests. NFC (#22238)
The llvm change that includes `--no-shlib-sigcheck` has now langed (llvm/llvm-project#75242) so we can use that instead.
1 parent 1ef97c7 commit 7cbb230

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

test/common.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -795,11 +795,6 @@ def check_dylink(self):
795795
self.skipTest('no dynamic linking support in wasm2js yet')
796796
if '-fsanitize=undefined' in self.emcc_args:
797797
self.skipTest('no dynamic linking support in UBSan yet')
798-
# Temporarily enableing WASM_BIGINT in all dylink tests in order to allow
799-
# a recent llvm change to land:
800-
# https://github.com/llvm/llvm-project/pull/75242
801-
# Once that lands we can use --no-shlib-sigcheck instead.
802-
self.set_setting('WASM_BIGINT')
803798
# MEMORY64=2 mode doesn't currently support dynamic linking because
804799
# The side modules are lowered to wasm32 when they are built, making
805800
# them unlinkable with wasm64 binaries.

tools/building.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,12 @@ def lld_flags_for_executable(external_symbols):
194194
if settings.RELOCATABLE:
195195
cmd.append('--experimental-pic')
196196
cmd.append('--unresolved-symbols=import-dynamic')
197+
if not settings.WASM_BIGINT:
198+
# When we don't have WASM_BIGINT available, JS signature legalization
199+
# in binaryen will mutate the signatures of the imports/exports of our
200+
# shared libraries. Because of this we need to disabled signature
201+
# checking of shared library functions in this case.
202+
cmd.append('--no-shlib-sigcheck')
197203
if settings.SIDE_MODULE:
198204
cmd.append('-shared')
199205
else:

0 commit comments

Comments
 (0)