From 14a1406e83f97db483c87146dbba5664047e929f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 19 Dec 2006 12:52:58 +0000 Subject: 2006-12-19 Paolo Bonzini Sync with gcc: 2006-12-19 Paolo Bonzini * configure.in: Remove "$build" case for powerpc-*-darwin* since it only affects bootstrap and could be tested on "$host" as well. * configure: Regenerate. * config/mh-ppc-darwin: Add to the stage1 cflags here. 2006-12-19 Paolo Bonzini PR bootstrap/29544 * Makefile.def (flags_to_pass): Add STAGE1_CHECKING. (bootstrap_stage): Add STAGE1_CHECKING to stage1 configure flags, move here comment from Makefile.tpl. * Makefile.tpl: Move some definitions higher in the file. (STAGE1_CHECKING): New. * configure.in: Add --enable-stage1-checking. * configure: Regenerate. * Makefile.in: Regenerate. 2006-12-03 Kaveh R. Ghazi * configure.in: Update error message for missing GMP/MPFR. * configure: Regenerate. 2006-12-02 Kaveh R. Ghazi * configure.in: Update MPFR version in error message. * configure: Regenerate. 2006-11-26 Kaveh R. Ghazi * configure.in (--with-mpfr-dir, --with-gmp-dir): Remove flags. (--with-mpfr-include, --with-mpfr-lib, --with-gmp-include, --with-gmp-lib): New flags. * configure: Regenerate. config: 2006-12-04 Eric Botcazou * tls.m4 (GCC_CHECK_TLS): Do not test TLS with static linking if static linking doesn't even work. --- Makefile.tpl | 47 ++++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 27 deletions(-) (limited to 'Makefile.tpl') diff --git a/Makefile.tpl b/Makefile.tpl index 967b5b0ad..7d5cb9a6c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -300,6 +300,16 @@ CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates PICFLAG = +# Only build the C compiler for stage1, because that is the only one that +# we can guarantee will build with the native compiler, and also it is the +# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS), +# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them +# overrideable (for a bootstrap build stage1 also builds gcc.info). + +STAGE1_CFLAGS=@stage1_cflags@ +STAGE1_CHECKING=@stage1_checking@ +STAGE1_LANGUAGES=@stage1_languages@ + # ----------------------------------------------- # Programs producing files for the TARGET machine # ----------------------------------------------- @@ -431,6 +441,16 @@ X11_FLAGS_TO_PASS = \ 'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \ 'X11_EXTRA_LIBS=$(X11_EXTRA_LIBS)' +# Flags to pass to stage2 and later makes. + +POSTSTAGE1_FLAGS_TO_PASS = \ + CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ + STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \ + CFLAGS="$(BOOT_CFLAGS)" \ + LIBCFLAGS="$(BOOT_CFLAGS)" \ + LDFLAGS="$(BOOT_LDFLAGS)" \ + "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" + # Flags to pass down to makes which are built with the target environment. # 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 @@ -1246,36 +1266,9 @@ LEAN = false # 'touch' doesn't work right on some platforms. STAMP = echo timestamp > -# Only build the C compiler for stage1, because that is the only one that -# we can guarantee will build with the native compiler, and also it is the -# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS), -# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them -# overrideable (for a bootstrap build stage1 also builds gcc.info). - -STAGE1_CFLAGS=@stage1_cflags@ -STAGE1_LANGUAGES=@stage1_languages@ - # We only want to compare .o files, so set this! objext = .o -# Flags to pass to stage2 and later makes. -POSTSTAGE1_FLAGS_TO_PASS = \ - CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \ - CFLAGS="$(BOOT_CFLAGS)" \ - LIBCFLAGS="$(BOOT_CFLAGS)" \ - LDFLAGS="$(BOOT_LDFLAGS)" \ - "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" - -# For stage 1: -# * We force-disable intermodule optimizations, even if -# --enable-intermodule was passed, since the installed compiler probably -# can't handle them. Luckily, autoconf always respects -# the last argument when conflicting --enable arguments are passed. -# * Likewise, we force-disable coverage flags, since the installed compiler -# probably has never heard of them. -# * We build only C (and possibly Ada). - [+ FOR bootstrap-stage +] .PHONY: stage[+id+]-start stage[+id+]-end -- cgit v1.2.3