Merge branch 'main' into issue-20983

Author: ypujante

.circleci/ccache.conf

@@ -1,2 +1,3 @@
 debug = true
 debug_level = 1
+compiler_check = none

.circleci/config.yml

@@ -1,5 +1,6 @@
 version: 2.1
 
+
 orbs:
   win: circleci/windows@5.0
 
@@ -1057,7 +1058,7 @@ jobs:
       - run-tests-linux:
           # some native-dependent tests fail because of the lack of native
           # headers on emsdk-bundled clang
-          test_targets: "other skip:other.test_native_link_error_message"
+          test_targets: "other jslib skip:other.test_native_link_error_message"
   test-browser-chrome:
     executor: focal
     environment:

ChangeLog.md

@@ -18,8 +18,20 @@ to browse the changes between the tags.
 
 See docs/process.md for more on how version tagging works.
 
-4.0.17 (in development)
+4.0.18 (in development)
 -----------------------
+- The `emrun.py` script no longer support running on python2. (#25597)
+- `-sUSE_WEBGPU` was removed in favor of the external port Emdawnwebgpu which
+  are used via `--use-port=emdawnwebgpu`. See 4.0.10 release notes for details.
+- A new `CROSS_ORIGIN` setting was added in order to work around issues hosting
+  emscripten programs across different origins (#25581)
+
+4.0.17 - 10/17/25
+-----------------
+- Mutable Wasm globals can now be exported from native code.  Currently these
+  cannot be declared in C/C++ but can be defined and exported in assembly code.
+  This currently only works for mutable globals since immutables are already
+  (and continue to be) exported as plain JS numbers. (#25530)
 - Minimum Firefox version was bumped up to Firefox 68 ESR, since older Firefox
   versions are not able to run the parallel browser harness: (#25493)
   - Firefox: v65 -> v68

docs/process.md

@@ -291,6 +291,46 @@ To update our libraries to a newer musl release:
    [`update_musl.py`][update_musl_emscripten] for that.
 
 
+## Deprecating settings and features
+
+Emscripten has a lot of settings and features which makes combinatorial testing
+practically unfeasible.  In order to manage the complexity and reduce
+technical debt we constantly strive to deprecate and remove settings and features
+that are no longer in use.
+
+In order to manage these deprecations in a way that minimizes user impact and
+unintended consequences we have designed the following process.  A primary
+purpose of this process is to engage with the user community in order to assess
+the impact of removing a given feature.  At any point in the process we could
+decide collectively to abandon the deprecation, or to delay it.
+
+1. Create an "Intent to deprecate" bug for the setting or feature.
+
+2. Send a message to the emscripten-discuss mailing with the title `[PSA] Indent
+   to deprecate XXX` where `XXX` is the name of the feature or setting in
+   question.  Please include a link to the bug created above.
+
+3. If possible, update emscripten such that it will generate a `deprecated`
+   warning when the feature is used.  For settings this is normally as simple
+   as adding it to `DEPRECATED_SETTINGS` in `settings.py`.
+
+4. Perform a global search of public github repositories for usage of the
+   feature.   If you work for a company with a large internal codebase (e.g.
+   Google) please also search globally there.
+
+5. Feedback from steps (2), (3) and (4) should be summarized in the bug where
+   discussions about the impact of deprecation can then proceed.
+
+6. After at least 4 emscripten releases, or 2 months (whichever is shorter) a
+   final decision on the deprecation may be agreed upon.  The final decision
+   will be made by the Emscripten maintainers.
+
+7. If the decision is to proceed the feature can then be removed.   If the
+   decision goes the other way the deprecation warning should be removed.   When
+   the feature is removed, it should, where possible, continue to be detected
+   by the code so that users of the old feature see an actionable message.  An
+   entry in `ChangeLog.md` should also be added.
+
 [site_repo]: https://github.com/kripken/emscripten-site
 [releases_repo]: https://chromium.googlesource.com/emscripten-releases
 [waterfall]: https://ci.chromium.org/p/emscripten-releases/g/main/console

em++.py

@@ -5,6 +5,7 @@
 # found in the LICENSE file.
 
 import sys
+
 import emcc
 from tools import shared
 

em-config.py

@@ -14,8 +14,9 @@
 is found, or exits with 1 if the variable does not exist.
 """
 
-import sys
 import re
+import sys
+
 from tools import config
 
 

emar.py

@@ -8,6 +8,7 @@
 """
 
 import sys
+
 from tools import shared
 
 shared.exec_process([shared.LLVM_AR] + sys.argv[1:])

embuilder.py

@@ -20,15 +20,10 @@
 import time
 from contextlib import contextmanager
 
-from tools import cache
-from tools import shared
-from tools import system_libs
-from tools import ports
-from tools import utils
+from tools import cache, ports, shared, system_libs, utils
 from tools.settings import settings
 from tools.system_libs import USE_NINJA
 
-
 # Minimal subset of targets used by CI systems to build enough to be useful
 MINIMAL_TASKS = [
     'libcompiler_rt',
@@ -100,8 +95,6 @@
     'libunwind-legacyexcept',
     'libunwind-wasmexcept',
     'libnoexit',
-    'libwebgpu',
-    'libwebgpu_cpp',
     'bullet',
 ]
 
@@ -134,6 +127,9 @@
     'libwasmfs-debug',
     'libwasmfs_no_fs',
     'giflib',
+    'sdl2',
+    'sdl2_gfx',
+    'sdl3',
 ]
 
 PORTS = sorted(list(ports.ports_by_name.keys()) + list(ports.port_variants.keys()))

emcc.py

@@ -20,31 +20,38 @@
                slows down compilation).
 """
 
-from tools.toolchain_profiler import ToolchainProfiler
-
 import logging
 import os
 import shlex
 import shutil
 import sys
-import time
 import tarfile
+import time
 from dataclasses import dataclass
 from enum import Enum, auto, unique
 
-
-from tools import shared, system_libs, utils, cmdline
-from tools import diagnostics, building, compile
-from tools.shared import unsuffixed_basename, get_file_suffix
-from tools.shared import exit_with_error, DEBUG
-from tools.shared import in_temp
-from tools.shared import DYLIB_EXTENSIONS
+from tools import (
+  building,
+  cache,
+  cmdline,
+  compile,
+  config,
+  diagnostics,
+  shared,
+  system_libs,
+  utils,
+)
 from tools.cmdline import CLANG_FLAGS_WITH_ARGS
 from tools.response_file import substitute_response_files
-from tools import config
-from tools import cache
-from tools.settings import default_setting, user_settings, settings, COMPILE_TIME_SETTINGS
-from tools.utils import read_file
+from tools.settings import (
+  COMPILE_TIME_SETTINGS,
+  default_setting,
+  settings,
+  user_settings,
+)
+from tools.shared import DEBUG, DYLIB_EXTENSIONS, exit_with_error, in_temp
+from tools.toolchain_profiler import ToolchainProfiler
+from tools.utils import get_file_suffix, read_file, unsuffixed_basename
 
 logger = logging.getLogger('emcc')
 
@@ -250,10 +257,6 @@ def run(args):
     print(f'libraries: ={cache.get_lib_dir(absolute=True)}')
     return 0
 
-  if '-print-resource-dir' in args:
-    shared.check_call([clang] + args)
-    return 0
-
   if '-print-libgcc-file-name' in args or '--print-libgcc-file-name' in args:
     settings.limit_settings(None)
     compiler_rt = system_libs.Library.get_usable_variations()['libcompiler_rt']
@@ -292,6 +295,10 @@ def run(args):
 
   phase_setup(options, state)
 
+  if '-print-resource-dir' in args or any(a.startswith('--print-prog-name') for a in args):
+    shared.exec_process([clang] + compile.get_cflags(tuple(args)) + args)
+    assert False, 'exec_process should not return'
+
   if '--cflags' in args:
     # Just print the flags we pass to clang and exit.  We need to do this after
     # phase_setup because the setup sets things like SUPPORT_LONGJMP.
@@ -308,7 +315,7 @@ def run(args):
     linker_args = separate_linker_flags(newargs)[1]
     linker_args = [f.value for f in linker_args]
     # Delay import of link.py to avoid processing this file when only compiling
-    from tools import link
+    from tools import link  # noqa: PLC0415
     link.run_post_link(options.input_files[0], options, linker_args)
     return 0
 
@@ -513,7 +520,7 @@ def get_clang_command_asm():
     else:
       cmd = get_clang_command() + newargs
     shared.exec_process(cmd)
-    assert False, 'exec_process does not return'
+    assert False, 'exec_process should not return'
 
   # In COMPILE_AND_LINK we need to compile source files too, but we also need to
   # filter out the link flags
@@ -566,7 +573,7 @@ def compile_source_file(input_file):
     if not shared.SKIP_SUBPROCS:
       assert os.path.exists(output_file)
       if options.save_temps:
-        shutil.copyfile(output_file, shared.unsuffixed_basename(input_file) + '.o')
+        shutil.copyfile(output_file, utils.unsuffixed_basename(input_file) + '.o')
     return output_file
 
   # Compile input files individually to temporary locations.

emcmake.py

@@ -8,9 +8,8 @@
 import shlex
 import shutil
 import sys
-from tools import shared
-from tools import config
-from tools import utils
+
+from tools import config, shared, utils
 
 
 #