[libc++] Check for _newlib_version.h instead of picolibc.h #152766
Conversation
llvmbot
added
the
libc++
|
@llvm/pr-subscribers-libcxx Author: None (inglorion) ChangesFixes #152763. #131921 added some code to pull in a definition of _NEWLIB_VERSION if it exists. It does this by checking __has_include(<picolibc.h>) and including it if so. However, this does not work for systems that have newlib rather than picolibc. This change instead checks for and includes _newlib_version.h, which should work for both newlib and picolibc. Full diff: https://github.com/llvm/llvm-project/pull/152766.diff 1 Files Affected:
diff --git a/libcxx/include/__configuration/platform.h b/libcxx/include/__configuration/platform.h
index f3c199dee172b..c14089b5fc074 100644
--- a/libcxx/include/__configuration/platform.h
+++ b/libcxx/include/__configuration/platform.h
@@ -45,8 +45,8 @@
// This is required in order for _NEWLIB_VERSION to be defined in places where we use it.
// TODO: We shouldn't be including arbitrarily-named headers from libc++ since this can break valid
// user code. Move code paths that need _NEWLIB_VERSION to another customization mechanism.
-#if __has_include(<picolibc.h>)
-# include <picolibc.h>
+#if __has_include(<_newlib_version.h>)
+# include <_newlib_version.h>
#endif
#ifndef __BYTE_ORDER__
|
Fixes llvm#152763. llvm#131921 added some code to pull in a definition of _NEWLIB_VERSION if it exists. It does this by checking __has_include(<picolibc.h>) and including it if so. However, this does not work for systems that have newlib rather than picolibc. With this change, we check for either picolibc.h or _newlib_version.h, which works for both newlib and picolibc.
There was a problem hiding this comment.
We're trying to not include arbitrary headers anymore, since that caused problems before. See #147956, which should also fix your issue.
|
I really don't know when it'll land. IIRC the initial reason we're doing it this way was that there were problems with just including some header though, so I'm not sure an intermittent solution will work. |
Fixes #152763.
#131921 added some code to pull in a definition of _NEWLIB_VERSION if it exists. It does this by checking __has_include(<picolibc.h>) and including it if so. However, this does not work for systems that have newlib rather than picolibc. This change instead checks for and includes _newlib_version.h, which should work for both newlib and picolibc.