-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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
Remove ctype compat macros. NFC #20960
Conversation
libcxx has direct support for `_NEWLIB_VERSION` in `__locale` so just use that. This libcxx support was added in http://reviews.llvm.org/D7888 and landed in emscripten in emscripten-core#13154.
Finally catching up with a change @jfbastien made 8 years ago! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where do we define _NEWLIB_VERSION
?
Sorry, brain fart, this has nothing to do with newlib. The change is still valid but for a different reason. Its because we define _LIBCPP_HAS_MUSL_LIBC which in turn defines _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE. I will update the PR description. |
Was this a downstream localmod or do we need to also upstream the __locale change? |
The original change was local change that made its way upstream already, so is not longer a local mod. This change will become a new local change that, like all local changes, should be upstreamed at some point. My philosophy for this is to periodically looks at the deltas from upstream and push any new changes at that point. |
This upstreams more recent, mostly EH changes from libcxx and libcxxabi: - `__cxa_init_primary_exception`-related changes made when updating to LLVM 18.1.2 (emscripten-core/emscripten#21638) - Removes ctype macros (emscripten-core/emscripten#20960) - Guard destructor changes with `__wasm__` (emscripten-core/emscripten#21974)
This upstreams more recent, mostly EH changes from libcxx and libcxxabi: - `__cxa_init_primary_exception`-related changes made when updating to LLVM 18.1.2 (emscripten-core/emscripten#21638) - Removes ctype macros (emscripten-core/emscripten#20960) - Guard destructor changes with `__wasm__` (emscripten-core/emscripten#21974)
The code here was unused because of the fact that we already define
_LIBCPP_HAS_MUSL_LIBC
inlibcxx/include/__config_site
which means that_LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE
isdefined by
libcxx/include/__config
which in turn mean that the first branch of this if/elsetree is the that is being used.
This change should really have been part of #17022 which was when we started defining
_LIBCPP_HAS_MUSL_LIBC
.