From 3b3afdadd7d32396a833c10a4e987e7648c2108e Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Wed, 2 Aug 2023 17:04:32 +0200 Subject: [PATCH] libcxx: Add musl support for __locale ... which does not provide a known rune table and uses missing locale-based string to integer conversion functions. --- libcxx/include/__locale | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/libcxx/include/__locale b/libcxx/include/__locale index e0ffa0ca0..17b628696 100644 --- a/libcxx/include/__locale +++ b/libcxx/include/__locale @@ -22,6 +22,38 @@ #include #include +// Detect musl libc (inspired by musl detection from gcc's config.guess) +#include +#if !(defined(__UCLIBC__) || defined(__dietlibc__) || defined(__GLIBC__)) +# include +# ifdef __DEFINED_va_list +# ifndef __MUSL_LIBC__ +# define __MUSL_LIBC__ +# endif +# endif +#endif + +#ifdef __MUSL_LIBC__ +// Fall back to default rune table for musl libc +# ifndef _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE +# define _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE +# endif +// Implement missing strto*_l functions for musl libc +# define __MUSL_LIBC_CREATE_STRTOX_L(X) \ + static inline auto \ + strto ## X ## _l(const char* str, char** end, int base, locale_t l) { \ + locale_t old = uselocale(l); \ + auto result = strto ## X(str, end, base); \ + uselocale(old); \ + return result; \ + } +__MUSL_LIBC_CREATE_STRTOX_L(l) +__MUSL_LIBC_CREATE_STRTOX_L(ll) +__MUSL_LIBC_CREATE_STRTOX_L(ul) +__MUSL_LIBC_CREATE_STRTOX_L(ull) +# undef __MUSL_LIBC_CREATE_STRTOX_L +#endif + #if defined(_LIBCPP_MSVCRT_LIKE) # include <__support/win32/locale_win32.h> #elif defined(_AIX) || defined(__MVS__) -- 2.30.2