[llvm-branch-commits] [libcxx] bfd609f - Patches from emscripten 3.1.12

[Sam Clegg via llvm-branch-commits]

Author: Sam Clegg
Date: 2022-05-27T19:01:47-07:00
New Revision: bfd609f67960b463229f0167b5ca720f70319797

URL: https://github.com/llvm/llvm-project/commit/bfd609f67960b463229f0167b5ca720f70319797
DIFF: https://github.com/llvm/llvm-project/commit/bfd609f67960b463229f0167b5ca720f70319797.diff

LOG: Patches from emscripten 3.1.12

Added: 
    

Modified: 
    libcxx/include/__locale
    libcxx/src/include/config_elast.h

Removed: 
    


################################################################################
diff  --git a/libcxx/include/__locale b/libcxx/include/__locale
index 51f35eece7121..08db4bcbe01e8 100644
--- a/libcxx/include/__locale
+++ b/libcxx/include/__locale
@@ -34,8 +34,7 @@
 # include <__support/newlib/xlocale.h>
 #elif defined(__OpenBSD__)
 # include <__support/openbsd/xlocale.h>
-#elif (defined(__APPLE__)      || defined(__FreeBSD__) \
-    || defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
+#elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__IBMCPP__))
 # include <xlocale.h>
 #elif defined(__Fuchsia__)
 # include <__support/fuchsia/xlocale.h>

diff  --git a/libcxx/src/include/config_elast.h b/libcxx/src/include/config_elast.h
index 13e1624a97ee3..bef26ec5019ec 100644
--- a/libcxx/src/include/config_elast.h
+++ b/libcxx/src/include/config_elast.h
@@ -29,12 +29,12 @@
 // No _LIBCPP_ELAST needed on Fuchsia
 #elif defined(__wasi__)
 // No _LIBCPP_ELAST needed on WASI
+#elif defined(__EMSCRIPTEN__)
+// No _LIBCPP_ELAST needed on Emscripten
 #elif defined(__linux__) || defined(_LIBCPP_HAS_MUSL_LIBC)
 #define _LIBCPP_ELAST 4095
 #elif defined(__APPLE__)
 // No _LIBCPP_ELAST needed on Apple
-#elif defined(__EMSCRIPTEN__) // XXX EMSCRIPTEN added ELAST value
-#define _LIBCPP_ELAST 256
 #elif defined(__sun__)
 #define _LIBCPP_ELAST ESTALE
 #elif defined(__MVS__)