diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -37,7 +37,6 @@ __nullptr __ranges/enable_borrowed_range.h __split_buffer - __sso_allocator __std_stream __string __threading_support diff --git a/libcxx/include/module.modulemap b/libcxx/include/module.modulemap --- a/libcxx/include/module.modulemap +++ b/libcxx/include/module.modulemap @@ -539,7 +539,6 @@ module __locale { header "__locale" export * } module __mutex_base { header "__mutex_base" export * } module __split_buffer { header "__split_buffer" export * } - module __sso_allocator { header "__sso_allocator" export * } module __std_stream { header "__std_stream" export * } module __string { header "__string" export * } module __tree { header "__tree" export * } diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt --- a/libcxx/src/CMakeLists.txt +++ b/libcxx/src/CMakeLists.txt @@ -64,6 +64,7 @@ if (LIBCXX_ENABLE_LOCALIZATION) list(APPEND LIBCXX_SOURCES + include/locale_sso_allocator.h ios.cpp ios.instantiations.cpp iostream.cpp diff --git a/libcxx/include/__sso_allocator b/libcxx/src/include/locale_sso_allocator.h rename from libcxx/include/__sso_allocator rename to libcxx/src/include/locale_sso_allocator.h diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -27,7 +27,6 @@ #define _CTYPE_DISABLE_MACROS #endif #include "cwctype" -#include "__sso_allocator" #if defined(_LIBCPP_MSVCRT) || defined(__MINGW32__) #include "__support/win32/locale_win32.h" #elif !defined(__BIONIC__) && !defined(__NuttX__) @@ -36,6 +35,7 @@ #include #include #include "include/atomic_support.h" +#include "include/locale_sso_allocator.h" #include "__undef_macros" // On Linux, wint_t and wchar_t have different signed-ness, and this causes