From 042d28d89a4eb60be0c528452077cc0e6b34e486 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 24 Oct 2025 14:23:09 -0400 Subject: [PATCH 1/3] [libc++] Move AIX and z/OS to the new locale API This completes the transition of z/OS and AIX to the new locale base API. I tried my best to make the code 100% equivalent to the previous code, however it's very difficult to do that without having access to that platform. Overall, this makes the locale API definition a lot more direct on those platforms and also moves in the direction of removing the legacy shim layer. --- libcxx/include/CMakeLists.txt | 3 +- libcxx/include/__locale_dir/locale_base_api.h | 6 +- .../__locale_dir/locale_base_api/ibm.h | 318 +++++++++++++++--- .../include/__support/ibm/locale_mgmt_zos.h | 53 --- 4 files changed, 270 insertions(+), 110 deletions(-) delete mode 100644 libcxx/include/__support/ibm/locale_mgmt_zos.h diff --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt index 37259a7e6e7dd..3050d79b971d1 100644 --- a/libcxx/include/CMakeLists.txt +++ b/libcxx/include/CMakeLists.txt @@ -516,7 +516,6 @@ set(files __locale_dir/get_c_locale.h __locale_dir/locale_base_api.h __locale_dir/locale_base_api/bsd_locale_fallbacks.h - __locale_dir/locale_base_api/ibm.h __locale_dir/locale_base_api/musl.h __locale_dir/locale_base_api/openbsd.h __locale_dir/messages.h @@ -528,6 +527,7 @@ set(files __locale_dir/support/bsd_like.h __locale_dir/support/freebsd.h __locale_dir/support/fuchsia.h + __locale_dir/support/ibm.h __locale_dir/support/linux.h __locale_dir/support/no_locale/characters.h __locale_dir/support/no_locale/strtonum.h @@ -753,7 +753,6 @@ set(files __string/constexpr_c_functions.h __string/extern_template_lists.h __support/ibm/gettod_zos.h - __support/ibm/locale_mgmt_zos.h __support/ibm/nanosleep.h __support/xlocale/__nop_locale_mgmt.h __support/xlocale/__posix_l_fallback.h diff --git a/libcxx/include/__locale_dir/locale_base_api.h b/libcxx/include/__locale_dir/locale_base_api.h index 9f3ce02a3af20..6788a32f2daec 100644 --- a/libcxx/include/__locale_dir/locale_base_api.h +++ b/libcxx/include/__locale_dir/locale_base_api.h @@ -121,15 +121,15 @@ # include <__locale_dir/support/fuchsia.h> # elif defined(__linux__) # include <__locale_dir/support/linux.h> +# elif defined(_AIX) || defined(__MVS__) +# include <__locale_dir/support/ibm.h> # else // TODO: This is a temporary definition to bridge between the old way we defined the locale base API // (by providing global non-reserved names) and the new API. As we move individual platforms // towards the new way of defining the locale base API, this should disappear since each platform // will define those directly. -# if defined(_AIX) || defined(__MVS__) -# include <__locale_dir/locale_base_api/ibm.h> -# elif defined(__OpenBSD__) +# if defined(__OpenBSD__) # include <__locale_dir/locale_base_api/openbsd.h> # elif defined(__wasi__) || _LIBCPP_HAS_MUSL_LIBC # include <__locale_dir/locale_base_api/musl.h> diff --git a/libcxx/include/__locale_dir/locale_base_api/ibm.h b/libcxx/include/__locale_dir/locale_base_api/ibm.h index 1d1d15df9f799..471a4fddbf94b 100644 --- a/libcxx/include/__locale_dir/locale_base_api/ibm.h +++ b/libcxx/include/__locale_dir/locale_base_api/ibm.h @@ -7,41 +7,74 @@ // //===----------------------------------------------------------------------===// -#ifndef _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H -#define _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H +#ifndef _LIBCPP___LOCALE_DIR_SUPPORT_IBM_H +#define _LIBCPP___LOCALE_DIR_SUPPORT_IBM_H + +#include <__config> +#include <__fwd/string.h> +#include +#include +#include +#include +#include #if defined(__MVS__) # include <__support/ibm/locale_mgmt_zos.h> -#endif // defined(__MVS__) +#endif -#include -#include -#include +#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) +# pragma GCC system_header +#endif -#include "cstdlib" +_LIBCPP_BEGIN_NAMESPACE_STD +namespace __locale { -#if defined(__MVS__) -# include -// POSIX routines -# include <__support/xlocale/__posix_l_fallback.h> -#endif // defined(__MVS__) +#ifdef __MVS__ +typedef struct locale_struct { + int category_mask; + std::string lc_collate; + std::string lc_ctype; + std::string lc_monetary; + std::string lc_numeric; + std::string lc_time; + std::string lc_messages; +}* locale_t; + +// z/OS does not have newlocale, freelocale and uselocale. +// The functions below are workarounds in single thread mode. +locale_t newlocale(int category_mask, const char* locale, locale_t base); +void freelocale(locale_t locobj); +locale_t uselocale(locale_t newloc); +#endif + +struct __locale_guard { + _LIBCPP_HIDE_FROM_ABI __locale_guard(locale_t& __loc) : __old_loc_(::uselocale(__loc)) {} + + _LIBCPP_HIDE_FROM_ABI ~__locale_guard() { + if (__old_loc_) + ::uselocale(__old_loc_); + } + + locale_t __old_loc_; -namespace { + __locale_guard(__locale_guard const&) = delete; + __locale_guard& operator=(__locale_guard const&) = delete; +}; -struct __setAndRestore { - explicit __setAndRestore(locale_t locale) { +struct __set_and_restore { + explicit __set_and_restore(locale_t locale) { if (locale == (locale_t)0) { - __cloc = newlocale(LC_ALL_MASK, "C", /* base */ (locale_t)0); - __stored = uselocale(__cloc); + __cloc = ::newlocale(LC_ALL_MASK, "C", /* base */ (locale_t)0); + __stored = ::uselocale(__cloc); } else { - __stored = uselocale(locale); + __stored = ::uselocale(locale); } } - ~__setAndRestore() { - uselocale(__stored); + ~__set_and_restore() { + ::uselocale(__stored); if (__cloc) - freelocale(__cloc); + ::freelocale(__cloc); } private: @@ -49,60 +82,241 @@ struct __setAndRestore { locale_t __cloc = (locale_t)0; }; -} // namespace +// +// Locale management +// +#ifdef __MVS__ +# define _LC_MAX LC_MESSAGES /* highest real category */ +# define _NCAT (_LC_MAX + 1) /* maximum + 1 */ +# define _CATMASK(n) (1 << (n)) + +# define _LIBCPP_COLLATE_MASK _CATMASK(LC_COLLATE) +# define _LIBCPP_CTYPE_MASK _CATMASK(LC_CTYPE) +# define _LIBCPP_MONETARY_MASK _CATMASK(LC_MONETARY) +# define _LIBCPP_NUMERIC_MASK _CATMASK(LC_NUMERIC) +# define _LIBCPP_TIME_MASK _CATMASK(LC_TIME) +# define _LIBCPP_MESSAGES_MASK _CATMASK(LC_MESSAGES) +# define _LIBCPP_ALL_MASK (_CATMASK(_NCAT) - 1) +# define _LIBCPP_LC_ALL LC_ALL +#else +# define _LIBCPP_COLLATE_MASK LC_COLLATE_MASK +# define _LIBCPP_CTYPE_MASK LC_CTYPE_MASK +# define _LIBCPP_MONETARY_MASK LC_MONETARY_MASK +# define _LIBCPP_NUMERIC_MASK LC_NUMERIC_MASK +# define _LIBCPP_TIME_MASK LC_TIME_MASK +# define _LIBCPP_MESSAGES_MASK LC_MESSAGES_MASK +# define _LIBCPP_ALL_MASK LC_ALL_MASK +# define _LIBCPP_LC_ALL LC_ALL -// The following are not POSIX routines. These are quick-and-dirty hacks -// to make things pretend to work -inline _LIBCPP_HIDE_FROM_ABI long long strtoll_l(const char* __nptr, char** __endptr, int __base, locale_t locale) { - __setAndRestore __newloc(locale); - return ::strtoll(__nptr, __endptr, __base); +using __locale_t _LIBCPP_NODEBUG = locale_t; +#endif + +#if defined(_LIBCPP_BUILDING_LIBRARY) +using __lconv_t _LIBCPP_NODEBUG = lconv; + +inline _LIBCPP_HIDE_FROM_ABI __locale_t __newlocale(int __category_mask, const char* __name, __locale_t __loc) { + return ::newlocale(__category_mask, __name, __loc); +} + +inline _LIBCPP_HIDE_FROM_ABI void __freelocale(__locale_t __loc) { ::freelocale(__loc); } + +inline _LIBCPP_HIDE_FROM_ABI char* __setlocale(int __category, char const* __locale) { + return ::setlocale(__category, __locale); } -inline _LIBCPP_HIDE_FROM_ABI double strtod_l(const char* __nptr, char** __endptr, locale_t locale) { - __setAndRestore __newloc(locale); - return ::strtod(__nptr, __endptr); +inline _LIBCPP_HIDE_FROM_ABI __lconv_t* __localeconv(__locale_t& __loc) { + __libcpp_locale_guard __current(__loc); + return std::localeconv(); } +#endif // _LIBCPP_BUILDING_LIBRARY -inline _LIBCPP_HIDE_FROM_ABI float strtof_l(const char* __nptr, char** __endptr, locale_t locale) { - __setAndRestore __newloc(locale); - return ::strtof(__nptr, __endptr); +// +// Strtonum functions +// +inline _LIBCPP_HIDE_FROM_ABI float __strtof(const char* __nptr, char** __endptr, __locale_t __loc) { + __set_and_restore __newloc(__loc); + return std::strtof(__nptr, __endptr); } -inline _LIBCPP_HIDE_FROM_ABI long double strtold_l(const char* __nptr, char** __endptr, locale_t locale) { - __setAndRestore __newloc(locale); - return ::strtold(__nptr, __endptr); +inline _LIBCPP_HIDE_FROM_ABI double __strtod(const char* __nptr, char** __endptr, __locale_t __loc) { + __set_and_restore __newloc(__loc); + return std::strtod(__nptr, __endptr); +} + +inline _LIBCPP_HIDE_FROM_ABI long double __strtold(const char* __nptr, char** __endptr, __locale_t __loc) { + __set_and_restore __newloc(__loc); + return std::strtold(__nptr, __endptr); +} + +inline _LIBCPP_HIDE_FROM_ABI long long __strtoll(const char* __nptr, char** __endptr, int __base, __locale_t __loc) { + __set_and_restore __newloc(__loc); + return std::strtoll(__nptr, __endptr, __base); } inline _LIBCPP_HIDE_FROM_ABI unsigned long long -strtoull_l(const char* __nptr, char** __endptr, int __base, locale_t locale) { - __setAndRestore __newloc(locale); - return ::strtoull(__nptr, __endptr, __base); +__strtoull(const char* __nptr, char** __endptr, int __base, __locale_t __loc) { + __set_and_restore __newloc(__loc); + return std::strtoull(__nptr, __endptr, __base); +} + +// +// Character manipulation functions +// +inline _LIBCPP_HIDE_FROM_ABI int __isdigit(int __ch, __locale_t) { return std::isdigit(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __isxdigit(int __ch, __locale_t) { return stdstd::isxdigit(__ch); } + +#if defined(_LIBCPP_BUILDING_LIBRARY) +inline _LIBCPP_HIDE_FROM_ABI int __strcoll(const char* __s1, const char* __s2, __locale_t) { + return stdstd::strcoll(__s1); +} +inline _LIBCPP_HIDE_FROM_ABI size_t __strxfrm(char* __dest, const char* __src, size_t __n, __locale_t) { + return stdstd::strxfrm(__dest, __src); +} +inline _LIBCPP_HIDE_FROM_ABI int __toupper(int __ch, __locale_t) { return std::toupper(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __tolower(int __ch, __locale_t) { return std::tolower(__ch); } + +# if _LIBCPP_HAS_WIDE_CHARACTERS +inline _LIBCPP_HIDE_FROM_ABI int __wcscoll(const wchar_t* __s1, const wchar_t* __s2, __locale_t) { + return std::wcscoll(__s1, __s2); +} +inline _LIBCPP_HIDE_FROM_ABI size_t __wcsxfrm(wchar_t* __dest, const wchar_t* __src, size_t __n, __locale_t) { + return std::wcsxfrm(__dest, __src, __n); +} +inline _LIBCPP_HIDE_FROM_ABI int __iswctype(wint_t __ch, wctype_t __type, __locale_t) { + return std::iswctype(__ch, __type); +} +inline _LIBCPP_HIDE_FROM_ABI int __iswspace(wint_t __ch, __locale_t) { return std::iswspace(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswprint(wint_t __ch, __locale_t) { return std::iswprint(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswcntrl(wint_t __ch, __locale_t) { return std::iswcntrl(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswupper(wint_t __ch, __locale_t) { return std::iswupper(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswlower(wint_t __ch, __locale_t) { return std::iswlower(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswalpha(wint_t __ch, __locale_t) { return std::iswalpha(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswblank(wint_t __ch, __locale_t) { return std::iswblank(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswdigit(wint_t __ch, __locale_t) { return std::iswdigit(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswpunct(wint_t __ch, __locale_t) { return std::iswpunct(__ch); } +inline _LIBCPP_HIDE_FROM_ABI int __iswxdigit(wint_t __ch, __locale_t) { return std::iswxdigit(__ch); } +inline _LIBCPP_HIDE_FROM_ABI wint_t __towupper(wint_t __ch, __locale_t) { return std::towupper(__ch); } +inline _LIBCPP_HIDE_FROM_ABI wint_t __towlower(wint_t __ch, __locale_t) { return std::towlower(__ch); } +# endif + +inline + _LIBCPP_HIDE_FROM_ABI size_t __strftime(char* __s, size_t __max, const char* __format, const tm* __tm, __locale_t) { + return std::strftime(__s, __max, __format, __tm); +} + +// +// Other functions +// +inline _LIBCPP_HIDE_FROM_ABI decltype(MB_CUR_MAX) __mb_len_max(__locale_t __loc) { + __locale_guard __current(__loc); + return MB_CUR_MAX; +} +# if _LIBCPP_HAS_WIDE_CHARACTERS +inline _LIBCPP_HIDE_FROM_ABI wint_t __btowc(int __ch, __locale_t __loc) { + __locale_guard __current(__loc); + return std::btowc(__c); +} +inline _LIBCPP_HIDE_FROM_ABI int __wctob(wint_t __ch, __locale_t __loc) { + __locale_guard __current(__loc); + return std::wctob(__c); +} +inline _LIBCPP_HIDE_FROM_ABI size_t +__wcsnrtombs(char* __dest, const wchar_t** __src, size_t __nwc, size_t __len, mbstate_t* __ps, __locale_t __loc) { + __locale_guard __current(__loc); + return std::wcsnrtombs(__dest, __src, __nwc, __len, __ps); +} +inline _LIBCPP_HIDE_FROM_ABI size_t __wcrtomb(char* __s, wchar_t __ch, mbstate_t* __ps, __locale_t __loc) { + __locale_guard __current(__loc); + return std::wcrtomb(__s, __wc, __ps); +} +inline _LIBCPP_HIDE_FROM_ABI size_t +__mbsnrtowcs(wchar_t* __dest, const char** __src, size_t __nms, size_t __len, mbstate_t* __ps, __locale_t __loc) { + __locale_guard __current(__loc); + return std::mbsnrtowcs(__dest, __src, __nms, __len, __ps); +} +inline _LIBCPP_HIDE_FROM_ABI size_t +__mbrtowc(wchar_t* __pwc, const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) { + __locale_guard __current(__loc); + return std::mbrtowc(__pwc, __s, __n, __ps); +} +inline _LIBCPP_HIDE_FROM_ABI int __mbtowc(wchar_t* __pwc, const char* __pmb, size_t __max, __locale_t __loc) { + __locale_guard __current(__loc); + return std::mbtowc(__pwc, __pmb, __max); +} +inline _LIBCPP_HIDE_FROM_ABI size_t __mbrlen(const char* __s, size_t __n, mbstate_t* __ps, __locale_t __loc) { + __locale_guard __current(__loc); + return std::mbrlen(__s, __n, __ps); +} +inline _LIBCPP_HIDE_FROM_ABI size_t +__mbsrtowcs(wchar_t* __dest, const char** __src, size_t __len, mbstate_t* __ps, __locale_t __loc) { + __locale_guard __current(__loc); + return std::mbsrtowcs(__dest, __src, __len, __ps); +} +# endif // _LIBCPP_HAS_WIDE_CHARACTERS +#endif // _LIBCPP_BUILDING_LIBRARY + +_LIBCPP_DIAGNOSTIC_PUSH +_LIBCPP_CLANG_DIAGNOSTIC_IGNORED("-Wgcc-compat") +_LIBCPP_GCC_DIAGNOSTIC_IGNORED("-Wformat-nonliteral") // GCC doesn't support [[gnu::format]] on variadic templates +#ifdef _LIBCPP_COMPILER_CLANG_BASED +# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) _LIBCPP_ATTRIBUTE_FORMAT(__VA_ARGS__) +#else +# define _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(...) /* nothing */ +#endif + +template +_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 4, 5) int __snprintf( + char* __s, size_t __n, __locale_t __loc, const char* __format, _Args&&... __args) { + __locale_guard __current(__loc); + return std::snprintf(__s, __n, __format, std::forward<_Args>(__args)...); } inline _LIBCPP_HIDE_FROM_ABI -_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int vasprintf(char** strp, const char* fmt, va_list ap) { - const size_t buff_size = 256; - if ((*strp = (char*)malloc(buff_size)) == nullptr) { +_LIBCPP_ATTRIBUTE_FORMAT(__printf__, 2, 0) int __asprintf_impl(char** __strp, const char* __format, ...) { + va_list __ap; + va_start(__ap, __format); + + const size_t __buff_size = 256; + if ((*__strp = (char*)malloc(__buff_size)) == nullptr) { return -1; } - va_list ap_copy; + va_list __ap_copy; // va_copy may not be provided by the C library in C++03 mode. #if defined(_LIBCPP_CXX03_LANG) && __has_builtin(__builtin_va_copy) - __builtin_va_copy(ap_copy, ap); + __builtin_va_copy(__ap_copy, __ap); #else - va_copy(ap_copy, ap); + va_copy(__ap_copy, __ap); #endif - int str_size = vsnprintf(*strp, buff_size, fmt, ap_copy); - va_end(ap_copy); + int __str_size = std::vsnprintf(*__strp, __buff_size, __format, __ap_copy); + va_end(__ap_copy); - if ((size_t)str_size >= buff_size) { - if ((*strp = (char*)realloc(*strp, str_size + 1)) == nullptr) { + if ((size_t)__str_size >= __buff_size) { + if ((*__strp = (char*)std::realloc(*__strp, __str_size + 1)) == nullptr) { + va_end(__ap); return -1; } - str_size = vsnprintf(*strp, str_size + 1, fmt, ap); + __str_size = std::vsnprintf(*__strp, __str_size + 1, __format, __ap); } - return str_size; + va_end(__ap); + return __str_size; +} + +template +_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__printf__, 3, 4) int __asprintf( + char** __s, __locale_t __loc, const char* __format, _Args&&... __args) { + __locale_guard __current(__loc); + return __locale::__asprintf_impl(__s, __format, std::forward<_Args>(__args)...); +} +template +_LIBCPP_HIDE_FROM_ABI _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT(__scanf__, 3, 4) int __sscanf( + const char* __s, __locale_t __loc, const char* __format, _Args&&... __args) { + __locale_guard __current(__loc); + return std::sscanf(__s, __format, std::forward<_Args>(__args)...); } +_LIBCPP_DIAGNOSTIC_POP +#undef _LIBCPP_VARIADIC_ATTRIBUTE_FORMAT +} // namespace __locale +_LIBCPP_END_NAMESPACE_STD -#endif // _LIBCPP___LOCALE_DIR_LOCALE_BASE_API_IBM_H +#endif // _LIBCPP___LOCALE_DIR_SUPPORT_IBM_H diff --git a/libcxx/include/__support/ibm/locale_mgmt_zos.h b/libcxx/include/__support/ibm/locale_mgmt_zos.h deleted file mode 100644 index 5fc04b6b4b299..0000000000000 --- a/libcxx/include/__support/ibm/locale_mgmt_zos.h +++ /dev/null @@ -1,53 +0,0 @@ -// -*- C++ -*- -//===----------------------------------------------------------------------===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H -#define _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H - -#if defined(__MVS__) -# include -# include - -# ifdef __cplusplus -extern "C" { -# endif - -# define _LC_MAX LC_MESSAGES /* highest real category */ -# define _NCAT (_LC_MAX + 1) /* maximum + 1 */ - -# define _CATMASK(n) (1 << (n)) -# define LC_COLLATE_MASK _CATMASK(LC_COLLATE) -# define LC_CTYPE_MASK _CATMASK(LC_CTYPE) -# define LC_MONETARY_MASK _CATMASK(LC_MONETARY) -# define LC_NUMERIC_MASK _CATMASK(LC_NUMERIC) -# define LC_TIME_MASK _CATMASK(LC_TIME) -# define LC_MESSAGES_MASK _CATMASK(LC_MESSAGES) -# define LC_ALL_MASK (_CATMASK(_NCAT) - 1) - -typedef struct locale_struct { - int category_mask; - std::string lc_collate; - std::string lc_ctype; - std::string lc_monetary; - std::string lc_numeric; - std::string lc_time; - std::string lc_messages; -}* locale_t; - -// z/OS does not have newlocale, freelocale and uselocale. -// The functions below are workarounds in single thread mode. -locale_t newlocale(int category_mask, const char* locale, locale_t base); -void freelocale(locale_t locobj); -locale_t uselocale(locale_t newloc); - -# ifdef __cplusplus -} -# endif -#endif // defined(__MVS__) -#endif // _LIBCPP___SUPPORT_IBM_LOCALE_MGMT_ZOS_H From ed0b87dcfec81d641de8d57f73a886c5794b74e7 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 24 Oct 2025 14:29:31 -0400 Subject: [PATCH 2/3] Actually rename the file --- libcxx/include/__locale_dir/{locale_base_api => support}/ibm.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename libcxx/include/__locale_dir/{locale_base_api => support}/ibm.h (100%) diff --git a/libcxx/include/__locale_dir/locale_base_api/ibm.h b/libcxx/include/__locale_dir/support/ibm.h similarity index 100% rename from libcxx/include/__locale_dir/locale_base_api/ibm.h rename to libcxx/include/__locale_dir/support/ibm.h From e9e52cb1c20d93dbd8380d7520153fae79c5a5c2 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 24 Oct 2025 14:31:10 -0400 Subject: [PATCH 3/3] Fix modulemap --- libcxx/include/module.modulemap.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcxx/include/module.modulemap.in b/libcxx/include/module.modulemap.in index a86d6c6a43d0e..0430db807dd67 100644 --- a/libcxx/include/module.modulemap.in +++ b/libcxx/include/module.modulemap.in @@ -1586,6 +1586,7 @@ module std [system] { textual header "__locale_dir/support/bsd_like.h" textual header "__locale_dir/support/freebsd.h" textual header "__locale_dir/support/fuchsia.h" + textual header "__locale_dir/support/ibm.h" textual header "__locale_dir/support/linux.h" textual header "__locale_dir/support/no_locale/characters.h" textual header "__locale_dir/support/no_locale/strtonum.h" @@ -1594,7 +1595,6 @@ module std [system] { module locale_base_api { textual header "__locale_dir/locale_base_api/bsd_locale_fallbacks.h" - textual header "__locale_dir/locale_base_api/ibm.h" textual header "__locale_dir/locale_base_api/musl.h" textual header "__locale_dir/locale_base_api/openbsd.h" }