Skip to content

Define _LIBCPP_HAS_MUSL_LIBC in libcxx build #17022

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.

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

Merged
merged 1 commit into from
May 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 0 additions & 19 deletions system/include/compat/xlocale.h

This file was deleted.

22 changes: 0 additions & 22 deletions system/lib/libc/compat/strtol_l.c

This file was deleted.

1 change: 1 addition & 0 deletions system/lib/libcxx/include/__config_site
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
// data and other nice fixes.
#define _LIBCPP_ABI_VERSION 2
#define _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS
#define _LIBCPP_HAS_MUSL_LIBC
3 changes: 1 addition & 2 deletions system/lib/libcxx/include/__locale
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@
# include <__support/newlib/xlocale.h>
#elif defined(__OpenBSD__)
# include <__support/openbsd/xlocale.h>
#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
#elif (defined(__APPLE__) || defined(__FreeBSD__) || defined(__IBMCPP__))
# include <xlocale.h>
#elif defined(__Fuchsia__)
# include <__support/fuchsia/xlocale.h>
Expand Down
4 changes: 2 additions & 2 deletions system/lib/libcxx/src/include/config_elast.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
// No _LIBCPP_ELAST needed on Fuchsia
#elif defined(__wasi__)
// No _LIBCPP_ELAST needed on WASI
#elif defined(__EMSCRIPTEN__)
// No _LIBCPP_ELAST needed on Emscripten
#elif defined(__linux__) || defined(_LIBCPP_HAS_MUSL_LIBC)
#define _LIBCPP_ELAST 4095
#elif defined(__APPLE__)
// No _LIBCPP_ELAST needed on Apple
#elif defined(__EMSCRIPTEN__)
// No _LIBCPP_ELAST needed on Emscripten
#elif defined(__sun__)
#define _LIBCPP_ELAST ESTALE
#elif defined(__MVS__)
Expand Down