git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <quic_apinski@quicinc.com>
This commit is contained in:
Andrew Pinski 2024-11-25 14:03:27 -08:00
parent c61576d89e
commit f6e00226a4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/system.h
View File

@ -222,6 +222,9 @@ extern int fprintf_unlocked (FILE *, const char *, ...);
#ifdef INCLUDE_FUNCTIONAL
# include <functional>
#endif
#ifdef INCLUDE_SSTREAM
# include <sstream>
#endif
# include <memory>
# include <cstring>
# include <initializer_list>
@ -764,10 +767,6 @@ private:
# include <mutex>
#endif
#ifdef INCLUDE_SSTREAM
# include <sstream>
#endif
#ifdef INCLUDE_MALLOC_H
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
#include <malloc.h>