Skip to content

[libcxx] Define _LIBCPP_HAS_C8RTOMB_MBRTOC8 for picolibc #152724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

[libcxx] Define _LIBCPP_HAS_C8RTOMB_MBRTOC8 for picolibc #152724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cd932a1
[libcxx] Define _LIBCPP_HAS_C8RTOMB_MBRTOC8 for picolibc
vhscampos Aug 7, 2025
b606497
Fix clang-format issue
vhscampos Aug 8, 2025
8d87631
Refactor the preprocessor logic
vhscampos Aug 11, 2025
91ea91e
Handle Apple and MSVC explictly
vhscampos Aug 12, 2025
def1139
Handle AIX
vhscampos Aug 12, 2025
5d7491a
Handle FreeBSD and Microsoft C Runtime library
vhscampos Aug 13, 2025
27129d4
Detect the UCRT library
vhscampos Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions libcxx/include/__config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,14 +1021,27 @@ typedef __char32_t char32_t;
// the latter depends on internal GNU libc details that are not appropriate
// to depend on here, so any declarations present when __cpp_char8_t is not
// defined are ignored.
//
// picolibc 1.8.9 and newer declare the two functions unconditionally.
//
// Apple C library, Microsoft C Runtime, AIX C library and FreeBSD libc do not
// yet support these functions.
# if defined(_LIBCPP_GLIBC_PREREQ)
# if _LIBCPP_GLIBC_PREREQ(2, 36) && defined(__cpp_char8_t)
# if defined(__cpp_char8_t) && _LIBCPP_GLIBC_PREREQ(2, 36)
# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
# else
# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
# endif
# else
# elif defined(_LIBCPP_PICOLIBC_PREREQ)
# if _LIBCPP_PICOLIBC_PREREQ(1, 8, 9)
# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
# else
# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
# endif
# elif defined(__APPLE__) || defined(_MSC_VER) || defined(_LIBCPP_UCRT) || defined(_AIX) || defined(__FreeBSD__)
# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 0
# else
# define _LIBCPP_HAS_C8RTOMB_MBRTOC8 1
# endif

// There are a handful of public standard library types that are intended to
Expand Down
11 changes: 11 additions & 0 deletions libcxx/include/__configuration/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@
// user code. Move code paths that need _NEWLIB_VERSION to another customization mechanism.
#if __has_include(<picolibc.h>)
# include <picolibc.h>
# define _LIBCPP_PICOLIBC_VERSION_INT(maj, min, patch) (maj * 10000 + min * 100 + patch)
# define _LIBCPP_PICOLIBC_PREREQ(maj, min, patch) \
_LIBCPP_PICOLIBC_VERSION_INT(__PICOLIBC__, __PICOLIBC_MINOR__, __PICOLIBC_PATCHLEVEL__) >= \
_LIBCPP_PICOLIBC_VERSION_INT(maj, min, patch)
#endif

#if __has_include(<corecrt.h>)
# include <corecrt.h>
# if defined(_UCRT)
# define _LIBCPP_UCRT
# endif
#endif

#ifndef __BYTE_ORDER__
Expand Down
Loading