Attachment #883744 for bug #912035




#undef fread_unlocked
#undef fwrite_unlocked

/* Include C++ standard headers before "safe-ctype.h" to avoid GCC
   poisoning the ctype macros through safe-ctype.h */

#ifdef __cplusplus
#ifdef INCLUDE_STRING
# include <string>
#endif
#endif

/* There are an extraordinary number of issues with <ctype.h>.
   The last straw is that it varies with the locale.  Use libiberty's
   replacement instead.  */
#include "safe-ctype.h"

#include <sys/types.h>

#include <errno.h>

#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
extern int errno;
#endif

#ifdef __cplusplus
#if defined (INCLUDE_ALGORITHM) || !defined (HAVE_SWAP_IN_UTILITY)

#ifdef INCLUDE_SET
# include <set>
#endif
#ifdef INCLUDE_STRING
# include <string>
#endif
#ifdef INCLUDE_VECTOR
# include <vector>
#endif

# include <type_traits>
#endif

/* There are an extraordinary number of issues with <ctype.h>.
   The last straw is that it varies with the locale.  Use libiberty's
   replacement instead.  */
#include "safe-ctype.h"

#include <sys/types.h>

#include <errno.h>

#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
extern int errno;
#endif

/* Some of glibc's string inlines cause warnings.  Plus we'd rather
   rely on (and therefore test) GCC's string builtins.  */
#define __NO_STRING_INLINES
--- a/gcc/jit/dummy-frontend.cc
++ b/gcc/jit/dummy-frontend.cc

<http://www.gnu.org/licenses/>.  */

#include "config.h"
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
#include "jit-playback.h"
++ b/gcc/jit/jit-builtins.cc

<http://www.gnu.org/licenses/>.  */

#include "config.h"
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
#include "target.h"
++ b/gcc/jit/jit-playback.cc


#include "config.h"
#define INCLUDE_MUTEX
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "libgccjit.h"
#include "system.h"
#include "coretypes.h"
++ b/gcc/jit/jit-playback.h

#ifndef JIT_PLAYBACK_H
#define JIT_PLAYBACK_H

#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"

#include "timevar.h"
#include "varasm.h"

++ b/gcc/jit/jit-recording.cc

<http://www.gnu.org/licenses/>.  */

#include "config.h"
#define INCLUDE_SSTREAM
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
#include "tm.h"

#include "jit-builtins.h"
#include "jit-recording.h"
#include "jit-playback.h"
#include <sstream>

