X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=Makefile.tpl;h=7e9cb79d43f86f9873b9936d8abb47af4ad3f5b7;hp=ae95eb2080833208fc3d6b4e8ecd652af78b74d5;hb=8b0aea646d48b4b21ec68b2d8be998c0d985b4a6;hpb=d45eaefd45d39aa1e9e1215ad1119a575b0e1e1f diff --git a/Makefile.tpl b/Makefile.tpl index ae95eb20808..7e9cb79d43f 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -6,7 +6,7 @@ in # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ in # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ------------------------------- @@ -53,6 +53,9 @@ libdir = @libdir@ includedir = @includedir@ oldincludedir = @oldincludedir@ infodir = @infodir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +htmldir = @htmldir@ mandir = @mandir@ man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 @@ -75,44 +78,23 @@ LN_S = @LN_S@ # Miscellaneous non-standard autoconf-set variables # ------------------------------------------------- -# The file containing GCC's version number. -gcc_version_trigger = @gcc_version_trigger@ -gcc_version = @gcc_version@ - # The gcc driver likes to know the arguments it was configured with. TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ -gxx_include_dir = @gxx_include_dir@ -libstdcxx_incdir = @libstdcxx_incdir@ - tooldir = @tooldir@ build_tooldir = @build_tooldir@ -# Directory in which the compiler finds executables, libraries, etc. -libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = # This is the name of the environment variable used for the path to # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ -# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared -# was used. -SET_LIB_PATH = @SET_LIB_PATH@ - -# configure.in sets SET_LIB_PATH to this if --enable-shared was used. -# Some platforms don't like blank entries, so we remove duplicate, -# leading and trailing colons. -REALLY_SET_LIB_PATH = \ - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); - -# This is the list of directories to be built for the build system. -BUILD_CONFIGDIRS = libiberty libbanshee # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring # directories built for the build system. -BUILD_CONFIGARGS = @build_configargs@ +BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)" # This is the list of variables to export in the environment when # configuring any subdirectory. It must also be exported whenever @@ -151,8 +133,12 @@ SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring # directories built for the host system. HOST_CONFIGARGS = @host_configargs@ +# Host programs are put under this directory, which is . except if building +# with srcdir=.. +HOST_SUBDIR = @host_subdir@ # This is the list of variables to export in the environment when -# configuring subdirectories for the host system. +# configuring subdirectories for the host system. We need to pass +# some to the GCC configure because of its hybrid host/target nature. HOST_EXPORTS = \ $(BASE_EXPORTS) \ CC="$(CC)"; export CC; \ @@ -171,43 +157,61 @@ HOST_EXPORTS = \ WINDRES="$(WINDRES)"; export WINDRES; \ OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \ + AR_FOR_TARGET="$(AR_FOR_TARGET)"; export AR_FOR_TARGET; \ + AS_FOR_TARGET="$(AS_FOR_TARGET)"; export AS_FOR_TARGET; \ + GCC_FOR_TARGET="$(GCC_FOR_TARGET)"; export GCC_FOR_TARGET; \ + LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \ + NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \ + OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \ + RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ - GMPINC="$(HOST_GMPINC)"; export GMPINC; + GMPINC="$(HOST_GMPINC)"; export GMPINC; \ +@if gcc-bootstrap + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ +@endif gcc-bootstrap + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); # Similar, for later GCC stages. -STAGE_HOST_EXPORTS = \ +POSTSTAGE1_HOST_EXPORTS = \ $(HOST_EXPORTS) \ - CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ - CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; + CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ + CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ + -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; \ + CFLAGS="$(BOOT_CFLAGS)"; export CFLAGS; \ + LDFLAGS="$(BOOT_LDFLAGS)"; export LDFLAGS; -# This is set by the configure script to the list of directories which -# should be built using the target tools. -TARGET_CONFIGDIRS = @target_configdirs@ # Target libraries are put under this directory: TARGET_SUBDIR = @target_subdir@ # This is set by the configure script to the arguments to use when configuring # directories built for the target. -TARGET_CONFIGARGS = @target_configargs@ +TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" # This is the list of variables to export in the environment when # configuring subdirectories for the host system. BASE_TARGET_EXPORTS = \ $(BASE_EXPORTS) \ AR="$(AR_FOR_TARGET)"; export AR; \ - AS="$(AS_FOR_TARGET)"; export AS; \ + AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \ CC="$(CC_FOR_TARGET)"; export CC; \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ - LD="$(LD_FOR_TARGET)"; export LD; \ + LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ - NM="$(NM_FOR_TARGET)"; export NM; \ + LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ + NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \ + OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ - WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; + STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ @@ -243,55 +247,24 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CXX_FOR_BUILD = $(CXX) -# Path to the build directory for a Canadian cross, empty otherwise. -BUILD_DIR_PREFIX = @BUILD_DIR_PREFIX@ - # Special variables passed down in EXTRA_GCC_FLAGS. They are defined # here so that they can be overridden by Makefile fragments. BUILD_PREFIX = @BUILD_PREFIX@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ -CONFIGURED_BISON = @CONFIGURED_BISON@ -BISON = `if [ -f $$r/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \ - echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -L $$s/bison/ ; \ - else \ - echo ${CONFIGURED_BISON} ; \ - fi` - -CONFIGURED_YACC = @CONFIGURED_YACC@ -YACC = `if [ -f $$s/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \ - echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -y -L $$s/bison/ ; \ - elif [ -f $$s/$(BUILD_DIR_PREFIX)/byacc/byacc ] ; then \ - echo $$r/$(BUILD_DIR_PREFIX)/byacc/byacc ; \ - else \ - echo ${CONFIGURED_YACC} ; \ - fi` - -CONFIGURED_FLEX = @CONFIGURED_FLEX@ -FLEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \ - else echo ${CONFIGURED_FLEX} ; fi` - -CONFIGURED_LEX = @CONFIGURED_LEX@ -LEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \ - else echo ${CONFIGURED_LEX} ; fi` - -CONFIGURED_M4 = @CONFIGURED_M4@ -M4 = `if [ -f $$r/$(BUILD_DIR_PREFIX)/m4/m4 ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/m4/m4 ; \ - else echo ${CONFIGURED_M4} ; fi` - -# For an installed makeinfo, we require it to be from texinfo 4.2 or -# higher, else we use the "missing" dummy. We also pass the subdirectory -# makeinfo even if only the Makefile is there, because Texinfo builds its -# manual when made, and it requires its own version. -CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@ -MAKEINFO = `if [ -f $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/Makefile ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/makeinfo ; \ - else if (${CONFIGURED_MAKEINFO} --version \ - | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ - then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi` +# Flags to pass to stage2 and later makes. They are defined +# here so that they can be overridden by Makefile fragments. +BOOT_CFLAGS= -g -O2 +BOOT_LDFLAGS= + +BISON = @BISON@ +YACC = @YACC@ +FLEX = @FLEX@ +LEX = @LEX@ +M4 = @M4@ +MAKEINFO = @MAKEINFO@ +EXPECT = @EXPECT@ +RUNTEST = @RUNTEST@ # This just becomes part of the MAKEINFO definition passed down to # sub-makes. It lets flags be given on the command line while still @@ -299,185 +272,74 @@ MAKEINFO = `if [ -f $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/Makefile ] ; \ # (Default to avoid splitting info files by setting the threshold high.) MAKEINFOFLAGS = --split-size=5000000 -EXPECT = `if [ -f $$r/expect/expect ] ; \ - then echo $$r/expect/expect ; \ - else echo expect ; fi` - -RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ - then echo $$s/dejagnu/runtest ; \ - else echo runtest ; fi` - # --------------------------------------------- # Programs producing files for the HOST machine # --------------------------------------------- -# This is the list of directories that may be needed in RPATH_ENVVAR -# so that programs built for the host machine work. -HOST_LIB_PATH = $$r/bfd:$$r/opcodes - AS = @AS@ - AR = @AR@ AR_FLAGS = rc - CC = @CC@ -CFLAGS = @CFLAGS@ -LIBCFLAGS = $(CFLAGS) - CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates - DLLTOOL = @DLLTOOL@ - -NM = @NM@ - LD = @LD@ -LDFLAGS = - +LIPO = @LIPO@ +NM = @NM@ +OBJDUMP = @OBJDUMP@ RANLIB = @RANLIB@ - +STRIP = @STRIP@ WINDRES = @WINDRES@ +CFLAGS = @CFLAGS@ +LDFLAGS = +LIBCFLAGS = $(CFLAGS) +CXXFLAGS = @CXXFLAGS@ +LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates PICFLAG = # ----------------------------------------------- # Programs producing files for the TARGET machine # ----------------------------------------------- -# This is the list of directories that may be needed in RPATH_ENVVAR -# so that prorgams built for the target machine work. -TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs - FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ AR_FOR_TARGET=@AR_FOR_TARGET@ -CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@ -USUAL_AR_FOR_TARGET = ` \ - if [ -f $$r/binutils/ar ] ; then \ - echo $$r/binutils/ar ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - echo $(AR); \ - else \ - echo $(CONFIGURED_AR_FOR_TARGET) ; \ - fi; \ - fi` - AS_FOR_TARGET=@AS_FOR_TARGET@ -CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@ -USUAL_AS_FOR_TARGET = ` \ - if [ -f $$r/gas/as-new ] ; then \ - echo $$r/gas/as-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ - $(CC_FOR_TARGET) -print-prog-name=as ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - echo $(AS); \ - else \ - echo $(CONFIGURED_AS_FOR_TARGET) ; \ - fi; \ - fi` - -CC_FOR_TARGET = @CC_FOR_TARGET@ -# During gcc bootstrap, if we use some random cc for stage1 then -# CFLAGS will be just -g. We want to ensure that TARGET libraries -# (which we know are built with gcc) are built with optimizations so -# prepend -O2 when setting CFLAGS_FOR_TARGET. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) +CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET) + # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET=@GCC_FOR_TARGET@ -USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET) -LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) - -CXX_FOR_TARGET = @CXX_FOR_TARGET@ -RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ -CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ -RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates - +GCC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCC_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) +GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ -CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@ -USUAL_DLLTOOL_FOR_TARGET = ` \ - if [ -f $$r/binutils/dlltool ] ; then \ - echo $$r/binutils/dlltool ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - echo $(DLLTOOL); \ - else \ - echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \ - fi; \ - fi` - -GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ -GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@ - LD_FOR_TARGET=@LD_FOR_TARGET@ -CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@ -USUAL_LD_FOR_TARGET = ` \ - if [ -f $$r/ld/ld-new ] ; then \ - echo $$r/ld/ld-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ - $(CC_FOR_TARGET) -print-prog-name=ld ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - echo $(LD); \ - else \ - echo $(CONFIGURED_LD_FOR_TARGET) ; \ - fi; \ - fi` - -LDFLAGS_FOR_TARGET = +LIPO_FOR_TARGET=@LIPO_FOR_TARGET@ NM_FOR_TARGET=@NM_FOR_TARGET@ -CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ -USUAL_NM_FOR_TARGET = ` \ - if [ -f $$r/binutils/nm-new ] ; then \ - echo $$r/binutils/nm-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ - $(CC_FOR_TARGET) -print-prog-name=nm ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - echo $(NM); \ - else \ - echo $(CONFIGURED_NM_FOR_TARGET) ; \ - fi; \ - fi` - +OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@ RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ -CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ -USUAL_RANLIB_FOR_TARGET = ` \ - if [ -f $$r/binutils/ranlib ] ; then \ - echo $$r/binutils/ranlib ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - if [ x'$(RANLIB)' != x ]; then \ - echo $(RANLIB); \ - else \ - echo ranlib; \ - fi; \ - else \ - echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \ - fi; \ - fi` - +STRIP_FOR_TARGET=@STRIP_FOR_TARGET@ WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ -CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ -USUAL_WINDRES_FOR_TARGET = ` \ - if [ -f $$r/binutils/windres ] ; then \ - echo $$r/binutils/windres ; \ - else \ - if [ '$(host)' = '$(target)' ] ; then \ - echo $(WINDRES); \ - else \ - echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \ - fi; \ - fi` +COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_TARGET@ +COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@ +COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@ + +# During gcc bootstrap, if we use some random cc for stage1 then +# CFLAGS will be just -g. We want to ensure that TARGET libraries +# (which we know are built with gcc) are built with optimizations so +# prepend -O2 when setting CFLAGS_FOR_TARGET. +CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) +SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) +LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) +LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +LDFLAGS_FOR_TARGET = PICFLAG_FOR_TARGET = # ------------------------------------ @@ -486,7 +348,7 @@ PICFLAG_FOR_TARGET = # The first rule in the file had better be this one. Don't put any above it. # This lives here to allow makefile fragments to contain dependencies. -@default_target@: +all: #### host and target specific makefile fragments come in here. @target_makefile_frag@ @@ -495,22 +357,46 @@ PICFLAG_FOR_TARGET = @host_makefile_frag@ ### +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that prorgams built for the target machine work. +TARGET_LIB_PATH = [+ FOR target_modules +][+ + IF lib_path +]$(TARGET_LIB_PATH_[+module+])[+ ENDIF lib_path +][+ + ENDFOR target_modules +]$(HOST_LIB_PATH_gcc) +[+ FOR target_modules +][+ IF lib_path +] +@if target-[+module+] +TARGET_LIB_PATH_[+module+] = $$r/$(TARGET_SUBDIR)/[+module+]/[+lib_path+]: +@endif target-[+module+] +[+ ENDIF lib_path +][+ ENDFOR target_modules +] + + +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that programs built for the host machine work. +HOST_LIB_PATH = [+ FOR host_modules +][+ + IF lib_path +]$(HOST_LIB_PATH_[+module+])[+ ENDIF lib_path +][+ + ENDFOR host_modules +] + +# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch +@if gcc +HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc: +@endif gcc + +[+ FOR host_modules +][+ IF lib_path +] +@if [+module+] +HOST_LIB_PATH_[+module+] = \ + $$r/$(HOST_SUBDIR)/[+module+]/[+lib_path+]:[+ IF bootstrap + +]$$r/$(HOST_SUBDIR)/prev-[+module+]/[+lib_path+]:[+ ENDIF bootstrap +] +@endif [+module+] +[+ ENDIF lib_path +][+ ENDFOR host_modules +] + # Flags to pass down to all sub-makes. -BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\ - "[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\ +BASE_FLAGS_TO_PASS =[+ FOR flags_to_pass +][+ IF optional +] \ + "`echo '[+flag+]=$([+flag+])' | sed -e s'/[^=][^=]*=$$/XFOO=/'`"[+ ELSE optional +] \ + "[+flag+]=$([+flag+])"[+ ENDIF optional+][+ ENDFOR flags_to_pass +] \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" -# For any flags above that may contain shell code that varies from one -# target library to another. When doing recursive invocations of the -# top-level Makefile, we don't want the outer make to evaluate them, -# so we pass these variables down unchanged. They must not contain -# single nor double quotes. -RECURSE_FLAGS = \ - CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ - RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ - -RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) +# We leave this in just in case, but it is not needed anymore. +RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) # Flags to pass down to most sub-makes, in which we're building with # the host environment. @@ -521,8 +407,11 @@ EXTRA_HOST_FLAGS = \ 'CXX=$(CXX)' \ 'DLLTOOL=$(DLLTOOL)' \ 'LD=$(LD)' \ + 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ + 'OBJDUMP=$(OBJDUMP)' \ 'RANLIB=$(RANLIB)' \ + 'STRIP=$(STRIP)' \ 'WINDRES=$(WINDRES)' FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) @@ -540,20 +429,23 @@ X11_FLAGS_TO_PASS = \ 'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)' # Flags to pass down to makes which are built with the target environment. -# The double $ decreases the length of the command line; the variables -# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. +# The double $ decreases the length of the command line; those variables +# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The +# COMPILER_ prefixed variables are not passed down so we expand them here. EXTRA_TARGET_FLAGS = \ 'AR=$$(AR_FOR_TARGET)' \ - 'AS=$$(AS_FOR_TARGET)' \ + 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET)' \ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ 'CXX=$$(CXX_FOR_TARGET)' \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ - 'LD=$$(LD_FOR_TARGET)' \ + 'LD=$(COMPILER_LD_FOR_TARGET)' \ + 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ - 'NM=$$(NM_FOR_TARGET)' \ + 'NM=$(COMPILER_NM_FOR_TARGET)' \ + 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' @@ -566,24 +458,17 @@ TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) # The BUILD_* variables are a special case, which are used for the gcc # cross-building scheme. EXTRA_GCC_FLAGS = \ - 'BUILD_PREFIX=$(BUILD_PREFIX)' \ - 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ - "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_CFLAGS=$(LIBGCC2_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIBGCC2_DEBUG_CFLAGS=$(LIBGCC2_DEBUG_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'STAGE1_CFLAGS=$(STAGE1_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'BOOT_CFLAGS=$(BOOT_CFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ - "`echo 'BOOT_ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" + "`echo 'LIBGCC2_INCLUDES=$(LIBGCC2_INCLUDES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) .PHONY: configure-host -configure-host: maybe-configure-gcc [+ +configure-host: [+ FOR host_modules +] \ maybe-configure-[+module+][+ ENDFOR host_modules +] @@ -595,23 +480,37 @@ configure-target: [+ # The target built for a native non-bootstrap build. .PHONY: all -all: all-build all-host all-target +all: +@if gcc-bootstrap + [ -f stage_final ] || echo stage3 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) `cat stage_final`-bubble +@endif gcc-bootstrap + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if [ -f stage_last ]; then \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target; \ + else \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \ + fi .PHONY: all-build -all-build: [+ - FOR build_modules +] \ - maybe-all-build-[+module+][+ - ENDFOR build_modules +] +[+ FOR build_modules +] +all-build: maybe-all-build-[+module+][+ ENDFOR build_modules +] + .PHONY: all-host -all-host: maybe-all-gcc [+ - FOR host_modules +] \ - maybe-all-[+module+][+ - ENDFOR host_modules +] +[+ FOR host_modules +][+ IF bootstrap +] +@if [+module+]-no-bootstrap[+ ENDIF bootstrap +] +all-host: maybe-all-[+module+][+ IF bootstrap +] +@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR host_modules +] + .PHONY: all-target -all-target: [+ - FOR target_modules +] \ - maybe-all-target-[+module+][+ - ENDFOR target_modules +] +[+ FOR target_modules +][+ IF bootstrap +] +@if [+module+]-no-bootstrap[+ ENDIF bootstrap +] +all-target: maybe-all-target-[+module+][+ IF bootstrap +] +@endif [+module+]-no-bootstrap[+ ENDIF bootstrap +][+ ENDFOR target_modules +] # Do a target for all the subdirectories. A ``make do-X'' will do a # ``make X'' in all subdirectories (because, in general, there is a @@ -619,29 +518,33 @@ all-target: [+ # but it may do additional work as well). [+ FOR recursive_targets +] .PHONY: do-[+make_target+] -do-[+make_target+]: [+make_target+]-host [+make_target+]-target +do-[+make_target+]: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \ + [+make_target+]-target + .PHONY: [+make_target+]-host -[+make_target+]-host: maybe-[+make_target+]-gcc [+ - FOR host_modules +] \ - maybe-[+make_target+]-[+module+][+ - ENDFOR host_modules +] +[+ FOR host_modules +] +[+make_target+]-host: maybe-[+make_target+]-[+module+][+ ENDFOR host_modules +] .PHONY: [+make_target+]-target -[+make_target+]-target: [+ - FOR target_modules +] \ - maybe-[+make_target+]-target-[+module+][+ - ENDFOR target_modules +] +[+ FOR target_modules +] +[+make_target+]-target: maybe-[+make_target+]-target-[+module+][+ ENDFOR target_modules +] [+ ENDFOR recursive_targets +] # Here are the targets which correspond to the do-X targets. -.PHONY: info installcheck dvi install-info +.PHONY: info installcheck dvi pdf html install-info install-html .PHONY: clean distclean mostlyclean maintainer-clean realclean .PHONY: local-clean local-distclean local-maintainer-clean info: do-info installcheck: do-installcheck dvi: do-dvi +pdf: do-pdf +html: do-html # Make sure makeinfo is built before we do a `make info', if we're # in fact building texinfo. @@ -653,16 +556,21 @@ install-info: do-install-info dir.info $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ else true ; fi +install-html: do-install-html + local-clean: -rm -f *.a TEMP errs core *.o *~ \#* TAGS *.E *.log local-distclean: -rm -f Makefile config.status config.cache mh-frag mt-frag - -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp + -rm -f maybedep.tmp serdep.tmp -if [ "$(TARGET_SUBDIR)" != "." ]; then \ rm -rf $(TARGET_SUBDIR); \ else true; fi -rm -rf $(BUILD_SUBDIR) + -if [ "$(HOST_SUBDIR)" != "." ]; then \ + rm -rf $(HOST_SUBDIR); \ + else true; fi -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null @@ -680,13 +588,10 @@ maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean maintainer-clean: local-distclean realclean: maintainer-clean -# Extra dependency for clean-target, owing to the mixed nature of gcc +# Extra dependency for clean-target, owing to the mixed nature of gcc. clean-target: clean-target-libgcc clean-target-libgcc: - test ! -d gcc/libgcc || \ - (cd gcc/libgcc && find . -type d -print) | \ - while read d; do rm -f gcc/$$d/libgcc.a || : ; done - -rm -rf gcc/libgcc + if test -f gcc/Makefile; then cd gcc && $(MAKE) $@; else :; fi # Check target. @@ -694,14 +599,24 @@ clean-target-libgcc: check: do-check # Only include modules actually being configured and built. -do-check: maybe-check-gcc [+ +.PHONY: check-host +check-host: [+ FOR host_modules +] \ maybe-check-[+module+][+ - ENDFOR host_modules +][+ + ENDFOR host_modules +] + +.PHONY: check-target +check-target: [+ FOR target_modules +] \ maybe-check-target-[+module+][+ ENDFOR target_modules +] +do-check: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target + # Automated reporting of test results. warning.log: build.log @@ -726,16 +641,20 @@ mail-report-with-warnings.log: warning.log # Installation targets. .PHONY: install uninstall -install: installdirs install-host install-target +install: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target .PHONY: install-host-nogcc install-host-nogcc: [+ - FOR host_modules +] \ - maybe-install-[+module+][+ + FOR host_modules +][+ IF (not (= (get "module") "gcc")) +] \ + maybe-install-[+module+][+ ENDIF +][+ ENDFOR host_modules +] .PHONY: install-host -install-host: maybe-install-gcc [+ +install-host: [+ FOR host_modules +] \ maybe-install-[+module+][+ ENDFOR host_modules +] @@ -753,7 +672,7 @@ uninstall: install.all: install-no-fixedincludes @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD_COMMAND}` ; export r ; \ - $(SET_LIB_PATH) \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd ./gcc && \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ @@ -797,120 +716,184 @@ etags tags: TAGS # built are. TAGS: do-TAGS -# -------------------------------------- -# Modules which run on the build machine -# -------------------------------------- -[+ FOR build_modules +] -.PHONY: configure-build-[+module+] maybe-configure-build-[+module+] -maybe-configure-build-[+module+]: -@if build-[+module+] -maybe-configure-build-[+module+]: configure-build-[+module+] -configure-build-[+module+]: - @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \ - r=`${PWD_COMMAND}`; export r; \ +# ------------------------------------ +# Macros for configure and all targets +# ------------------------------------ + +[+ DEFINE configure +] +.PHONY: configure-[+prefix+][+module+] maybe-configure-[+prefix+][+module+] +maybe-configure-[+prefix+][+module+]: +@if gcc-bootstrap +configure-[+prefix+][+module+]: stage_current +@endif gcc-bootstrap +@if [+prefix+][+module+] +maybe-configure-[+prefix+][+module+]: configure-[+prefix+][+module+] +configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +] + @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] + @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(BUILD_EXPORTS) \ - echo Configuring in $(BUILD_SUBDIR)/[+module+]; \ - cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \ + [+ IF check_multilibs + +]echo "Checking multilib configuration for [+module+]..."; \ + $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ + $(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \ + if test -r [+subdir+]/[+module+]/multilib.out; then \ + if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \ + rm -f [+subdir+]/[+module+]/multilib.tmp; \ + else \ + rm -f [+subdir+]/[+module+]/Makefile; \ + mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \ + fi; \ + else \ + mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \ + fi; \ + [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ + [+exports+] \ + echo Configuring in [+subdir+]/[+module+]; \ + cd "[+subdir+]/[+module+]" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo [+subdir+]/[+module+]/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ + [+ IF no-config-site +]rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \ + [+args+] $${srcdiroption} [+extra_configure_flags+] \ + || exit 1 +@endif [+prefix+][+module+] + +[+ IF bootstrap +] +[+ FOR bootstrap_stage +] +.PHONY: configure-stage[+id+]-[+prefix+][+module+] maybe-configure-stage[+id+]-[+prefix+][+module+] +maybe-configure-stage[+id+]-[+prefix+][+module+]: +@if [+prefix+][+module+]-bootstrap +maybe-configure-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+] +configure-stage[+id+]-[+prefix+][+module+]: + @[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start + @$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + [+ IF check_multilibs + +]echo "Checking multilib configuration for [+module+]..."; \ + $(CC_FOR_TARGET) --print-multi-lib > [+subdir+]/[+module+]/multilib.tmp 2> /dev/null ; \ + if test -r [+subdir+]/[+module+]/multilib.out; then \ + if cmp -s [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; then \ + rm -f [+subdir+]/[+module+]/multilib.tmp; \ else \ - true; \ + rm -f [+subdir+]/[+module+]/Makefile; \ + mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \ fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ else \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ + mv [+subdir+]/[+module+]/multilib.tmp [+subdir+]/[+module+]/multilib.out; \ fi; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" [+extra_configure_flags+] \ - || exit 1 -@endif build-[+module+] - -.PHONY: all-build-[+module+] maybe-all-build-[+module+] -maybe-all-build-[+module+]: -@if build-[+module+] -maybe-all-build-[+module+]: all-build-[+module+] -all-build-[+module+]: configure-build-[+module+] + [+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \ + [+exports+][+ IF prev +] \ + [+poststage1_exports+][+ ENDIF prev +] \ + echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \ + $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ + cd [+subdir+]/[+module+] || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo [+subdir+]/[+module+]/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/[+module+]"; \ + libsrcdir="$$s/[+module+]"; \ + $(SHELL) $${libsrcdir}/configure \ + [+args+] $${srcdiroption} \ + [+ IF prev +]--with-build-libsubdir=$(HOST_SUBDIR)[+ ENDIF prev +] \ + [+stage_configure_flags+] [+extra_configure_flags+] +@endif [+prefix+][+module+]-bootstrap +[+ ENDFOR bootstrap_stage +] +[+ ENDIF bootstrap +] +[+ ENDDEF +] + +[+ DEFINE all +] +.PHONY: all-[+prefix+][+module+] maybe-all-[+prefix+][+module+] +maybe-all-[+prefix+][+module+]: +@if gcc-bootstrap +all-[+prefix+][+module+]: stage_current +@endif gcc-bootstrap +@if [+prefix+][+module+] +TARGET-[+prefix+][+module+]=[+ + IF target +][+target+][+ ELSE +]all[+ ENDIF target +] +maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+] +all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +][+ ELSE +] + @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + [+exports+] \ + (cd [+subdir+]/[+module+] && \ + $(MAKE) [+args+] [+extra_make_flags+] $(TARGET-[+prefix+][+module+])) +@endif [+prefix+][+module+] + +[+ IF bootstrap +] +[+ FOR bootstrap_stage +] +.PHONY: all-stage[+id+]-[+prefix+][+module+] maybe-all-stage[+id+]-[+prefix+][+module+] +.PHONY: clean-stage[+id+]-[+prefix+][+module+] maybe-clean-stage[+id+]-[+prefix+][+module+] +maybe-all-stage[+id+]-[+prefix+][+module+]: +maybe-clean-stage[+id+]-[+prefix+][+module+]: +@if [+prefix+][+module+]-bootstrap +maybe-all-stage[+id+]-[+prefix+][+module+]: all-stage[+id+]-[+prefix+][+module+] +all-stage[+id+]: all-stage[+id+]-[+prefix+][+module+] +TARGET-stage[+id+]-[+prefix+][+module+] = $(TARGET-[+prefix+][+module+]) +all-stage[+id+]-[+prefix+][+module+]: configure-stage[+id+]-[+prefix+][+module+] + @[ $(current_stage) = stage[+id+] ] || $(MAKE) stage[+id+]-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/[+module+] && $(MAKE) [+extra_make_flags+] all) -@endif build-[+module+] -[+ ENDFOR build_modules +] + [+exports+][+ IF prev +] \ + [+poststage1_exports+][+ ENDIF prev +] \ + cd [+subdir+]/[+module+] && \ + $(MAKE) [+args+] [+ IF prev + +][+poststage1_args+][+ ENDIF prev + +] [+stage_make_flags+] [+extra_make_flags+] \ + $(TARGET-stage[+id+]-[+prefix+][+module+]) + +maybe-clean-stage[+id+]-[+prefix+][+module+]: clean-stage[+id+]-[+prefix+][+module+] +clean-stage[+id+]: clean-stage[+id+]-[+prefix+][+module+] +clean-stage[+id+]-[+prefix+][+module+]: + @if [ $(current_stage) = stage[+id+] ]; then \ + [ -f [+subdir+]/[+module+]/Makefile ] || exit 0; \ + else \ + [ -f [+subdir+]/stage[+id+]-[+module+]/Makefile ] || exit 0; \ + $(MAKE) stage[+id+]-start; \ + fi; \ + cd [+subdir+]/[+module+] && \ + $(MAKE) [+args+] [+ IF prev +] \ + [+poststage1_args+] [+ ENDIF prev +] \ + [+stage_make_flags+] [+extra_make_flags+] clean +@endif [+prefix+][+module+]-bootstrap + +[+ ENDFOR bootstrap_stage +] +[+ ENDIF bootstrap +] +[+ ENDDEF +] + +# -------------------------------------- +# Modules which run on the build machine +# -------------------------------------- +[+ FOR build_modules +] +[+ configure prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" + args="$(BUILD_CONFIGARGS)" no-config-site=true +] + +[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +] +[+ ENDFOR build_module +] # -------------------------------------- # Modules which run on the host machine # -------------------------------------- [+ FOR host_modules +] -.PHONY: configure-[+module+] maybe-configure-[+module+] -maybe-configure-[+module+]: -@if [+module+] -maybe-configure-[+module+]: configure-[+module+] -configure-[+module+]: - @test ! -f [+module+]/Makefile || exit 0; \ - [ -d [+module+] ] || mkdir [+module+]; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in [+module+]; \ - cd [+module+] || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/[+module+]"; \ - libsrcdir="$$s/[+module+]";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \ - libsrcdir="$$s/[+module+]";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \ - || exit 1 -@endif [+module+] +[+ configure prefix="" subdir="$(HOST_SUBDIR)" + exports="$(HOST_EXPORTS)" + poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" + args="$(HOST_CONFIGARGS)" +] -.PHONY: all-[+module+] maybe-all-[+module+] -maybe-all-[+module+]: -@if [+module+] -maybe-all-[+module+]: all-[+module+] -all-[+module+]: configure-[+module+] - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] [+extra_make_flags+] all) -@endif [+module+] +[+ all prefix="" subdir="$(HOST_SUBDIR)" + exports="$(HOST_EXPORTS)" + poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" + args="$(FLAGS_TO_PASS)" + poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +] .PHONY: check-[+module+] maybe-check-[+module+] maybe-check-[+module+]: @@ -921,26 +904,22 @@ check-[+module+]: [+ ELIF no_check_cross +] # This module is only tested in a native toolchain. check-[+module+]: + @: $(MAKE); $(unstage) @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] [+extra_make_flags+] check); \ + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check); \ fi [+ ELSE check +] check-[+module+]: + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] [+extra_make_flags+] check) + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] check) [+ ENDIF no_check +] @endif [+module+] @@ -952,18 +931,16 @@ maybe-install-[+module+]: install-[+module+] install-[+module+]: [+ ELSE install +] install-[+module+]: installdirs + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] [+extra_make_flags+] install) + (cd $(HOST_SUBDIR)/[+module+] && \ + $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] install) [+ ENDIF no_install +] @endif [+module+] -# Other targets (info, dvi, etc.) +# Other targets (info, dvi, pdf, etc.) [+ FOR recursive_targets +] .PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+] maybe-[+make_target+]-[+module+]: @@ -977,21 +954,21 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] FOR depend +]\ [+depend+]-[+module+] [+ ENDFOR depend +] - @[ -f ./[+module+]/Makefile ] || exit 0; \ + @[+ IF bootstrap +][+ ELSE +]: $(MAKE); $(unstage) + @[+ ENDIF bootstrap +][ -f ./[+module+]/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS); do \ + for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing [+make_target+] in [+module+]" ; \ - (cd [+module+] && \ + (cd $(HOST_SUBDIR)/[+module+] && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - [+extra_make_flags+] [+make_target+]) \ + [+make_target+]) \ || exit 1 [+ ENDIF +] @endif [+module+] @@ -1002,90 +979,26 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] # Modules which run on the target machine # --------------------------------------- [+ FOR target_modules +] -.PHONY: configure-target-[+module+] maybe-configure-target-[+module+] -maybe-configure-target-[+module+]: -@if target-[+module+] -maybe-configure-target-[+module+]: configure-target-[+module+] -# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. -$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \ - rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \ - cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out +[+ IF raw_cxx +] +[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" + check_multilibs=true + exports="$(RAW_CXX_TARGET_EXPORTS)" + args="$(TARGET_CONFIGARGS)" no-config-site=true +] -configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out - @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \[+ -IF raw_cxx +] - $(RAW_CXX_TARGET_EXPORTS) \[+ -ELSE normal_cxx +] - $(NORMAL_TARGET_EXPORTS) \[+ -ENDIF raw_cxx +] - echo Configuring in $(TARGET_SUBDIR)/[+module+]; \ - cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \[+ IF stage +] - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \[+ ENDIF stage +] - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \[+ IF stage +] - fi; \[+ ENDIF stage +] - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" [+extra_configure_flags+] \ - || exit 1 -@endif target-[+module+] - -.PHONY: all-target-[+module+] maybe-all-target-[+module+] -maybe-all-target-[+module+]: -@if target-[+module+] -maybe-all-target-[+module+]: all-target-[+module+] -all-target-[+module+]: configure-target-[+module+] - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \[+ -IF raw_cxx +] - $(RAW_CXX_TARGET_EXPORTS) \[+ -ELSE normal_cxx +] - $(NORMAL_TARGET_EXPORTS) \[+ -ENDIF raw_cxx +] - (cd $(TARGET_SUBDIR)/[+module+] && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) [+ - IF raw_cxx - +] 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' [+ - ENDIF raw_cxx - +] [+extra_make_flags+] all) -@endif target-[+module+] +[+ all prefix="target-" subdir="$(TARGET_SUBDIR)" + exports="$(RAW_CXX_TARGET_EXPORTS)" + args="$(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)'" +] +[+ ELSE +] +[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" + check_multilibs=true + exports="$(NORMAL_TARGET_EXPORTS)" + args="$(TARGET_CONFIGARGS)" no-config-site=true +] + +[+ all prefix="target-" subdir="$(TARGET_SUBDIR)" + exports="$(NORMAL_TARGET_EXPORTS)" + args="$(TARGET_FLAGS_TO_PASS)" +] +[+ ENDIF +] .PHONY: check-target-[+module+] maybe-check-target-[+module+] maybe-check-target-[+module+]: @@ -1096,9 +1009,9 @@ maybe-check-target-[+module+]: check-target-[+module+] check-target-[+module+]: [+ ELSE check +] check-target-[+module+]: + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \[+ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+ IF raw_cxx +] $(RAW_CXX_TARGET_EXPORTS) \[+ ELSE normal_cxx +] @@ -1122,9 +1035,9 @@ maybe-install-target-[+module+]: install-target-[+module+] install-target-[+module+]: [+ ELSE install +] install-target-[+module+]: installdirs + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \[+ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+ IF raw_cxx +] $(RAW_CXX_TARGET_EXPORTS) \[+ ELSE normal_cxx +] @@ -1135,7 +1048,7 @@ ENDIF raw_cxx +] [+ ENDIF no_install +] @endif target-[+module+] -# Other targets (info, dvi, etc.) +# Other targets (info, dvi, pdf, etc.) [+ FOR recursive_targets +] .PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+] maybe-[+make_target+]-target-[+module+]: @@ -1149,10 +1062,10 @@ maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+] FOR depend +]\ [+depend+]-target-[+module+] [+ ENDFOR depend +] + @: $(MAKE); $(unstage) @[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \[+ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \[+ IF raw_cxx +] $(RAW_CXX_TARGET_EXPORTS) \[+ ELSE normal_cxx +] @@ -1178,84 +1091,19 @@ ENDIF raw_cxx +] # GCC module # ---------- -# Unfortunately, while gcc _should_ be a host module, -# libgcc is a target module, and gen* programs are -# build modules. So GCC is a sort of hybrid. - -# gcc is the only module which uses GCC_FLAGS_TO_PASS. -# Don't use shared host config.cache, as it will confuse later -# directories; GCC wants slightly different values for some -# precious variables. *sigh* - -# We must skip configuring if toplevel bootstrap is going. -.PHONY: configure-gcc maybe-configure-gcc -maybe-configure-gcc: -@if gcc -maybe-configure-gcc: configure-gcc -configure-gcc: -@endif gcc @if gcc-no-bootstrap - @test ! -f gcc/Makefile || exit 0; \ - [ -d gcc ] || mkdir gcc; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in gcc; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif gcc-no-bootstrap - -# Don't 'make all' in gcc if it's already been made by 'bootstrap'; that -# causes trouble. This wart will be fixed eventually by moving -# the bootstrap behavior to this file. -.PHONY: all-gcc maybe-all-gcc -maybe-all-gcc: -@if gcc -maybe-all-gcc: all-gcc -all-gcc: configure-gcc -@endif gcc -@if gcc-no-bootstrap - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - if [ -f gcc/stage_last ] ; then \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \ - else \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) all); \ - fi +# GCC has some more recursive targets, which trigger the old +# (but still current, until the toplevel bootstrap project +# is finished) compiler bootstrapping rules. -# Building GCC uses some tools for rebuilding "source" files -# like texinfo, bison/byacc, etc. So we must depend on those. -# -# While building GCC, it may be necessary to run various target -# programs like the assembler, linker, etc. So we depend on -# those too. -# -# In theory, on an SMP all those dependencies can be resolved -# in parallel. -# GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap .PHONY: $(GCC_STRAP_TARGETS) -$(GCC_STRAP_TARGETS): all-bootstrap configure-gcc +$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Bootstrapping the compiler"; \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -1273,71 +1121,50 @@ $(GCC_STRAP_TARGETS): all-bootstrap configure-gcc msg="Comparing stage2 and stage3 of the compiler"; \ compare=compare ;; \ esac; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "$$msg"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all -profiledbootstrap: all-bootstrap configure-gcc +profiledbootstrap: all-prebootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ echo "Bootstrapping training compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Building feedback based compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all .PHONY: cross -cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld +cross: all-build all-gas all-ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Building the C and C++ compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all @endif gcc-no-bootstrap -.PHONY: check-gcc maybe-check-gcc -maybe-check-gcc: @if gcc -maybe-check-gcc: check-gcc -check-gcc: - @if [ -f ./gcc/Makefile ] ; then \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check); \ - else \ - true; \ - fi - .PHONY: check-gcc-c++ check-gcc-c++: @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ else \ @@ -1346,23 +1173,6 @@ check-gcc-c++: .PHONY: check-c++ check-c++: check-target-libstdc++-v3 check-gcc-c++ -@endif gcc - -.PHONY: install-gcc maybe-install-gcc -maybe-install-gcc: -@if gcc -maybe-install-gcc: install-gcc -install-gcc: - @if [ -f ./gcc/Makefile ] ; then \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ - else \ - true; \ - fi -@endif gcc # Install the gcc headers files, but not the fixed include files, # which Cygnus is not allowed to distribute. This rule is very @@ -1378,72 +1188,58 @@ gcc-no-fixedincludes: rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd ./gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ rm -rf gcc/include; \ mv gcc/tmp-include gcc/include 2>/dev/null; \ else true; fi - -# Other targets (dvi, info, etc.) -[+ FOR recursive_targets +] -.PHONY: maybe-[+make_target+]-gcc [+make_target+]-gcc -maybe-[+make_target+]-gcc: -@if gcc -maybe-[+make_target+]-gcc: [+make_target+]-gcc -[+make_target+]-gcc: [+ - FOR depend +]\ - [+depend+]-gcc [+ - ENDFOR depend +] - @[ -f ./gcc/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - for flag in $(EXTRA_GCC_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - $(HOST_EXPORTS) \ - echo "Doing [+make_target+] in gcc" ; \ - (cd gcc && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - [+make_target+]) \ - || exit 1 @endif gcc -[+ ENDFOR recursive_targets +] - -@if gcc-bootstrap # --------------------- # GCC bootstrap support # --------------------- -# We track the current stage (the one in 'gcc') in the stage_last file. +# We track the current stage (the one in 'gcc') in the stage_current file. +# stage_last instead tracks the stage that was built last. These targets +# are dummy when toplevel bootstrap is not active. + +# While making host and target tools, symlinks to the final stage must be +# there, so $(unstage) should be run at various points. To avoid excessive +# recursive invocations of make, we "inline" them using a variable. These +# must be referenced as ": $(MAKE) ; $(unstage)" rather than "$(unstage)" +# to avoid warnings from the GNU Make job server. + +unstage = : +stage = : +current_stage = "" + +@if gcc-bootstrap +unstage = if [ -f stage_last ]; then [ -f stage_current ] || $(MAKE) `cat stage_last`-start || exit 1; else :; fi +stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi +current_stage = "`cat stage_current 2> /dev/null`" +@endif gcc-bootstrap + +.PHONY: unstage stage +unstage: + @: $(MAKE); $(unstage) +stage: + @: $(MAKE); $(stage) + +# Disable commands for lean bootstrap. +LEAN = false + # We name the build directories for the various stages "stage1-gcc", # "stage2-gcc","stage3-gcc", etc. # Since the 'compare' process will fail (on debugging information) if any # directory names are different, we need to link the gcc directory for -# the previous stage to a constant name ('gcc-prev'), and to make the name of +# the previous stage to a constant name ('prev-gcc'), and to make the name of # the build directories constant as well. For the latter, we use naked names # like 'gcc', because the scripts in that directory assume it. We use # mv on platforms where symlinks to directories do not work or are not # reliable. -# At the end of the bootstrap, a symlink to 'stage3-gcc' named 'gcc' must -# be kept, so that libraries can find it. Ick! - -# It would be best to preinstall gcc into a staging area (and in the -# future, gather there all prebootstrap packages). This would allow -# assemblers and linkers can be bootstrapped as well as the compiler -# (both in a combined tree, or separately). This however requires some -# change to the gcc driver, again in order to avoid comparison failures. - -# Bugs: This is almost certainly not parallel-make safe. - # 'touch' doesn't work right on some platforms. STAMP = echo timestamp > @@ -1459,19 +1255,14 @@ STAGE1_LANGUAGES=@stage1_languages@ # We only want to compare .o files, so set this! objext = .o -# Real targets act phony if they depend on phony targets; this hack -# prevents gratuitous rebuilding of stage 1. -prebootstrap: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-bootstrap - $(STAMP) prebootstrap - # Flags to pass to stage2 and later makes. -BOOT_CFLAGS= -g -O2 POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/stage[+prev+]-gcc/ \ + STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \ CFLAGS="$(BOOT_CFLAGS)" \ - ADAC="\$$(CC)" + LIBCFLAGS="$(BOOT_CFLAGS)" \ + LDFLAGS="$(BOOT_LDFLAGS)" \ + "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" # For stage 1: # * We force-disable intermodule optimizations, even if @@ -1486,299 +1277,312 @@ POSTSTAGE1_FLAGS_TO_PASS = \ .PHONY: stage[+id+]-start stage[+id+]-end stage[+id+]-start:: - [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : - echo stage[+id+] > stage_last ; \ - [ -d stage[+id+]-gcc ] || mkdir stage[+id+]-gcc; \ - set stage[+id+]-gcc gcc ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \ - set stage[+prev+]-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +] - -stage[+id+]-end:: - rm -f stage_last ; \ - set gcc stage[+id+]-gcc ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \ - set prev-gcc stage[+prev+]-gcc ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +] - -# Bubble a bugfix through all the stages up to stage [+id+]. They -# are remade, but not reconfigured. The next stage (if any) will not -# be reconfigured as well. -.PHONY: stage[+id+]-bubble -stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] - @if [ -f all-stage[+id+]-gcc ] ; then \ - echo Remaking stage [+id+] ; \ - rm -f all-stage[+id+]-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]-gcc - -[+ IF prev +] -stage[+prev+]-bubble:: - @if [ -f configure-stage[+id+]-gcc ] ; then \ - $(STAMP) configure-stage[+id+]-gcc ; \ + @: $(MAKE); $(stage); \ + echo stage[+id+] > stage_current ; \ + echo stage[+id+] > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)[+ + FOR host_modules +][+ IF bootstrap +] +@if [+ module +] + @cd $(HOST_SUBDIR); [ -d stage[+id+]-[+module+] ] || \ + mkdir stage[+id+]-[+module+]; \ + mv stage[+id+]-[+module+] [+module+] [+ IF prev +] ; \ + mv stage[+prev+]-[+module+] prev-[+module+] || test -f stage[+prev+]-lean [+ ENDIF prev +] +@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] + @[ -d stage[+id+]-$(TARGET_SUBDIR) ] || \ + mkdir stage[+id+]-$(TARGET_SUBDIR); \ + mv stage[+id+]-$(TARGET_SUBDIR) $(TARGET_SUBDIR) [+ IF prev +] ; \ + mv stage[+prev+]-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage[+prev+]-lean [+ ENDIF prev +] + +stage[+id+]-end:: [+ FOR host_modules +][+ IF bootstrap +] +@if [+ module +] + @if test -d $(HOST_SUBDIR)/[+module+] ; then \ + cd $(HOST_SUBDIR); mv [+module+] stage[+id+]-[+module+] [+ IF prev +]; \ + mv prev-[+module+] stage[+prev+]-[+module+] ; : [+ ENDIF prev +] ; \ fi -[+ ENDIF prev +] - -configure-stage[+id+]-gcc: [+ IF prev +] all-stage[+prev+]-gcc [+ - ELSE +] prebootstrap [+ ENDIF prev +] - $(MAKE) stage[+id+]-start - @if [ -f stage[+id+]-gcc/Makefile ] ; then \ - $(STAMP) configure-stage[+id+]-gcc ; \ - exit 0; \ - else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \ - $(STAGE_HOST_EXPORTS) [+ ELSE prev +] \ - $(HOST_EXPORTS) [+ ENDIF prev +] \ - echo Configuring stage [+id+] in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - [+extra_configure_flags+] && \ - $(STAMP) ../configure-stage[+id+]-gcc +@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +] + @if test -d $(TARGET_SUBDIR) ; then \ + mv $(TARGET_SUBDIR) stage[+id+]-$(TARGET_SUBDIR) [+ IF prev +] ; \ + mv prev-$(TARGET_SUBDIR) stage[+prev+]-$(TARGET_SUBDIR) ; : [+ ENDIF prev +] ; \ + fi + rm -f stage_current -all-stage[+id+]-gcc: configure-stage[+id+]-gcc - $(MAKE) stage[+id+]-start +# Bubble a bugfix through all the stages up to stage [+id+]. They are +# remade, but not reconfigured. The next stage (if any) will not be +# reconfigured as well. +.PHONY: stage[+id+]-bubble +stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +] @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \ - $(STAGE_HOST_EXPORTS) [+ ELSE prev +] \ - $(HOST_EXPORTS) [+ ENDIF prev +] \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) [+ IF prev +] \ - $(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \ - [+extra_make_flags+] && $(STAMP) ../all-stage[+id+]-gcc - + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stage[+id+]-lean [+ + IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \ + echo Skipping rebuild of stage[+id+] ; \ + else \ + $(MAKE) stage[+id+]-start; \[+IF lean +] + if $(LEAN); then \ + rm -rf stage[+lean+]-* ; \ + $(STAMP) stage[+lean+]-lean ; \ + fi; \[+ ENDIF lean +] + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \ + fi[+ IF compare-target +] + $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+compare-target+][+ ENDIF compare-target +] + +.PHONY: all-stage[+id+] clean-stage[+id+] +do-clean: clean-stage[+id+] + +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap [+ IF compare-target +] -[+compare-target+]: all-stage[+id+]-gcc - [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : +[+compare-target+]: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stage[+prev+]-lean; then \ + echo Cannot compare object files as stage [+prev+] was deleted. ; \ + exit 0 ; \ + fi; \ + : $(MAKE); $(stage); \ rm -f .bad_compare ; \ + echo Comparing stages [+prev+] and [+id+] ; \ cd stage[+id+]-gcc; \ files=`find . -name "*$(objext)" -print` ; \ cd .. ; \ for file in $${files} ; do \ f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \ @do_compare@ > /dev/null 2>&1; \ - test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \ + if test $$? -eq 1; then \ + case $$file in \ + ./cc*-checksum$(objext) | ./libgcc/* ) \ + echo warning: $$file differs ;; \ + *) \ + echo $$file differs >> .bad_compare ;; \ + esac ; \ + fi ; \ done ; \ if [ -f .bad_compare ]; then \ echo "Bootstrap comparison failure!"; \ cat .bad_compare; \ exit 1; \ else \ - true; \ + echo Comparison successful.; \ fi ; \ - $(STAMP) [+compare-target+] + $(STAMP) [+compare-target+][+ IF prev +] + if $(LEAN); then \ + rm -rf stage[+prev+]-*; \ + $(STAMP) stage[+prev+]-lean; \ + fi[+ ENDIF prev +] [+ ENDIF compare-target +] [+ IF bootstrap-target +] -.PHONY: [+bootstrap-target+] +.PHONY: [+bootstrap-target+] [+bootstrap-target+]-lean [+bootstrap-target+]: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble [+ - IF compare-target +] [+compare-target+] [+ - ENDIF compare-target +] \ - stage[+id+]-start all stage[+id+]-end -[+ ENDIF bootstrap-target +] + echo stage[+id+] > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage[+id+]-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target -.PHONY: restage[+id+] touch-stage[+id+] distclean-stage[+id+] +[+bootstrap-target+]-lean: + echo stage[+id+] > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage[+id+]-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target +[+ ENDIF bootstrap-target +] -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap [+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +] +.PHONY: distclean-stage[+id+] distclean-stage[+id+]:: - [ -f stage_last ] && $(MAKE) `cat stage_last`-end || : - rm -rf configure-stage[+id+]-gcc all-stage[+id+]-gcc stage[+id+]-gcc [+ + @: $(MAKE); $(stage) + rm -rf stage[+id+]-* [+ IF compare-target +][+compare-target+] [+ ENDIF compare-target +] -# Rules to renew the timestamp on a stage and all the following ones -[+ IF prev +]touch-stage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +] -touch-stage[+id+]:: - @[ -f configure-stage[+id+]-gcc ] && \ - echo '$(STAMP) configure-stage[+id+]-gcc' && \ - $(STAMP) configure-stage[+id+]-gcc; \ - [ -f all-stage[+id+]-gcc ] && \ - echo '$(STAMP) all-stage[+id+]-gcc' && \ - $(STAMP) all-stage[+id+]-gcc; \ - : - -# After building a stage, touch the following ones -[+ IF prev +]restage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +] -restage[+id+]:: - rm -rf all-stage[+id+]-gcc [+ - IF compare-target +][+compare-target+] [+ ENDIF compare-target +] - $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+ - IF compare-target +][+compare-target+] [+ - ELSE +] all-stage[+id+]-gcc [+ ENDIF compare-target +] - [+ IF cleanstrap-target +] .PHONY: [+cleanstrap-target+] -[+cleanstrap-target+]: distclean-stage1 [+bootstrap-target+] +[+cleanstrap-target+]: distclean [+bootstrap-target+] [+ ENDIF cleanstrap-target +] +@endif gcc-bootstrap [+ ENDFOR bootstrap-stage +] -stagefeedback-start:: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - cd stageprofile-gcc && \ - { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \ - { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); } +stageprofile-end:: + $(MAKE) distclean-stagefeedback -profiledbootstrap: all-bootstrap configure-gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - echo "Bootstrapping the compiler"; \ - $(MAKE) stageprofile-bubble distclean-stagefeedback stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ - echo "Building runtime libraries and training compiler"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all +stagefeedback-start:: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - echo "Building feedback based compiler"; \ - $(MAKE) stagefeedback-bubble stagefeedback-end + for i in prev-*; do \ + j=`echo $$i | sed s/^prev-//` ; \ + cd $$r/$$i && \ + { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \ + { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \ + done +@if gcc-bootstrap +do-distclean: distclean-stage1 + +# Provide a GCC build when we're building target libraries. This does +# not work as a dependency, just as the minimum necessary to avoid errors. +stage_last: + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage1-bubble + +# Same as unstage, but not phony and defaulting to stage1-start. We place +# it in the dependency so that for example `make -j3 all-gcc' works. +stage_current: + @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi + +.PHONY: restrap +restrap: + @: $(MAKE); $(stage) + rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev + +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +] + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all @endif gcc-bootstrap # -------------------------------------- # Dependencies between different modules # -------------------------------------- +# Generic dependencies for target modules on host stuff, especially gcc +@if gcc-bootstrap[+ FOR target_modules +][+ IF bootstrap + +][+ FOR bootstrap_stage +] +configure-stage[+id+]-target-[+module+]: maybe-all-stage[+id+]-gcc[+ + ENDFOR +][+ ELSE bootstrap +] +configure-target-[+module+]: stage_last[+ + ENDIF bootstrap +][+ ENDFOR target_modules +] +@endif gcc-bootstrap + +@if gcc-no-bootstrap[+ FOR target_modules +][+ IF bootstrap + +][+ ELSE +] +configure-target-[+module+]: maybe-all-gcc[+ + ENDIF bootstrap +][+ ENDFOR target_modules +] +@endif gcc-no-bootstrap + + +[+ FOR lang_env_dependencies +] +configure-target-[+module+]: maybe-all-target-newlib maybe-all-target-libgloss +[+ IF cxx +]configure-target-[+module+]: maybe-all-target-libstdc++-v3 +[+ ENDIF cxx +][+ ENDFOR lang_env_dependencies +] + # There are two types of dependencies here: 'hard' dependencies, where one # module simply won't build without the other; and 'soft' dependencies, where # if the depended-on module is missing, the depending module will do without # or find a substitute somewhere (perhaps installed). Soft dependencies -# are specified by depending on a 'maybe-' target. If you're not sure, +# are made here to depend on a 'maybe-' target. If you're not sure, # it's safer to use a soft dependency. -# Build modules -all-build-bison: maybe-all-build-texinfo -all-build-flex: maybe-all-build-texinfo -all-build-libiberty: maybe-all-build-texinfo -all-build-m4: maybe-all-build-libiberty maybe-all-build-texinfo - -# Host modules specific to gcc. -# GCC needs to identify certain tools. -# GCC also needs the information exported by the intl configure script. -configure-gcc: maybe-configure-intl maybe-configure-binutils maybe-configure-gas maybe-configure-ld maybe-configure-bison maybe-configure-flex -all-gcc: maybe-all-libiberty maybe-all-intl maybe-all-texinfo maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-binutils maybe-all-gas maybe-all-ld maybe-all-zlib maybe-all-libbanshee maybe-all-libcpp -configure-libcpp: maybe-configure-libiberty maybe-configure-intl -all-libcpp: maybe-all-libiberty maybe-all-intl -# This is a slightly kludgy method of getting dependencies on -# all-build-libiberty correct; it would be better to build it every time. -all-gcc: maybe-all-build-libiberty -all-bootstrap: [+ FOR host_modules +][+ IF bootstrap +]maybe-all-[+module+] [+ ENDIF bootstrap +][+ ENDFOR host_modules +] - -# Host modules specific to gdb. -# GDB needs to know that the simulator is being built. -configure-gdb: maybe-configure-itcl maybe-configure-tcl maybe-configure-tk maybe-configure-sim +[+ ;; These Scheme functions build the bulk of the dependencies. + ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc", + ;; where "maybe-" is only included if HARD is true, and all-gcc + ;; is taken from VAR-NAME. + (define dep-target (lambda (module-kind var-name hard) + (string-append + (if hard "" "maybe-") + (dep-subtarget var-name) + module-kind + (dep-module var-name) + ))) + + ;; make-dep builds a dependency from the MODULE and ON AutoGen vars. + (define make-dep (lambda (module-kind on-kind) + (string-append + (dep-target module-kind "module" #t) ": " + (dep-target on-kind "on" (exist? "hard"))))) + + ;; dep-subtarget extracts everything up to the first dash in the given + ;; AutoGen variable, for example it extracts "all-" out of "all-gcc". + (define dep-subtarget (lambda (var-name) + (substring (get var-name) 0 (+ 1 (string-index (get var-name) #\-))))) + + ;; dep-module extracts everything up to the first dash in the given + ;; AutoGen variable, for example it extracts "gcc" out of "all-gcc". + (define dep-module (lambda (var-name) + (substring (get var-name) (+ 1 (string-index (get var-name) #\-))))) + + ;; dep-stage builds a string for the prefix of a bootstrap stage. + (define dep-stage (lambda () + (string-append + "stage" + (get "id") + "-"))) + + ;; dep-maybe is the same as the AutoGen expression "- hard 'maybe-'" + ;; but is written in Scheme. + (define dep-maybe (lambda () + (if (exist? "hard") "" "maybe-"))) + + ;; dep-kind returns "normal" if the dependency is on an "install" target, + ;; or if either module is not bootstrapped. It returns "bootstrap" for + ;; configure or build dependencies between bootstrapped modules; it returns + ;; "prebootstrap" for configure or build dependencies of bootstrapped + ;; modules on a build module (e.g. all-gcc on all-build-bison). All this + ;; is only necessary for host modules. + (define dep-kind (lambda () + (if (and (hash-ref boot-modules (dep-module "module")) + (=* (dep-module "on") "build-")) + "prebootstrap" + + (if (or (= (dep-subtarget "on") "install-") + (not (hash-ref boot-modules (dep-module "module"))) + (not (hash-ref boot-modules (dep-module "on")))) + "normal" + "bootstrap")))) + + ;; We now build the hash table that is used by dep-kind. + (define boot-modules (make-hash-table 113)) ++] + +[+ FOR host_modules +][+ + (if (exist? "bootstrap") + (hash-create-handle! boot-modules (get "module") #t)) + "" +][+ ENDFOR host_modules +] +[+ FOR target_modules +][+ + (if (exist? "bootstrap") + (hash-create-handle! boot-modules (string-append "target-" (get "module")) #t)) + "" +][+ ENDFOR target_modules +] + +# With all the machinery above in place, it is pretty easy to generate +# dependencies. Host dependencies are a bit more complex because we have +# to check for bootstrap/prebootstrap dependencies. To resolve +# prebootstrap dependencies, prebootstrap modules are gathered in +# a hash table. +[+ FOR dependencies +][+ (make-dep "" "") +] +[+ CASE (dep-kind) +] +[+ == "prebootstrap" + +][+ FOR bootstrap_stage +] +[+ (make-dep (dep-stage) "") +][+ + ENDFOR bootstrap_stage +] +all-prebootstrap: [+ (dep-target "" "on" (exist? "hard")) +] +[+ == "bootstrap" + +][+ FOR bootstrap_stage +] +[+ (make-dep (dep-stage) (dep-stage)) +][+ + ENDFOR bootstrap_stage +] +[+ ESAC +][+ +ENDFOR dependencies +] + +# Non-toplevel bootstrap rules must depend on several packages, to be built +# before gcc. Another wart that will go away, hopefully soon. +@if gcc-no-bootstrap +[+ FOR host_modules +][+ + IF (and (not (= (get "module") "gcc")) + (hash-ref boot-modules (get "module"))) +] +all-prebootstrap: maybe-all-[+module+][+ + ENDIF +][+ +ENDFOR host_modules +] +@endif gcc-no-bootstrap + +CONFIGURE_GDB_TK = @CONFIGURE_GDB_TK@ GDB_TK = @GDB_TK@ -all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK) -install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui -configure-libgui: maybe-configure-tcl maybe-configure-tk -all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl - -# Host modules specific to binutils. -configure-bfd: configure-libiberty -all-bfd: maybe-all-libiberty maybe-all-intl -all-binutils: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-flex maybe-all-bison maybe-all-byacc maybe-all-intl -# We put install-opcodes before install-binutils because the installed -# binutils might be on PATH, and they might need the shared opcodes -# library. -install-binutils: maybe-install-opcodes -# libopcodes depends on libbfd -install-opcodes: maybe-install-bfd -all-gas: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-intl -all-gprof: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-intl -all-ld: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-bison maybe-all-byacc maybe-all-flex maybe-all-intl -all-opcodes: maybe-all-bfd maybe-all-libiberty - -# Other host modules in the 'src' repository. -all-dejagnu: maybe-all-tcl maybe-all-expect maybe-all-tk -configure-expect: maybe-configure-tcl maybe-configure-tk -all-expect: maybe-all-tcl maybe-all-tk -configure-itcl: maybe-configure-tcl maybe-configure-tk -all-itcl: maybe-all-tcl maybe-all-tk -# We put install-tcl before install-itcl because itcl wants to run a -# program on installation which uses the Tcl libraries. -install-itcl: maybe-install-tcl -all-sid: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-tcl maybe-all-tk -install-sid: maybe-install-tcl maybe-install-tk -all-sim: maybe-all-libiberty maybe-all-bfd maybe-all-opcodes maybe-all-readline maybe-configure-gdb -configure-tk: maybe-configure-tcl -all-tk: maybe-all-tcl -configure-tix: maybe-configure-tcl maybe-configure-tk -all-tix: maybe-all-tcl maybe-all-tk -all-texinfo: maybe-all-libiberty - -# Other host modules. Warning, these are not well tested. -all-autoconf: maybe-all-m4 maybe-all-texinfo -all-automake: maybe-all-m4 maybe-all-texinfo -all-bison: maybe-all-texinfo -all-diff: maybe-all-libiberty -all-fastjar: maybe-all-zlib maybe-all-libiberty -all-fileutils: maybe-all-libiberty -all-flex: maybe-all-libiberty maybe-all-bison maybe-all-byacc -all-gzip: maybe-all-libiberty -all-hello: maybe-all-libiberty -all-m4: maybe-all-libiberty maybe-all-texinfo -all-make: maybe-all-libiberty maybe-all-intl -all-patch: maybe-all-libiberty -all-prms: maybe-all-libiberty -all-recode: maybe-all-libiberty -all-sed: maybe-all-libiberty -all-send-pr: maybe-all-prms -all-tar: maybe-all-libiberty -all-uudecode: maybe-all-libiberty - -ALL_GCC = maybe-all-gcc -ALL_GCC_C = $(ALL_GCC) maybe-all-target-newlib maybe-all-target-libgloss -ALL_GCC_CXX = $(ALL_GCC_C) maybe-all-target-libstdc++-v3 - -# Target modules specific to gcc. -configure-target-boehm-gc: $(ALL_GCC_C) maybe-configure-target-qthreads -configure-target-fastjar: maybe-configure-target-zlib -all-target-fastjar: maybe-all-target-zlib maybe-all-target-libiberty -configure-target-libada: $(ALL_GCC_C) -configure-target-libgfortran: $(ALL_GCC_C) -configure-target-libffi: $(ALL_GCC_C) -configure-target-libjava: $(ALL_GCC_C) maybe-configure-target-zlib maybe-configure-target-boehm-gc maybe-configure-target-qthreads maybe-configure-target-libffi -all-target-libjava: maybe-all-fastjar maybe-all-target-zlib maybe-all-target-boehm-gc maybe-all-target-qthreads maybe-all-target-libffi -configure-target-libobjc: $(ALL_GCC_C) -all-target-libobjc: maybe-all-target-libiberty -configure-target-libstdc++-v3: $(ALL_GCC_C) -all-target-libstdc++-v3: maybe-all-target-libiberty -configure-target-zlib: $(ALL_GCC_C) - -# Target modules in the 'src' repository. -configure-target-examples: $(ALL_GCC_C) -configure-target-libgloss: $(ALL_GCC) -all-target-libgloss: maybe-configure-target-newlib -configure-target-libiberty: $(ALL_GCC) -configure-target-libtermcap: $(ALL_GCC_C) -configure-target-newlib: $(ALL_GCC) -configure-target-rda: $(ALL_GCC_C) -configure-target-winsup: $(ALL_GCC_C) -all-target-winsup: maybe-all-target-libiberty maybe-all-target-libtermcap - -# Other target modules. Warning, these are not well tested. -configure-target-gperf: $(ALL_GCC_CXX) -all-target-gperf: maybe-all-target-libiberty maybe-all-target-libstdc++-v3 -configure-target-qthreads: $(ALL_GCC_C) +INSTALL_GDB_TK = @INSTALL_GDB_TK@ +configure-gdb: $(CONFIGURE_GDB_TK) +all-gdb: $(gdbnlmrequirements) $(GDB_TK) +install-gdb: $(INSTALL_GDB_TK) # Serialization dependencies. Host configures don't work well in parallel to # each other, due to contention over config.cache. Target configures and @@ -1789,17 +1593,6 @@ configure-target-qthreads: $(ALL_GCC_C) # Regenerating top level configury # -------------------------------- -# Multilib.out tells target dirs what multilibs they should build. -# There is really only one copy. We use the 'timestamp' method to -# work around various timestamp bugs on some systems. -# We use move-if-change so that it's only considered updated when it -# actually changes, because it has to depend on a phony target. -multilib.out: maybe-all-gcc - @r=`${PWD_COMMAND}`; export r; \ - echo "Checking multilib configuration..."; \ - $(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \ - $(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \ - # Rebuilding Makefile.in, using autogen. AUTOGEN = autogen $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def @@ -1809,7 +1602,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.status: configure $(gcc_version_trigger) +config.status: configure CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck # Rebuilding configure.