This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[committed] More top level bootstrap support


Passed (ordinary) bootstrap on i686-pc-linux-gnu, committed.

This breaks libada when using the experimental top level bootstrap support,
a problem which will be solved by changing the stupid way libada is built.

(gcc)
	* configure.ac: Add --enable-werror-always (for top level bootstrap
	support).
	* configure: Regenerate.

(top level)
	* configure.in (top level bootstrap support): Rework --enable-werror
	to set @stage2_werror_flag@.
	* configure: Regenerate.
	* Makefile.tpl (top level bootstrap support): Pass
	@stage2_werror_flag@ down to configure in stages 2 and 3.
	* Makefile.in: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.87
diff -u -r1.87 Makefile.tpl
--- Makefile.tpl	24 Mar 2004 02:24:07 -0000	1.87
+++ Makefile.tpl	24 Mar 2004 18:32:26 -0000
@@ -1374,6 +1374,8 @@
 	$(STAMP) all-stage1-gcc
 
 # TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally)
+# Possibly pass --enable-werror-always (depending on --enable-werror);
+# that's what @stage2_werror_flag@ is for
 configure-stage2-gcc: all-stage1-gcc
 	echo configure-stage2-gcc > stage_last ; \
 	if [ -f stage2-gcc/Makefile ] ; then \
@@ -1417,7 +1419,7 @@
 	    libsrcdir="$$s/gcc";; \
 	esac; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} ; \
+	  $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
 	cd .. ; \
 	mv gcc stage2-gcc ; \
 	mv prev-gcc stage1-gcc ; \
@@ -1491,7 +1493,7 @@
 	    libsrcdir="$$s/gcc";; \
 	esac; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} ; \
+	  $(HOST_CONFIGARGS) $${srcdiroption} @stage2_werror_flag@ ; \
 	cd .. ; \
 	mv gcc stage3-gcc ; \
 	mv prev-gcc stage2-gcc ; \
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.279
diff -u -r1.279 configure.in
--- configure.in	22 Mar 2004 08:38:02 -0000	1.279
+++ configure.in	24 Mar 2004 18:32:31 -0000
@@ -2129,10 +2129,10 @@
 AC_ARG_ENABLE(werror,
 [  --enable-werror         enable -Werror in bootstrap stage2 and later], [],
 [enable_werror=yes])
-case ${enable_error} in
-  yes) WERROR=-Werror ;;
-  *) WERROR= ;;
+case ${enable_werror} in
+  yes) stage2_werror_flag="--enable-werror-always" ;;
+  *) stage2_werror_flag="" ;;
 esac
-AC_SUBST(WERROR)
+AC_SUBST(stage2_werror_flag)
 
 AC_OUTPUT(Makefile)
Index: gcc/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.26
diff -u -r2.26 configure.ac
--- gcc/configure.ac	24 Mar 2004 18:03:46 -0000	2.26
+++ gcc/configure.ac	24 Mar 2004 18:32:43 -0000
@@ -346,6 +346,15 @@
   strict1_warn="${strict1_warn} -Wold-style-definition"
 fi
 
+# Enable -Werror, period.
+AC_ARG_ENABLE(werror_always, 
+[  --enable-werror-always         enable -Werror always], [],
+[enable_werror_always=no])
+if test x${enable_werror_always} = xyes ; then
+  strict1_warn="${strict1_warn} -Werror"
+  WERROR=-Werror
+fi
+
 # If the native compiler is GCC, we can enable warnings even in stage1.  
 # That's useful for people building cross-compilers, or just running a
 # quick `make'.

-- 
Make sure your vote will count.
http://www.verifiedvoting.org/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]