Solaris 8/SPARC libgcj bootstrap broken by recent fix-header change

[Neil Booth]

Kaveh R. Ghazi wrote:-

> Thanks Rainer, I didn't realize you reported the same thing I did. :-)
> The patch date you found correlates precisely with the last reported
> testsuite results I was able to obtain.
> http://gcc.gnu.org/ml/gcc-bugs/2003-03/msg01794.html

Guys, could you confirm the patch below cures it?  If so I'll apply it.

Neil.

	* fix-header.c (read_scan_file): Defer switch processing.

Index: fix-header.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fix-header.c,v
retrieving revision 1.92
diff -u -p -r1.92 fix-header.c
--- fix-header.c	20 Mar 2003 16:46:18 -0000	1.92
+++ fix-header.c	3 Apr 2003 20:24:41 -0000
@@ -635,6 +635,11 @@ read_scan_file (in_fname, argc, argv)
   if (! cpp_read_main_file (scan_in, in_fname))
     exit (FATAL_EXIT_CODE);
 
+  cpp_change_file (scan_in, LC_RENAME, "<built-in>");
+  cpp_init_builtins (scan_in);
+  cpp_change_file (scan_in, LC_RENAME, in_fname);
+
+  /* Process switches after builtins so -D can override them.  */
   for (i = 0; i < argc; i += strings_processed)
     {
       strings_processed = 0;
@@ -674,10 +679,6 @@ read_scan_file (in_fname, argc, argv)
   register_include_chains (scan_in, NULL /* sysroot */, NULL /* iprefix */,
 			   true /* stdinc */, false /* cxx_stdinc */,
 			   false /* verbose */);
-
-  cpp_change_file (scan_in, LC_RENAME, "<built-in>");
-  cpp_init_builtins (scan_in);
-  cpp_change_file (scan_in, LC_RENAME, in_fname);
 
   /* We are scanning a system header, so mark it as such.  */
   cpp_make_system_header (scan_in, 1, 0);