diff --git a/ChangeLog b/ChangeLog
index f9e684197ea409d531b0b5beb98bc5bb602d99a4..57d088df5ed20af9d14cd1131cec356ea1606839 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2004-03-22  Nathanael Nerode  <neroden@gcc.gnu.org>
 
+	* Makefile.tpl (experimental top level bootstrap) Move stage1
+	language setting from all- target to configure- target; disable
+	intermodule optimization in stage 1; prevent gratuitous rebuilds
+	of stage 1.
+	* Makefile.in: Regenerate.
+	* configure.in: Comma-separate stage 1 language list for top
+	level bootstrap.
+	* configure: Regenerate.
+
 	* Makefile.tpl: Clean up experimental top level bootstrap support:
 	note known problems; set CONFIG_SHELL; don't set BUILD_CC; relocate
 	prev-gcc in configure- targets as well as all- targets.
diff --git a/Makefile.in b/Makefile.in
index dff7fde62376b58139c71d58787bb5bdfbd1dfd9..7e2cf55501fb59ce5f24c680c05e1c8402b1de6c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -23777,7 +23777,11 @@ STAMP = echo timestamp >
 STAGE1_CFLAGS=@stage1_cflags@
 STAGE1_LANGUAGES=@stage1_languages@
 
-# TODO: deal with OBJS-onestep
+# For stage 1:
+# * we force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed.  Luckily, autoconf always accepts
+#   the last* argument when conflicting --enable arguments are passed.
+# * we build only C (and possibly Ada).
 configure-stage1-gcc:
 	echo configure-stage1-gcc > stage_last ; \
 	if [ -f stage1-gcc/Makefile ] ; then \
@@ -23820,19 +23824,26 @@ configure-stage1-gcc:
 	    libsrcdir="$$s/gcc";; \
 	esac; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} ; \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule \
+	  --enable-languages="$(STAGE1_LANGUAGES)"; \
 	cd .. ; \
 	mv gcc stage1-gcc ; \
 	$(STAMP) configure-stage1-gcc
 
-all-stage1-gcc: configure-stage1-gcc all-bootstrap
+# Real targets act phony if they depend on phony targets; this hack
+# prevents gratuitous rebuilding of stage 1.
+prebootstrap:
+	$(MAKE) all-bootstrap
+	$(STAMP) prebootstrap
+
+all-stage1-gcc: configure-stage1-gcc prebootstrap
 	echo all-stage1-gcc > stage_last ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	mv stage1-gcc gcc ; \
 	cd gcc && \
 	$(MAKE) $(GCC_FLAGS_TO_PASS) \
-                LANGUAGES="$(STAGE1_LANGUAGES)" \
 		CFLAGS="$(STAGE1_CFLAGS)" \
 		COVERAGE_FLAGS= || exit 1 ; \
 	cd .. ; \
diff --git a/Makefile.tpl b/Makefile.tpl
index a44cc40113427e2395c01e2ce1c2473f355e35f8..de8559446a688379d63d2954e87b40a24d62d4e2 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1294,7 +1294,11 @@ STAMP = echo timestamp >
 STAGE1_CFLAGS=@stage1_cflags@
 STAGE1_LANGUAGES=@stage1_languages@
 
-# TODO: deal with OBJS-onestep
+# For stage 1:
+# * we force-disable intermodule optimizations, even if
+#   --enable-intermodule was passed.  Luckily, autoconf always accepts
+#   the last* argument when conflicting --enable arguments are passed.
+# * we build only C (and possibly Ada).
 configure-stage1-gcc:
 	echo configure-stage1-gcc > stage_last ; \
 	if [ -f stage1-gcc/Makefile ] ; then \
@@ -1337,19 +1341,26 @@ configure-stage1-gcc:
 	    libsrcdir="$$s/gcc";; \
 	esac; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption} ; \
+	  $(HOST_CONFIGARGS) $${srcdiroption} \
+	  --disable-intermodule \
+	  --enable-languages="$(STAGE1_LANGUAGES)"; \
 	cd .. ; \
 	mv gcc stage1-gcc ; \
 	$(STAMP) configure-stage1-gcc
 
-all-stage1-gcc: configure-stage1-gcc all-bootstrap
+# Real targets act phony if they depend on phony targets; this hack
+# prevents gratuitous rebuilding of stage 1.
+prebootstrap:
+	$(MAKE) all-bootstrap
+	$(STAMP) prebootstrap
+
+all-stage1-gcc: configure-stage1-gcc prebootstrap
 	echo all-stage1-gcc > stage_last ; \
 	r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	mv stage1-gcc gcc ; \
 	cd gcc && \
 	$(MAKE) $(GCC_FLAGS_TO_PASS) \
-                LANGUAGES="$(STAGE1_LANGUAGES)" \
 		CFLAGS="$(STAGE1_CFLAGS)" \
 		COVERAGE_FLAGS= || exit 1 ; \
 	cd .. ; \
diff --git a/configure b/configure
index fc897117ef3d87430b492e0e6b8b2a7796c92cc2..a884c3281bf28fe5a319582c42296d7d0c31f006 100755
--- a/configure
+++ b/configure
@@ -2283,8 +2283,8 @@ if test -d ${srcdir}/gcc; then
 	    missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
 	    case ${boot_language} in
 	      yes)
-		# Add to (space-separated) list of stage 1 languages.
-		stage1_languages="${stage1_languages} ${language}"
+		# Add to (comma-separated) list of stage 1 languages.
+		stage1_languages="${stage1_languages},${language}"
 		;;
 	    esac
 	    ;;
diff --git a/configure.in b/configure.in
index d94a11da3c56c73202c0269250a4418ff110a501..0a9f05fd8fc37d88c6f2046df93f6c884ad425b5 100644
--- a/configure.in
+++ b/configure.in
@@ -1180,8 +1180,8 @@ if test -d ${srcdir}/gcc; then
 	    missing_languages=`echo "$missing_languages" | sed "s/,$language,/,/"`
 	    case ${boot_language} in
 	      yes)
-		# Add to (space-separated) list of stage 1 languages.
-		stage1_languages="${stage1_languages} ${language}"
+		# Add to (comma-separated) list of stage 1 languages.
+		stage1_languages="${stage1_languages},${language}"
 		;;
 	    esac
 	    ;;