diff -ru origsrc/libcxx-20.1.2.src/src/call_once.cpp src/libcxx-20.1.2.src/src/call_once.cpp --- origsrc/libcxx-20.1.2.src/src/call_once.cpp 2025-04-02 08:44:12.000000000 +0900 +++ src/libcxx-20.1.2.src/src/call_once.cpp 2025-04-19 22:06:01.378380400 +0900 @@ -24,8 +24,8 @@ // keep in sync with: 7741191. #if _LIBCPP_HAS_THREADS -static constinit __libcpp_mutex_t mut = _LIBCPP_MUTEX_INITIALIZER; -static constinit __libcpp_condvar_t cv = _LIBCPP_CONDVAR_INITIALIZER; +static __libcpp_mutex_t mut = _LIBCPP_MUTEX_INITIALIZER; +static __libcpp_condvar_t cv = _LIBCPP_CONDVAR_INITIALIZER; #endif void __call_once(volatile once_flag::_State_type& flag, void* arg, void (*func)(void*)) { diff -ru origsrc/libcxx-20.1.2.src/src/memory.cpp src/libcxx-20.1.2.src/src/memory.cpp --- origsrc/libcxx-20.1.2.src/src/memory.cpp 2025-04-02 08:44:12.000000000 +0900 +++ src/libcxx-20.1.2.src/src/memory.cpp 2025-04-19 22:05:38.683014400 +0900 @@ -99,7 +99,7 @@ #if _LIBCPP_HAS_THREADS static constexpr std::size_t __sp_mut_count = 32; -static constinit __libcpp_mutex_t mut_back[__sp_mut_count] = { +static __libcpp_mutex_t mut_back[__sp_mut_count] = { _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, _LIBCPP_MUTEX_INITIALIZER, diff -ru origsrc/libcxx-20.1.2.src/src/random_shuffle.cpp src/libcxx-20.1.2.src/src/random_shuffle.cpp --- origsrc/libcxx-20.1.2.src/src/random_shuffle.cpp 2025-04-02 08:44:12.000000000 +0900 +++ src/libcxx-20.1.2.src/src/random_shuffle.cpp 2025-04-19 22:04:21.632563400 +0900 @@ -19,7 +19,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD #if _LIBCPP_HAS_THREADS -static constinit __libcpp_mutex_t __rs_mut = _LIBCPP_MUTEX_INITIALIZER; +static __libcpp_mutex_t __rs_mut = _LIBCPP_MUTEX_INITIALIZER; #endif unsigned __rs_default::__c_ = 0; diff -ru origsrc/libcxx-20.1.2.src/src/regex.cpp src/libcxx-20.1.2.src/src/regex.cpp --- origsrc/libcxx-20.1.2.src/src/regex.cpp 2025-04-02 08:44:12.000000000 +0900 +++ src/libcxx-20.1.2.src/src/regex.cpp 2025-04-19 22:05:09.641475100 +0900 @@ -308,13 +308,13 @@ const classnames ClassNames[] = { {"alnum", ctype_base::alnum}, {"alpha", ctype_base::alpha}, - {"blank", ctype_base::blank}, + {"blank", ctype_base::blank + 256}, {"cntrl", ctype_base::cntrl}, {"d", ctype_base::digit}, {"digit", ctype_base::digit}, {"graph", ctype_base::graph}, {"lower", ctype_base::lower}, - {"print", ctype_base::print}, + {"print", ctype_base::print + 256}, {"punct", ctype_base::punct}, {"s", ctype_base::space}, {"space", ctype_base::space},