03-commit-fbea9fc-3.1.31.patch 803 B

12345678910111213141516171819
  1. From fbea9fc86eba9a35958b0154b1b08dbc4744fa09 Mon Sep 17 00:00:00 2001
  2. From: Sam Clegg <sbc@chromium.org>
  3. Date: Fri, 27 Jan 2023 09:02:49 -0800
  4. Subject: [PATCH] Patches from emscripten 3.1.31
  5. diff --git a/src/cxa_thread_atexit.cpp b/src/cxa_thread_atexit.cpp
  6. --- a/src/cxa_thread_atexit.cpp
  7. +++ b/src/cxa_thread_atexit.cpp
  8. @@ -113,8 +113,8 @@ extern "C" {
  9. return __cxa_thread_atexit_impl(dtor, obj, dso_symbol);
  10. #else
  11. #ifndef __EMSCRIPTEN__
  12. - // Emscripten doesn't fully support weak undefined symbols yet
  13. - // https://github.com/emscripten-core/emscripten/issues/12819
  14. + // Emscripten doesn't implement __cxa_thread_atexit_impl, so we can simply
  15. + // avoid this check.
  16. if (__cxa_thread_atexit_impl) {
  17. return __cxa_thread_atexit_impl(dtor, obj, dso_symbol);
  18. } else