Patch to fix SunOS4 bootstrap failure

Kaveh R. Ghazi ghazi@caip.rutgers.edu
Tue Sep 21 09:10:00 GMT 1999


	When building stage1 on SunOS4 using cc, I get the following
bootstrap error:

 > cc -c -DIN_GCC -g -DHAVE_CONFIG_H -I. -I../../../egcs-CVS19990920/gcc
 > 	-I../../../egcs-CVS19990920/gcc/config
 > 	-I../../../egcs-CVS19990920/gcc/../include
 > 	../../../egcs-CVS19990920/gcc/haifa-sched.c
 > "../../../egcs-CVS19990920/gcc/haifa-sched.c", line 3943: illegal type
 > 	combination
 > "../../../egcs-CVS19990920/gcc/haifa-sched.c", line 3947: syntax error
 > 	at or near type word "region"
 > "../../../egcs-CVS19990920/gcc/haifa-sched.c", line 3952: syntax error
 > 	at or near type word "region"
 > "../../../egcs-CVS19990920/gcc/haifa-sched.c", line 3963: warning:
 > 	statement not reached
 > make[2]: *** [haifa-sched.o] Error 1



Here's a patch, okay to install?

		--Kaveh



1999-09-21  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* haifa-sched.c (sched_analyze): Rename local variable `region' to
	avoid conflicts with typedef struct `region' at the top level scope.

--- test/egcs-CVS19990916/gcc/haifa-sched.c	Thu Sep 16 18:00:29 1999
+++ egcs-CVS19990916/gcc/haifa-sched.c	Thu Sep 16 19:45:03 1999
@@ -3939,16 +3939,16 @@ sched_analyze (head, tail)
 		   || (NOTE_LINE_NUMBER (insn) == NOTE_INSN_SETJMP
 		       && GET_CODE (PREV_INSN (insn)) != CALL_INSN)))
 	{
-	  rtx region;
+	  rtx rtx_region;
 
 	  if (NOTE_LINE_NUMBER (insn) == NOTE_INSN_EH_REGION_BEG
 	      || NOTE_LINE_NUMBER (insn) == NOTE_INSN_EH_REGION_END)
-	    region = GEN_INT (NOTE_EH_HANDLER (insn));
+	    rtx_region = GEN_INT (NOTE_EH_HANDLER (insn));
 	  else
-	    region = GEN_INT (0);
+	    rtx_region = GEN_INT (0);
 
 	  loop_notes = alloc_EXPR_LIST (REG_DEAD,
-					region,
+					rtx_region,
 					loop_notes);
 	  loop_notes = alloc_EXPR_LIST (REG_DEAD,
 					GEN_INT (NOTE_LINE_NUMBER (insn)),


More information about the Gcc-patches mailing list