Disable all dynamic linking tests under MEMORY64=2

Followup to ec14ddf and 20800de.

Author: sbc100

test/common.py

@@ -795,6 +795,16 @@ def check_dylink(self):
       self.skipTest('no dynamic linking support in wasm2js yet')
     if '-fsanitize=undefined' in self.emcc_args:
       self.skipTest('no dynamic linking support in UBSan yet')
+    # Temporarily enableing WASM_BIGINT in all dylink tests in order to allow
+    # a recent llvm change to land:
+    # https://github.com/llvm/llvm-project/pull/75242
+    # Once that lands we can use --no-shlib-sigcheck instead.
+    self.set_setting('WASM_BIGINT')
+    # MEMORY64=2 mode doesn't currently support dynamic linking because
+    # The side modules are lowered to wasm32 when they are built, making
+    # them unlinkable with wasm64 binaries.
+    if self.get_setting('MEMORY64') == 2:
+      self.skipTest('MEMORY64=2 + dynamic linking is not currently supported')
 
   def require_v8(self):
     if not config.V8_ENGINE or config.V8_ENGINE not in config.JS_ENGINES:

test/test_core.py

@@ -3986,11 +3986,6 @@ def test_dlfcn_preload(self):
 
   def dylink_test(self, main, side, expected=None, header=None, force_c=False,
                   main_module=2, **kwargs):
-    # Temporarily enableing WASM_BIGINT in all dylink tests in order to allow
-    # a recent llvm change to land:
-    # https://github.com/llvm/llvm-project/pull/75242
-    # Once that lands we can use --no-shlib-sigcheck instead.
-    self.set_setting('WASM_BIGINT')
     # Same as dylink_testf but take source code in string form
     if not isinstance(side, list):
       side_file = 'liblib.cpp' if not force_c else 'liblib.c'
@@ -4010,13 +4005,6 @@ def dylink_testf(self, main, side=None, expected=None, force_c=False, main_emcc_
                    so_dir='',
                    so_name='liblib.so',
                    **kwargs):
-    # Temporarily enableing WASM_BIGINT in all dylink tests in order to allow
-    # a recent llvm change to land:
-    # https://github.com/llvm/llvm-project/pull/75242
-    # Once that lands we can use --no-shlib-sigcheck instead.
-    self.set_setting('WASM_BIGINT')
-    if self.get_setting('MEMORY64') == 2:
-      self.skipTest('MEMORY64=2 + dynamic linking is in flux')
     main_emcc_args = main_emcc_args or []
     if getattr(self, 'dylink_reversed', False):
       # Test the reverse case.  There we flip the role of the side module and main module.