Merge remote-tracking branch 'upstream/main' into rpath-nested-deps

Author: ryanking13

.circleci/config.yml

@@ -452,6 +452,8 @@ commands:
           name: download firefox
           shell: powershell.exe -ExecutionPolicy Bypass
           command: |
+            $ErrorActionPreference = 'Stop'
+
             # To download Firefox, we must first figure out what the latest Firefox version name is.
             # This is because there does not exist a stable/static URL to download latest Firefox from.
             $html = Invoke-WebRequest "https://archive.mozilla.org/pub/firefox/nightly/latest-mozilla-central/"
@@ -774,6 +776,7 @@ jobs:
             omitexports0.test_asyncify_longjmp
             omitexports0.test_emscripten_api
             strict.test_no_declare_asm_module_exports
+            strict.test_dylink_global_inits_reversed
             "
   test-modularize-instance:
     executor: focal

.github/workflows/rebaseline-tests.yml

@@ -15,7 +15,7 @@ jobs:
     name: Rebaseline Tests
     runs-on: ubuntu-latest
     env:
-      GH_TOKEN: ${{ github.token }}
+      GH_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -58,5 +58,5 @@ jobs:
             fi
           fi
           git push origin rebaseline_tests
-          gh pr create --fill --base ${{ github.ref_name }}
+          gh pr create --fill --base ${{ github.ref_name }} --reviewer sbc100,kripken
           gh pr merge --squash --auto

.github/workflows/update-website.yml

@@ -0,0 +1,55 @@
+name: Update website
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ main ]
+
+jobs:
+  update-website:
+    name: Update website
+    runs-on: ubuntu-latest
+    env:
+      GITHUB_TOKEN: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Checkout website repo
+        uses: actions/checkout@v4
+        with:
+          repository: kripken/emscripten-site
+          ref: gh-pages
+          path: site/emscripten-site
+          token: ${{ secrets.EMSCRIPTEN_BOT_TOKEN }}
+      - name: pip install
+        run: |
+          which python3
+          python3 --version
+          python3 -m pip install -r requirements-dev.txt
+      - name: Update docs
+        run: |
+          set -o errexit
+          set -o xtrace
+          git config --global user.name emscripten-bot
+          git config --global user.email [email protected]
+          if ./tools/maint/update_docs.py; then
+             echo "update_docs.py returned zero, expectations up-to-date"
+             # Exit early and don't create a PR
+             exit 0
+          else
+            code=$?
+            if [[ $code != 2 ]] ; then
+               echo "update_docs.py failed with unexpected error $code (expected 2)"
+               exit 1
+            fi
+          fi
+          # Create a PR against the emscripten-site repo
+          cd site/emscripten-site
+          git push -f origin update
+          gh pr create --fill --head update --base gh-pages --reviewer sbc100,kripken
+          # TODO: Enable this once we figure out how to enforce review
+          # requirment
+          #gh pr merge --squash --auto

.gitignore

@@ -30,6 +30,9 @@ coverage.xml
 # Test output
 /out/
 
+# When updating the website we check it out here.
+/site/emscripten-site/
+
 # Windows ps1 launchers (created by ./tools/maint/create_entry_points.py)
 *.ps1
 # ...except the templates.

ChangeLog.md

@@ -18,9 +18,21 @@ to browse the changes between the tags.
 
 See docs/process.md for more on how version tagging works.
 
-4.0.20 (in development)
+4.0.21 (in development)
 -----------------------
 
