Add back in __gxx_personality_v0

system/lib/libcxxabi/src/gxx_personality_stub.cpp

@@ -0,0 +1,20 @@
+#include <stdint.h>
+#include <stdlib.h>
+
+
+#include "cxa_exception.h"
+#include "cxa_handlers.h"
+#include "emscripten.h"
+
+
+
+// TODO: Remove this when Rust doesn't need it anymore.
+// https://github.com/rust-lang/rust/pull/97888
+extern "C" _LIBCXXABI_FUNC_VIS _Unwind_Reason_Code
+__gxx_personality_v0(int version,
+                     _Unwind_Action actions,
+                     uint64_t exceptionClass,
+                     _Unwind_Exception* unwind_exception,
+                     _Unwind_Context* context) {
+    abort();
+}

tests/test_core.py

@@ -9401,7 +9401,6 @@ def test_js_library_i64_params(self):
     self.emcc_args += ['--js-library=' + test_file('core/js_library_i64_params.js')]
     self.do_core_test('js_library_i64_params.c')
 
-
 # Generate tests for everything
 def make_run(name, emcc_args, settings=None, env=None, node_args=None, require_v8=False, v8_args=None):
   if env is None:

tests/test_other.py

@@ -12126,3 +12126,34 @@ def test_print_map(self):
     self.assertContained('hello_world.o:(__original_main)', out)
     out2 = self.run_process([EMCC, 'hello_world.o', '-Wl,-M'], stdout=PIPE).stdout
     self.assertEqual(out, out2)
+
+  def test_rust_gxx_personality_v0(self):
+    create_file('main.cpp', r'''
+      #include <stdio.h>
+      #include <stdint.h>
+      extern "C" {
+        int __gxx_personality_v0(int version, void* actions, uint64_t exception_class, void* exception_object, void* context);
+        int rust_eh_personality(int version, void* actions, uint64_t exception_class, void* exception_object, void* context){
+          return __gxx_personality_v0(version, actions, exception_class, exception_object, context);
+        }
+        int main(int argc, char** argv) {
+          printf("result: %d\n", argc);
+          if(argc == 2){
+            rust_eh_personality(0, NULL, 0, NULL, NULL);
+          }
+          return 0;
+        }
+      }
+    ''')
+    self.run_process([EMXX, '-c', 'main.cpp'])
+
+    self.run_process([EMXX, '-o', 'main.js', 'main.o', '-lc++abi'] + self.get_emcc_args())
+
+    self.do_run('main.js', 'result: 1', no_build=True)
+    try:
+      self.do_run('main.js', 'result: 1', no_build=True, args=["1"])
+      raise RuntimeError('should not have passed')
+    except AssertionError as e:
+      err = e
+    assert "Aborted(native code called abort())" in err.args[0]
+    del err

tools/system_libs.py

@@ -1227,6 +1227,7 @@ def get_files(self):
       'stdlib_typeinfo.cpp',
       'private_typeinfo.cpp',
       'cxa_exception_emscripten.cpp',
+      'gxx_personality_stub.cpp',
     ]
     if self.eh_mode == Exceptions.NONE:
       filenames += ['cxa_noexception.cpp']