Fix compat between libc++ and emscripten's xlocale.h #23414
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kripken
approved these changes
Jan 15, 2025
| @@ -25,8 +27,6 @@ | |||
| # include <__locale_dir/locale_base_api/fuchsia.h> | |||
| #elif defined(__wasi__) || defined(_LIBCPP_HAS_MUSL_LIBC) | |||
| # include <__locale_dir/locale_base_api/musl.h> | |||
| #elif defined(__APPLE__) || defined(__FreeBSD__) | |||
| # include <xlocale.h> | |||
There was a problem hiding this comment.
Would adding emscripten here be less of a diff, so less churn in the next libc++ update? Or must the change be on top?
There was a problem hiding this comment.
That's not possible because we would already have hit the _LIBCPP_HAS_MUSL_LIBC case above. Our case needs to come first.
libc++ was assuming that musl doesn't have `xlocale.h` which is true, but emscripten adds xlocale.h for compatibility (I'm not sure we really need to, but we do). Fixes: emscripten-core#23413
aheejin
approved these changes
Jan 15, 2025
aheejin
added a commit
to aheejin/emscripten
that referenced
this pull request
May 16, 2025
Before, the code was like https://github.com/emscripten-core/emscripten/blob/dc1abd514b1bade135a01a4453a9ff6def0793b6/system/lib/libcxx/include/__locale_dir/locale_base_api.h#L12-L30 But now they are divided into two parts, one using the new API and the other using old. See "Locale API reimplementation" above. https://github.com/llvm/llvm-project/blob/ec28b8f9cc7f2ac187d8a617a6d08d5e56f9120e/libcxx/include/__locale_dir/locale_base_api.h#L116-L138 This adds Emscripten in the beginning of the "old" API list. (This has to be the beginning; see emscripten-core#23414)
aheejin
added a commit
to aheejin/emscripten
that referenced
this pull request
May 16, 2025
Before, the code was like https://github.com/emscripten-core/emscripten/blob/dc1abd514b1bade135a01a4453a9ff6def0793b6/system/lib/libcxx/include/__locale_dir/locale_base_api.h#L12-L30 But now they are divided into two parts, one using the new API and the other using old. See "Locale API reimplementation" above. https://github.com/llvm/llvm-project/blob/ec28b8f9cc7f2ac187d8a617a6d08d5e56f9120e/libcxx/include/__locale_dir/locale_base_api.h#L116-L138 This adds Emscripten in the beginning of the "old" API list. (This has to be the beginning; see emscripten-core#23414)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
libc++ was assuming that musl doesn't have
xlocale.hwhich is true, but emscripten adds xlocale.h for compatibility (I'm not sure we really need to, but we do).Fixes: #23413