+4.0.20 - 11/18/25
+-----------------
+- Linker flags specified on the command line are now passed to `wasm-ld` after
+  the internal emscripten linker flags.  This means that users can now override
+  emscripten defaults with things `-Wl,--stack-first`. (#25803)
+- Added `emscripten_html5_remove_event_listener` function in `html5.h` in order
+  to be able to remove a single callback. (#25535)
+- The standalone `file_packager.py` script no longer supports `--embed` with JS
+  output (use `--obj-output` is now required for embedding data).  This usage
+  has been producing a warning since #16050 which is now an error.  (#25049)
+- Embind now requires C++17 or newer. See #24850.
+
 4.0.19 - 11/04/25
 -----------------
 - The `RETAIN_COMPILER_SETTINGS` setting and the corresponding

README.md

@@ -24,7 +24,7 @@ It can probably port your codebase, too!
 While Emscripten mostly focuses on compiling C and C++ using
 [Clang](https://clang.llvm.org/), it can be integrated with other LLVM-using
 compilers (for example, Rust has Emscripten integration, with the
-`wasm32-unknown-emscripten` and `asmjs-unknown-emscripten` targets).
+`wasm32-unknown-emscripten` target).
 
 License
 -------

emrun.py

@@ -364,10 +364,10 @@ def kill_browser_process():
   global browser_process, processname_killed_atexit, current_browser_processes
   if browser_process and browser_process.poll() is None:
     try:
-      logv('Terminating browser process pid=' + str(browser_process.pid) + '..')
+      logv(f'Terminating browser process pid={browser_process.pid}..')
       browser_process.kill()
     except Exception as e:
-      logv('Failed with error ' + str(e) + '!')
+      logv(f'Failed with error {e}!')
 
     browser_process = None
     # We have a hold of the target browser process explicitly, no need to resort to killall,
@@ -377,10 +377,10 @@ def kill_browser_process():
   if current_browser_processes:
     for pid in current_browser_processes:
       try:
-        logv('Terminating browser process pid=' + str(pid['pid']) + '..')
+        logv(f'Terminating browser process pid={pid["pid"]}..')
         os.kill(pid['pid'], 9)
       except Exception as e:
-        logv('Failed with error ' + str(e) + '!')
+        logv(f'Failed with error {e}!')
 
     current_browser_processes = None
     # We have a hold of the target browser process explicitly, no need to resort to killall,
@@ -434,7 +434,7 @@ def pid_existed(pid):
     return False
 
   for p in running_browser_processes:
-    logv('Detected running browser process id: ' + str(p['pid']) + ', existed already at emrun startup? ' + str(pid_existed(p['pid'])))
+    logv(f'Detected running browser process id: {p["pid"]}, existed already at emrun startup? {pid_existed(p["pid"])}')
 
   current_browser_processes = [p for p in running_browser_processes if not pid_existed(p['pid'])]
 
@@ -539,15 +539,15 @@ def serve_forever(self, timeout=0.5):
       time_since_message = now - last_message_time
       if emrun_options.silence_timeout != 0 and time_since_message > emrun_options.silence_timeout:
         self.shutdown()
-        logi('No activity in ' + str(emrun_options.silence_timeout) + ' seconds. Quitting web server with return code ' + str(emrun_options.timeout_returncode) + '. (--silence-timeout option)')
+        logi(f'No activity in {emrun_options.silence_timeout} seconds. Quitting web server with return code {emrun_options.timeout_returncode}. (--silence-timeout option)')
         page_exit_code = emrun_options.timeout_returncode
         emrun_options.kill_exit = True
 
       # If the page has been running too long as a whole, kill process.
       time_since_start = now - page_start_time
       if emrun_options.timeout != 0 and time_since_start > emrun_options.timeout:
         self.shutdown()
-        logi('Page has not finished in ' + str(emrun_options.timeout) + ' seconds. Quitting web server with return code ' + str(emrun_options.timeout_returncode) + '. (--timeout option)')
+        logi(f'Page has not finished in {emrun_options.timeout} seconds. Quitting web server with return code {emrun_options.timeout_returncode}. (--timeout option)')
         emrun_options.kill_exit = True
         page_exit_code = emrun_options.timeout_returncode
 
@@ -685,7 +685,7 @@ def do_POST(self):  # # noqa: DC04
         pass
       with open(filename, 'wb') as fh:
         fh.write(data)
-      logi('Wrote ' + str(len(data)) + ' bytes to file "' + filename + '".')
+      logi(f'Wrote {len(data)} bytes to file "{filename}".')
       have_received_messages = True
     elif path == '/system_info':
       system_info = json.loads(get_system_info(format_json=True))
@@ -714,7 +714,7 @@ def do_POST(self):  # # noqa: DC04
       elif data.startswith('^exit^'):
         if not emrun_options.serve_after_exit:
           page_exit_code = int(data[6:])
-          logv('Web page has quit with a call to exit() with return code ' + str(page_exit_code) + '. Shutting down web server. Pass --serve-after-exit to keep serving even after the page terminates with exit().')
+          logv(f'Web page has quit with a call to exit() with return code ${page_exit_code}. Shutting down web server. Pass --serve-after-exit to keep serving even after the page terminates with exit().')
           # Set server socket to nonblocking on shutdown to avoid sporadic deadlocks
           self.server.socket.setblocking(False)
           self.server.shutdown()
@@ -787,7 +787,7 @@ def get_cpu_info():
   except Exception as e:
     import traceback
     loge(traceback.format_exc())
-    return {'model': 'Unknown ("' + str(e) + '")',
+    return {'model': f'Unknown ("{e}")',
             'physicalCores': 1,
             'logicalCores': 1,
             'frequency': 0,
@@ -811,7 +811,7 @@ def get_android_cpu_infoline():
       hardware = line[line.find(':') + 1:].strip()
 
   freq = int(check_output([ADB, 'shell', 'cat', '/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq']).strip()) // 1000
-  return 'CPU: ' + processor + ', ' + hardware + ' @ ' + str(freq) + ' MHz'
+  return f'CPU: {processor}, {hardware} @ {freq} MHz'
 
 
 def win_get_gpu_info():
@@ -1435,7 +1435,7 @@ def list_processes_by_name(exe_full_path):
     # Fail gracefully if psutil not available
     logv('import psutil failed, unable to detect browser processes')
 
-  logv('Searching for processes by full path name "' + exe_full_path + '".. found ' + str(len(pids)) + ' entries')
+  logv(f'Searching for processes by full path name "{exe_full_path}".. found {len(pids)} entries')
 
   return pids
 
@@ -1681,7 +1681,7 @@ def run(args):  # noqa: C901, PLR0912, PLR0915
     else:
       hostname = options.hostname
     # create url for browser after opening the server so we have the final port number in case we are binding to port 0
-    url = 'http://' + hostname + ':' + str(options.port) + '/' + url
+    url = f'http://{hostname}:{options.port}/{url}'
 
   if options.android:
     if options.run_browser or options.browser_info:
@@ -1715,7 +1715,7 @@ def run(args):  # noqa: C901, PLR0912, PLR0915
       # 5. Locate the name of the main activity for the browser in manifest.txt and add an entry to above list in form 'appname/mainactivityname'
 
       if options.android_tunnel:
-        subprocess.check_call([ADB, 'reverse', 'tcp:' + str(options.port), 'tcp:' + str(options.port)])
+        subprocess.check_call([ADB, 'reverse', f'tcp:{options.port}', f'tcp:{options.port}'])
 
       url = url.replace('&', '\\&')
       browser = [ADB, 'shell', 'am', 'start', '-a', 'android.intent.action.VIEW', '-n', browser_app, '-d', url]
@@ -1727,7 +1727,7 @@ def run(args):  # noqa: C901, PLR0912, PLR0915
     if options.run_browser or options.browser_info:
       browser = find_browser(str(options.browser))
       if not browser:
-        loge('Unable to find browser "' + str(options.browser) + '"! Check the correctness of the passed --browser=xxx parameter!')
+        loge(f'Unable to find browser "{options.browser}"! Check the correctness of the passed --browser=xxx parameter!')
         return 1
       browser_exe = browser[0]
       browser_args = shlex.split(unwrap(options.browser_args))
@@ -1783,7 +1783,7 @@ def run(cmd):
       run(['adb', 'shell', 'mkdir', '/mnt/sdcard/safe_firefox_profile'])
       run(['adb', 'push', os.path.join(profile_dir, 'prefs.js'), '/mnt/sdcard/safe_firefox_profile/prefs.js'])
     except Exception as e:
-      loge('Creating Firefox profile prefs.js file to internal storage in /mnt/sdcard failed with error ' + str(e) + '!')
+      loge(f'Creating Firefox profile prefs.js file to internal storage in /mnt/sdcard failed with error {e}!')
       loge('Try running without --safe-firefox-profile flag if unattended execution mode is not important, or')
       loge('enable rooted debugging on the Android device to allow adb to write files to /mnt/sdcard.')
     browser += ['--es', 'args', '"--profile /mnt/sdcard/safe_firefox_profile"']
@@ -1833,9 +1833,9 @@ def run(cmd):
       logv(browser_exe)
       previous_browser_processes = list_processes_by_name(browser_exe)
       for p in previous_browser_processes:
-        logv('Before spawning web browser, found a running ' + os.path.basename(browser_exe) + ' browser process id: ' + str(p['pid']))
+        logv(f'Before spawning web browser, found a running {os.path.basename(browser_exe)} browser process id: {p["pid"]}')
     browser_process = subprocess.Popen(browser, env=subprocess_env())
-    logv('Launched browser process with pid=' + str(browser_process.pid))
+    logv(f'Launched browser process with pid={browser_process.pid}')
     if options.kill_exit:
       atexit.register(kill_browser_process)
     # For Android automation, we execute adb, so this process does not
@@ -1847,7 +1847,7 @@ def run(cmd):
     premature_quit_code = browser_process.poll()
     if premature_quit_code is not None:
       options.serve_after_close = True
-      logv('Warning: emrun got immediately detached from the target browser process (the process quit with exit code ' + str(premature_quit_code) + '). Cannot detect when user closes the browser. Behaving as if --serve-after-close was passed in.')
+      logv(f'Warning: emrun got immediately detached from the target browser process (the process quit with exit code {premature_quit_code}). Cannot detect when user closes the browser. Behaving as if --serve-after-close was passed in.')
       if not options.browser:
         logv('Try passing the --browser=/path/to/browser option to avoid this from occurring. See https://github.com/emscripten-core/emscripten/issues/3234 for more discussion.')
 

emscripten-version.txt

@@ -1 +1 @@
-4.0.20-git
+4.0.21-git

site/source/docs/api_reference/html5.h.rst

@@ -90,6 +90,54 @@ The ``useCapture`` parameter  maps to ``useCapture`` in `EventTarget.addEventLis
 
 Most functions return the result using the type :c:data:`EMSCRIPTEN_RESULT`. Zero and positive values denote success. Negative values signal failure. None of the functions fail or abort by throwing a JavaScript or C++ exception. If a particular browser does not support the given feature, the value :c:data:`EMSCRIPTEN_RESULT_NOT_SUPPORTED` will be returned at the time the callback is registered.
 
+Unregister function
+-------------------
+
+In order to unregister a single event handler callback, call the following function:
+
+  .. code-block:: cpp
+
+    EMSCRIPTEN_RESULT emscripten_html5_remove_event_listener(
+      const char *target,   // ID of the target HTML element.
+      void *userData,       // User-defined data (passed to the callback).
+      int eventTypeId,      // The event type ID (EMSCRIPTEN_EVENT_XXX).
+      void *callback        // Callback function.
+    );
+
+
+The ``target``, ``userData`` and ``callback`` parameters are the same parameters provided in ``emscripten_set_some_callback`` with the only difference being that, since this function applies to all types of callbacks, the type of ``callback`` is ``void *``.
+
+Note in particular that the value of ``userData`` will need to match with the call that was used to register the callback. If you are having trouble, double check the value of ``userData``.
+
+The ``eventTypeId`` represents the event type, the same Id received in the callback functions.
+
+The function returns ``EMSCRIPTEN_RESULT_SUCCESS`` when the event handler callback is removed and ``EMSCRIPTEN_RESULT_INVALID_PARAM`` otherwise.
+
+  .. code-block:: cpp
+
+    // Example
+
+    bool my_mouse_callback_1(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData) {
+      // ...
+    }
+
+    bool my_mouse_callback_2(int eventType, const EmscriptenMouseEvent *mouseEvent, void *userData) {
+      // ...
+    }
+
+    void main() {
+
+      // 1. set callbacks for mouse down and mouse move
+      emscripten_set_mousedown_callback("#mydiv", 0, my_mouse_callback_1);
+      emscripten_set_mousedown_callback("#mydiv", (void *) 34, my_mouse_callback_2);
+      emscripten_set_mousemove_callback("#mydiv", 0, my_mouse_callback_1);
+
+      // 2. remove these callbacks
+      emscripten_html5_remove_event_listener("#mydiv", 0, EMSCRIPTEN_EVENT_MOUSEDOWN, my_mouse_callback_1);
+      emscripten_html5_remove_event_listener("#mydiv", (void *) 34, EMSCRIPTEN_EVENT_MOUSEDOWN, my_mouse_callback_2);
+      emscripten_html5_remove_event_listener("#mydiv", 0, EMSCRIPTEN_EVENT_MOUSEMOVE, my_mouse_callback_1);
+    }
+
 
 Callback functions
 ------------------

site/source/docs/api_reference/wasm_audio_worklets.rst

@@ -44,10 +44,11 @@ and then, these processors are instantiated one or more times in the audio
 processing graph as AudioWorkletNodes.
 
 Once a class type is instantiated on the Web Audio graph and the graph is
-running, a C/C++ function pointer callback will be invoked for each 128
-samples of the processed audio stream that flows through the node. Newer Web
-Audio API specs allow this to be changed, so for future compatibility use the
-``AudioSampleFrame``'s ``samplesPerChannel`` to get the value.
+running, a C/C++ function pointer callback will be invoked for each N samples
+of the processed audio stream that flows through the node (where N is is the
+number of samples per channel, exposed as ``AudioSampleFrame``'s
+``samplesPerChannel``, always 128 in the 1.0 Web Audio API, though with the 1.1
+API ``emscripten_create_audio_context()`` accepts a ``renderSizeHint`` option).
 
 This callback will be executed on a dedicated separate audio processing
 thread with real-time processing priority. Each Web Audio context will