mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 10:54:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Makefile.tpl (experimental top level bootstrap) Move stage1

Browse Source 
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.

From-SVN: r79816
This commit is contained in:
Nathanael Nerode 2004-03-22 08:38:04 +00:00
parent a836124ac9
commit 340de83fd5
5 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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.

19
Makefile.in
View File

@ -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 .. ; \

19
Makefile.tpl
View File

@ -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 .. ; \

4
configure vendored
View File

@ -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
;;

4
configure.in
View File

@ -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
;;