From: Jonathan Wakely <jwakely@redhat.com>
To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org
Subject: [committed] libstdc++: Make <cstdint> work freestanding [PR107134]
Date: Tue, 4 Oct 2022 15:11:36 +0100 [thread overview]
Message-ID: <20221004141138.530214-2-jwakely@redhat.com> (raw)
Tested powerpc64le-linux, and x86_64-linux with -ffreestanding.
Pushed to trunk.
-- >8 --
When gcc/config.gcc defines use_gcc_stdin=wrap, GCC's <stdint.h> tries
to use libc's <stdint.h> unless -ffreestanding is used.
When libstdc++ is configured --disable-hosted-libstdcxx we want
<cstdint> to work even without -ffreestanding being given. This is a
kluge to make it include GCC's <stdint-gcc.h> directly even without
-ffreestanding.
libstdc++-v3/ChangeLog:
PR libstdc++/107134
* include/c_global/cstdint [!_GLIBCXX_HOSTED]: Include
<stdint-gcc.h> directly.
---
libstdc++-v3/include/c_global/cstdint | 59 ++++++++++++++++++++++++++-
1 file changed, 57 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/include/c_global/cstdint b/libstdc++-v3/include/c_global/cstdint
index 4490d06f099..4b9df45a9ee 100644
--- a/libstdc++-v3/include/c_global/cstdint
+++ b/libstdc++-v3/include/c_global/cstdint
@@ -37,7 +37,11 @@
#include <bits/c++config.h>
-#if _GLIBCXX_HAVE_STDINT_H
+#if ! _GLIBCXX_HOSTED && __has_include(<stdint-gcc.h>)
+// For --disable-hosted-libstdcxx we want GCC's own stdint-gcc.h header
+// even when -ffreestanding isn't used.
+# include <stdint-gcc.h>
+#elif __has_include(<stdint.h>)
# include <stdint.h>
#endif
@@ -80,9 +84,60 @@ namespace std
using ::uintmax_t;
using ::uintptr_t;
#else // !_GLIBCXX_USE_C99_STDINT_TR1
- // Define the minimum needed for <ratio>, <chrono> etc.
+
using intmax_t = __INTMAX_TYPE__;
using uintmax_t = __UINTMAX_TYPE__;
+
+#ifdef __INT8_TYPE__
+ using int8_t = __INT8_TYPE__;
+#endif
+#ifdef __INT16_TYPE__
+ using int16_t = __INT16_TYPE__;
+#endif
+#ifdef __INT32_TYPE__
+ using int32_t = __INT32_TYPE__;
+#endif
+#ifdef __INT64_TYPE__
+ using int64_t = __INT64_TYPE__;
+#endif
+
+ using int_least8_t = __INT_LEAST8_TYPE__;
+ using int_least16_t = __INT_LEAST16_TYPE__;
+ using int_least32_t = __INT_LEAST32_TYPE__;
+ using int_least64_t = __INT_LEAST64_TYPE__;
+ using int_fast8_t = __INT_FAST8_TYPE__;
+ using int_fast16_t = __INT_FAST16_TYPE__;
+ using int_fast32_t = __INT_FAST32_TYPE__;
+ using int_fast64_t = __INT_FAST64_TYPE__;
+
+#ifdef __INTPTR_TYPE__
+ using intptr_t = __INTPTR_TYPE__;
+#endif
+
+#ifdef __UINT8_TYPE__
+ using uint8_t = __UINT8_TYPE__;
+#endif
+#ifdef __UINT16_TYPE__
+ using uint16_t = __UINT16_TYPE__;
+#endif
+#ifdef __UINT32_TYPE__
+ using uint32_t = __UINT32_TYPE__;
+#endif
+#ifdef __UINT64_TYPE__
+ using uint64_t = __UINT64_TYPE__;
+#endif
+ using uint_least8_t = __UINT_LEAST8_TYPE__;
+ using uint_least16_t = __UINT_LEAST16_TYPE__;
+ using uint_least32_t = __UINT_LEAST32_TYPE__;
+ using uint_least64_t = __UINT_LEAST64_TYPE__;
+ using uint_fast8_t = __UINT_FAST8_TYPE__;
+ using uint_fast16_t = __UINT_FAST16_TYPE__;
+ using uint_fast32_t = __UINT_FAST32_TYPE__;
+ using uint_fast64_t = __UINT_FAST64_TYPE__;
+#ifdef __UINTPTR_TYPE__
+ using uintptr_t = __UINTPTR_TYPE__;
+#endif
+
#endif // _GLIBCXX_USE_C99_STDINT_TR1
} // namespace std
--
2.37.3
reply other threads:[~2022-10-04 14:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221004141138.530214-2-jwakely@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).