namespace gcc {
namespace jit {
++ b/gcc/jit/jit-recording.h

#ifndef JIT_RECORDING_H
#define JIT_RECORDING_H

#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "jit-common.h"
#include "jit-logging.h"
#include "libgccjit.h"
#include "system.h"
#include <string>
#include <vector>

class timer;

++ b/gcc/jit/libgccjit.cc


#include "config.h"
#define INCLUDE_MUTEX
#define INCLUDE_STRING
#define INCLUDE_VECTOR
#include "system.h"
#include "coretypes.h"
#include "timevar.h"
++ b/libcc1/libcc1plugin.cc

#undef PACKAGE_VERSION

#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "gcc-plugin.h"
#include "system.h"
#include "coretypes.h"

#include "gcc-c-interface.h"
#include "context.hh"

#include <vector>

using namespace cc1_plugin;


++ b/libcc1/libcp1plugin.cc

#undef PACKAGE_VERSION

#define INCLUDE_MEMORY
#define INCLUDE_VECTOR
#include "gcc-plugin.h"
#include "system.h"
#include "coretypes.h"

#include "rpc.hh"
#include "context.hh"

#include <vector>

using namespace cc1_plugin;

Return to bug 912035

Lines 194-220 extern int fprintf_unlocked (FILE , const char , ...); Link Here

(-)a/gcc/system.h (-41 / +46 lines)
194	#undef fread_unlocked	194	#undef fread_unlocked
195	#undef fwrite_unlocked	195	#undef fwrite_unlocked
196		196
197	/* Include <string> before "safe-ctype.h" to avoid GCC poisoning	197	/* Include C++ standard headers before "safe-ctype.h" to avoid GCC
198	the ctype macros through safe-ctype.h */	198	poisoning the ctype macros through safe-ctype.h */
199
200	#ifdef __cplusplus
201	#ifdef INCLUDE_STRING
202	# include <string>
203	#endif
204	#endif
205
206	/* There are an extraordinary number of issues with <ctype.h>.
207	The last straw is that it varies with the locale. Use libiberty's
208	replacement instead. */
209	#include "safe-ctype.h"
210
211	#include <sys/types.h>
212
213	#include <errno.h>
214
215	#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
216	extern int errno;
217	#endif
218		199
219	#ifdef __cplusplus	200	#ifdef __cplusplus
220	#if defined (INCLUDE_ALGORITHM) \|\| !defined (HAVE_SWAP_IN_UTILITY)	201	#if defined (INCLUDE_ALGORITHM) \|\| !defined (HAVE_SWAP_IN_UTILITY)
Lines 229-234 extern int errno; Link Here
229	#ifdef INCLUDE_SET	210	#ifdef INCLUDE_SET
230	# include <set>	211	# include <set>
231	#endif	212	#endif
		213	#ifdef INCLUDE_STRING
		214	# include <string>
		215	#endif
232	#ifdef INCLUDE_VECTOR	216	#ifdef INCLUDE_VECTOR
233	# include <vector>	217	# include <vector>
234	#endif	218	#endif
Lines 245-250 extern int errno; Link Here
245	# include <type_traits>	229	# include <type_traits>
246	#endif	230	#endif
247		231
		232	/* There are an extraordinary number of issues with <ctype.h>.
		233	The last straw is that it varies with the locale. Use libiberty's
		234	replacement instead. */
		235	#include "safe-ctype.h"
		236
		237	#include <sys/types.h>
		238
		239	#include <errno.h>
		240
		241	#if !defined (errno) && defined (HAVE_DECL_ERRNO) && !HAVE_DECL_ERRNO
		242	extern int errno;
		243	#endif
		244
248	/* Some of glibc's string inlines cause warnings. Plus we'd rather	245	/* Some of glibc's string inlines cause warnings. Plus we'd rather
249	rely on (and therefore test) GCC's string builtins. */	246	rely on (and therefore test) GCC's string builtins. */
250	#define __NO_STRING_INLINES	247	#define __NO_STRING_INLINES
251	--- a/gcc/jit/dummy-frontend.cc	248	--- a/gcc/jit/dummy-frontend.cc
		249	++ b/gcc/jit/dummy-frontend.cc
Lines 18-23 along with GCC; see the file COPYING3. Link Here
18	<http://www.gnu.org/licenses/>. */	18	<http://www.gnu.org/licenses/>. */
19		19
20	#include "config.h"	20	#include "config.h"
		21	#define INCLUDE_STRING
		22	#define INCLUDE_VECTOR
21	#include "system.h"	23	#include "system.h"
22	#include "coretypes.h"	24	#include "coretypes.h"
23	#include "jit-playback.h"	25	#include "jit-playback.h"
24	-- a/gcc/jit/jit-builtins.cc	26	++ b/gcc/jit/jit-builtins.cc
Lines 18-23 along with GCC; see the file COPYING3. Link Here
18	<http://www.gnu.org/licenses/>. */	18	<http://www.gnu.org/licenses/>. */
19		19
20	#include "config.h"	20	#include "config.h"
		21	#define INCLUDE_STRING
		22	#define INCLUDE_VECTOR
21	#include "system.h"	23	#include "system.h"
22	#include "coretypes.h"	24	#include "coretypes.h"
23	#include "target.h"	25	#include "target.h"
24	-- a/gcc/jit/jit-playback.cc	26	++ b/gcc/jit/jit-playback.cc
Lines 20-25 along with GCC; see the file COPYING3. Link Here
20		20
21	#include "config.h"	21	#include "config.h"
22	#define INCLUDE_MUTEX	22	#define INCLUDE_MUTEX
		23	#define INCLUDE_STRING
		24	#define INCLUDE_VECTOR
23	#include "libgccjit.h"	25	#include "libgccjit.h"
24	#include "system.h"	26	#include "system.h"
25	#include "coretypes.h"	27	#include "coretypes.h"
26	-- a/gcc/jit/jit-playback.h	28	++ b/gcc/jit/jit-playback.h
Lines 21-30 along with GCC; see the file COPYING3. Link Here
21	#ifndef JIT_PLAYBACK_H	21	#ifndef JIT_PLAYBACK_H
22	#define JIT_PLAYBACK_H	22	#define JIT_PLAYBACK_H
23		23
24	#include <string>	24	#define INCLUDE_STRING
25	#include <utility> // for std::pair	25	#define INCLUDE_VECTOR
26	#include <vector>	26	#include "system.h"
27
28	#include "timevar.h"	27	#include "timevar.h"
29	#include "varasm.h"	28	#include "varasm.h"
30		29
31	-- a/gcc/jit/jit-recording.cc	30	++ b/gcc/jit/jit-recording.cc
Lines 19-24 along with GCC; see the file COPYING3. Link Here
19	<http://www.gnu.org/licenses/>. */	19	<http://www.gnu.org/licenses/>. */
20		20
21	#include "config.h"	21	#include "config.h"
		22	#define INCLUDE_SSTREAM
		23	#define INCLUDE_STRING
		24	#define INCLUDE_VECTOR
22	#include "system.h"	25	#include "system.h"
23	#include "coretypes.h"	26	#include "coretypes.h"
24	#include "tm.h"	27	#include "tm.h"
Lines 29-35 along with GCC; see the file COPYING3. Link Here
29	#include "jit-builtins.h"	32	#include "jit-builtins.h"
30	#include "jit-recording.h"	33	#include "jit-recording.h"
31	#include "jit-playback.h"	34	#include "jit-playback.h"
32	#include <sstream>
33		35
34	namespace gcc {	36	namespace gcc {
35	namespace jit {	37	namespace jit {
36	-- a/gcc/jit/jit-recording.h	38	++ b/gcc/jit/jit-recording.h
Lines 21-32 along with GCC; see the file COPYING3. Link Here
21	#ifndef JIT_RECORDING_H	21	#ifndef JIT_RECORDING_H
22	#define JIT_RECORDING_H	22	#define JIT_RECORDING_H
23		23
		24	#define INCLUDE_STRING
		25	#define INCLUDE_VECTOR
24	#include "jit-common.h"	26	#include "jit-common.h"
25	#include "jit-logging.h"	27	#include "jit-logging.h"
26	#include "libgccjit.h"	28	#include "libgccjit.h"
27		29	#include "system.h"
28	#include <string>
29	#include <vector>
30		30
31	class timer;	31	class timer;
32		32
33	-- a/gcc/jit/libgccjit.cc	33	++ b/gcc/jit/libgccjit.cc
Lines 20-25 along with GCC; see the file COPYING3. Link Here
20		20
21	#include "config.h"	21	#include "config.h"
22	#define INCLUDE_MUTEX	22	#define INCLUDE_MUTEX
		23	#define INCLUDE_STRING
		24	#define INCLUDE_VECTOR
23	#include "system.h"	25	#include "system.h"
24	#include "coretypes.h"	26	#include "coretypes.h"
25	#include "timevar.h"	27	#include "timevar.h"
26	-- a/libcc1/libcc1plugin.cc	28	++ b/libcc1/libcc1plugin.cc
Lines 32-37 Link Here
32	#undef PACKAGE_VERSION	32	#undef PACKAGE_VERSION
33		33
34	#define INCLUDE_MEMORY	34	#define INCLUDE_MEMORY
		35	#define INCLUDE_VECTOR
35	#include "gcc-plugin.h"	36	#include "gcc-plugin.h"
36	#include "system.h"	37	#include "system.h"
37	#include "coretypes.h"	38	#include "coretypes.h"
Lines 69-76 Link Here
69	#include "gcc-c-interface.h"	70	#include "gcc-c-interface.h"
70	#include "context.hh"	71	#include "context.hh"
71		72
72	#include <vector>
73
74	using namespace cc1_plugin;	73	using namespace cc1_plugin;
75		74
76		75
77	-- a/libcc1/libcp1plugin.cc	76	++ b/libcc1/libcp1plugin.cc
Lines 33-38 Link Here
33	#undef PACKAGE_VERSION	33	#undef PACKAGE_VERSION
34		34
35	#define INCLUDE_MEMORY	35	#define INCLUDE_MEMORY
		36	#define INCLUDE_VECTOR
36	#include "gcc-plugin.h"	37	#include "gcc-plugin.h"
37	#include "system.h"	38	#include "system.h"
38	#include "coretypes.h"	39	#include "coretypes.h"
Lines 71-78 Link Here
71	#include "rpc.hh"	72	#include "rpc.hh"
72	#include "context.hh"	73	#include "context.hh"
73		74
74	#include <vector>
75
76	using namespace cc1_plugin;	75	using namespace cc1_plugin;