From f6e00226a4ca63e76e3e0b3a09a4ce6223980981 Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Mon, 25 Nov 2024 14:03:27 -0800 Subject: [PATCH] build: Move sstream include above safe-ctype.h {PR117771] sstream in some versions of libstdc++ include locale which might not have been included yet. safe-ctype.h defines the toupper, tolower, etc. as macros so the c++ header files needed to be included before hand as comment in system.h says: /* Include C++ standard headers before "safe-ctype.h" to avoid GCC poisoning the ctype macros through safe-ctype.h */ I don't understand how it was working before when memory was included after safe-ctype.h rather than before. But this makes sstream consistent with the other C++ headers. Pushed as obvious after a build for riscv64-elf. gcc/ChangeLog: PR target/117771 * system.h: Move the include of sstream above safe-ctype.h. Signed-off-by: Andrew Pinski --- gcc/system.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gcc/system.h b/gcc/system.h index c209871df72d..57ce22ab893c 100644 --- a/gcc/system.h +++ b/gcc/system.h @@ -222,6 +222,9 @@ extern int fprintf_unlocked (FILE *, const char *, ...); #ifdef INCLUDE_FUNCTIONAL # include #endif +#ifdef INCLUDE_SSTREAM +# include +#endif # include # include # include @@ -764,10 +767,6 @@ private: # include #endif -#ifdef INCLUDE_SSTREAM -# include -#endif - #ifdef INCLUDE_MALLOC_H #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) #include