Merge pull request #15 from emscripten-core/emscripten-libs-19-update

Add downstream library changes from emscripten

Author: aheejin

libcxx/include/__locale_dir/locale_base_api.h

@@ -9,7 +9,9 @@
 #ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_H
 #define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_H
 
-#if defined(_LIBCPP_MSVCRT_LIKE)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__EMSCRIPTEN__)
+#  include <xlocale.h>
+#elif defined(_LIBCPP_MSVCRT_LIKE)
 #  include <__locale_dir/locale_base_api/win32.h>
 #elif defined(_AIX) || defined(__MVS__)
 #  include <__locale_dir/locale_base_api/ibm.h>
@@ -25,8 +27,6 @@
 #  include <__locale_dir/locale_base_api/fuchsia.h>
 #elif defined(__wasi__) || defined(_LIBCPP_HAS_MUSL_LIBC)
 #  include <__locale_dir/locale_base_api/musl.h>
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-#  include <xlocale.h>
 #endif
 
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)

libcxxabi/src/cxa_exception.cpp

@@ -789,9 +789,9 @@ __cxa_rethrow_primary_exception(void* thrown_object)
         // In debug mode, call a JS library function to use
         // WebAssembly.Exception JS API, which enables us to include stack
         // traces
-        __throw_exception_with_stack_trace(&exception_header->unwindHeader);
+        __throw_exception_with_stack_trace(&dep_exception_header->unwindHeader);
 #else
-        _Unwind_RaiseException(&exception_header->unwindHeader);
+        _Unwind_RaiseException(&dep_exception_header->unwindHeader);
 #endif
         // Some sort of unwinding error.  Note that terminate is a handler.
         __cxa_begin_catch(&dep_exception_header->unwindHeader);

libcxxabi/src/private_typeinfo.cpp

@@ -1546,7 +1546,7 @@ __base_class_type_info::search_below_dst(__dynamic_cast_info* info,
 
 
 // XXX EMSCRIPTEN
-#ifndef __WASM_EXCEPTIONS__
+#if defined(__wasm__) && !defined(__WASM_EXCEPTIONS__)
 
 #include "cxa_exception.h"
 
@@ -1601,5 +1601,5 @@ void *__cxa_get_exception_ptr(void *thrown_object) throw() {
 
 }  // __cxxabiv1
 
-#endif // !__WASM_EXCEPTIONS__
+#endif // __wasm__ && !__WASM_EXCEPTIONS__