2002-11-14 20:44:41 +01:00
|
|
|
[+ AutoGen5 template -*- Mode: Makefile -*-
|
2002-09-25 00:51:57 +02:00
|
|
|
in
|
|
|
|
+]
|
|
|
|
|
|
|
|
# Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
|
|
|
|
#
|
|
|
|
# Makefile for directory with subdirs to build.
|
|
|
|
# Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
|
2004-05-25 21:37:26 +02:00
|
|
|
# 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
|
2002-09-25 00:51:57 +02:00
|
|
|
#
|
|
|
|
# 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
|
|
|
|
# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# 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.
|
|
|
|
#
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# -------------------------------
|
|
|
|
# Standard Autoconf-set variables
|
|
|
|
# -------------------------------
|
2002-12-16 19:23:00 +01:00
|
|
|
VPATH=@srcdir@
|
|
|
|
|
|
|
|
build_alias=@build_alias@
|
2003-06-11 00:24:39 +02:00
|
|
|
build=@build@
|
2002-12-16 19:23:00 +01:00
|
|
|
host_alias=@host_alias@
|
2003-06-11 00:24:39 +02:00
|
|
|
host=@host@
|
2002-12-16 19:23:00 +01:00
|
|
|
target_alias=@target_alias@
|
2003-06-11 00:24:39 +02:00
|
|
|
target=@target@
|
2002-12-16 19:23:00 +01:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
program_transform_name = @program_transform_name@
|
2002-09-26 06:14:02 +02:00
|
|
|
|
|
|
|
prefix = @prefix@
|
|
|
|
exec_prefix = @exec_prefix@
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
srcdir = @srcdir@
|
|
|
|
|
2002-09-26 06:14:02 +02:00
|
|
|
bindir = @bindir@
|
|
|
|
sbindir = @sbindir@
|
|
|
|
libexecdir = @libexecdir@
|
|
|
|
datadir = @datadir@
|
|
|
|
sysconfdir = @sysconfdir@
|
|
|
|
sharedstatedir = @sharedstatedir@
|
|
|
|
localstatedir = @localstatedir@
|
|
|
|
libdir = @libdir@
|
|
|
|
includedir = @includedir@
|
|
|
|
oldincludedir = @oldincludedir@
|
|
|
|
infodir = @infodir@
|
|
|
|
mandir = @mandir@
|
2002-09-25 00:51:57 +02:00
|
|
|
man1dir = $(mandir)/man1
|
|
|
|
man2dir = $(mandir)/man2
|
|
|
|
man3dir = $(mandir)/man3
|
|
|
|
man4dir = $(mandir)/man4
|
|
|
|
man5dir = $(mandir)/man5
|
|
|
|
man6dir = $(mandir)/man6
|
|
|
|
man7dir = $(mandir)/man7
|
|
|
|
man8dir = $(mandir)/man8
|
|
|
|
man9dir = $(mandir)/man9
|
|
|
|
|
2003-07-13 22:47:31 +02:00
|
|
|
INSTALL = @INSTALL@
|
|
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
|
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
|
|
INSTALL_DATA = @INSTALL_DATA@
|
2004-06-09 10:17:32 +02:00
|
|
|
LN = @LN@
|
|
|
|
LN_S = @LN_S@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# -------------------------------------------------
|
|
|
|
# Miscellaneous non-standard autoconf-set variables
|
|
|
|
# -------------------------------------------------
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# The file containing GCC's version number.
|
|
|
|
gcc_version_trigger = @gcc_version_trigger@
|
|
|
|
gcc_version = @gcc_version@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# The gcc driver likes to know the arguments it was configured with.
|
|
|
|
TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
gxx_include_dir = @gxx_include_dir@
|
|
|
|
libstdcxx_incdir = @libstdcxx_incdir@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
tooldir = @tooldir@
|
|
|
|
build_tooldir = @build_tooldir@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# Directory in which the compiler finds executables, libraries, etc.
|
2003-08-01 01:36:43 +02:00
|
|
|
libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
|
2003-02-28 19:01:54 +01:00
|
|
|
GDB_NLM_DEPS =
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# This is the name of the environment variable used for the path to
|
|
|
|
# the libraries.
|
|
|
|
RPATH_ENVVAR = @RPATH_ENVVAR@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
|
|
|
|
# was used.
|
|
|
|
SET_LIB_PATH = @SET_LIB_PATH@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# 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);
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# This is the list of directories to be built for the build system.
|
2004-05-13 08:41:07 +02:00
|
|
|
BUILD_CONFIGDIRS = libiberty libbanshee
|
2003-02-28 19:01:54 +01:00
|
|
|
# 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@
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
|
|
|
|
# This is the list of variables to export in the environment when
|
|
|
|
# configuring any subdirectory. It must also be exported whenever
|
|
|
|
# recursing into a build directory in case that directory's Makefile
|
|
|
|
# re-runs configure.
|
|
|
|
BASE_EXPORTS = \
|
|
|
|
FLEX="$(FLEX)"; export FLEX; \
|
|
|
|
LEX="$(LEX)"; export LEX; \
|
|
|
|
BISON="$(BISON)"; export BISON; \
|
|
|
|
YACC="$(YACC)"; export YACC; \
|
|
|
|
M4="$(M4)"; export M4; \
|
|
|
|
MAKEINFO="$(MAKEINFO)"; export MAKEINFO;
|
|
|
|
|
2004-05-25 21:37:26 +02:00
|
|
|
# This is the list of variables to export in the environment when
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
# configuring subdirectories for the build system.
|
2004-05-25 21:37:26 +02:00
|
|
|
BUILD_EXPORTS = \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
$(BASE_EXPORTS) \
|
2004-05-25 21:37:26 +02:00
|
|
|
AR="$(AR_FOR_BUILD)"; export AR; \
|
|
|
|
AS="$(AS_FOR_BUILD)"; export AS; \
|
|
|
|
CC="$(CC_FOR_BUILD)"; export CC; \
|
|
|
|
CFLAGS="$(CFLAGS_FOR_BUILD)"; export CFLAGS; \
|
|
|
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
|
|
|
CXX="$(CXX_FOR_BUILD)"; export CXX; \
|
|
|
|
CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
|
|
|
|
GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
|
|
|
|
GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
|
|
|
|
DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
|
|
|
|
LD="$(LD_FOR_BUILD)"; export LD; \
|
|
|
|
LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
|
|
|
|
NM="$(NM_FOR_BUILD)"; export NM; \
|
|
|
|
RANLIB="$(RANLIB_FOR_BUILD)"; export RANLIB; \
|
|
|
|
WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES;
|
2003-02-28 19:01:54 +01:00
|
|
|
|
|
|
|
# This is the list of directories to built for the host system.
|
|
|
|
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@
|
2004-05-25 21:37:26 +02:00
|
|
|
# This is the list of variables to export in the environment when
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
# configuring subdirectories for the host system.
|
2004-05-25 21:37:26 +02:00
|
|
|
HOST_EXPORTS = \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
$(BASE_EXPORTS) \
|
2004-05-25 21:37:26 +02:00
|
|
|
CC="$(CC)"; export CC; \
|
|
|
|
CFLAGS="$(CFLAGS)"; export CFLAGS; \
|
|
|
|
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
|
|
|
|
CXX="$(CXX)"; export CXX; \
|
|
|
|
CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
|
|
|
|
AR="$(AR)"; export AR; \
|
|
|
|
AS="$(AS)"; export AS; \
|
|
|
|
CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
|
|
|
|
DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
|
|
|
|
LD="$(LD)"; export LD; \
|
|
|
|
LDFLAGS="$(LDFLAGS)"; export LDFLAGS; \
|
|
|
|
NM="$(NM)"; export NM; \
|
|
|
|
RANLIB="$(RANLIB)"; export RANLIB; \
|
|
|
|
WINDRES="$(WINDRES)"; export WINDRES; \
|
|
|
|
OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
|
2004-06-23 11:10:36 +02:00
|
|
|
OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
|
2004-05-25 21:37:26 +02:00
|
|
|
TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \
|
|
|
|
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
|
|
|
|
GMPINC="$(HOST_GMPINC)"; export GMPINC;
|
|
|
|
|
|
|
|
# Similar, for later GCC stages.
|
|
|
|
STAGE_HOST_EXPORTS = \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2004-05-25 21:37:26 +02:00
|
|
|
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;
|
2003-02-28 19:01:54 +01:00
|
|
|
|
|
|
|
# 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@
|
2004-05-25 21:37:26 +02:00
|
|
|
# This is the list of variables to export in the environment when
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
# configuring subdirectories for the host system.
|
2004-05-25 21:37:26 +02:00
|
|
|
BASE_TARGET_EXPORTS = \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
$(BASE_EXPORTS) \
|
2004-05-25 21:37:26 +02:00
|
|
|
AR="$(AR_FOR_TARGET)"; export AR; \
|
|
|
|
AS="$(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; \
|
|
|
|
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; \
|
|
|
|
LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
|
|
|
|
NM="$(NM_FOR_TARGET)"; export NM; \
|
|
|
|
RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \
|
|
|
|
WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES;
|
|
|
|
|
|
|
|
RAW_CXX_TARGET_EXPORTS = \
|
|
|
|
$(BASE_TARGET_EXPORTS) \
|
|
|
|
CXX_FOR_TARGET="$(RAW_CXX_FOR_TARGET)"; export CXX_FOR_TARGET; \
|
|
|
|
CXX="$(RAW_CXX_FOR_TARGET)"; export CXX;
|
|
|
|
|
|
|
|
NORMAL_TARGET_EXPORTS = \
|
|
|
|
$(BASE_TARGET_EXPORTS) \
|
|
|
|
CXX="$(CXX_FOR_TARGET)"; export CXX;
|
2003-02-28 19:01:54 +01:00
|
|
|
|
2004-05-13 08:41:07 +02:00
|
|
|
# Where to find GMP
|
|
|
|
HOST_GMPLIBS = @gmplibs@
|
|
|
|
HOST_GMPINC = @gmpinc@
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# ----------------------------------------------
|
|
|
|
# Programs producing files for the BUILD machine
|
|
|
|
# ----------------------------------------------
|
|
|
|
|
|
|
|
SHELL = @config_shell@
|
|
|
|
|
|
|
|
# pwd command to use. Allow user to override default by setting PWDCMD in
|
|
|
|
# the environment to account for automounters. The make variable must not
|
|
|
|
# be called PWDCMD, otherwise the value set here is passed to make
|
|
|
|
# subprocesses and overrides the setting from the user's environment.
|
2003-07-04 21:45:55 +02:00
|
|
|
# Don't use PWD since it is a common shell environment variable and we
|
|
|
|
# don't want to corrupt it.
|
|
|
|
PWD_COMMAND = $${PWDCMD-pwd}
|
2003-02-28 19:01:54 +01:00
|
|
|
|
|
|
|
# compilers to use to create programs which must be run in the build
|
|
|
|
# environment.
|
|
|
|
CC_FOR_BUILD = @CC_FOR_BUILD@
|
2003-10-06 05:40:08 +02:00
|
|
|
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
2003-02-28 19:01:54 +01:00
|
|
|
|
|
|
|
CXX_FOR_BUILD = $(CXX)
|
|
|
|
|
|
|
|
# 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@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
CONFIGURED_BISON = @CONFIGURED_BISON@
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
|
|
|
|
echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
echo ${CONFIGURED_BISON} ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi`
|
|
|
|
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
CONFIGURED_YACC = @CONFIGURED_YACC@
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \
|
|
|
|
echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \
|
|
|
|
elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \
|
|
|
|
echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
echo ${CONFIGURED_YACC} ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi`
|
|
|
|
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
CONFIGURED_FLEX = @CONFIGURED_FLEX@
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
|
|
|
|
then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
else echo ${CONFIGURED_FLEX} ; fi`
|
|
|
|
|
|
|
|
CONFIGURED_LEX = @CONFIGURED_LEX@
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \
|
|
|
|
then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
else echo ${CONFIGURED_LEX} ; fi`
|
2002-09-25 00:51:57 +02:00
|
|
|
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
CONFIGURED_M4 = @CONFIGURED_M4@
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \
|
|
|
|
then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
else echo ${CONFIGURED_M4} ; fi`
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-05-03 03:29:54 +02:00
|
|
|
# For an installed makeinfo, we require it to be from texinfo 4.2 or
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
# 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@
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
|
|
|
|
then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
else if (${CONFIGURED_MAKEINFO} --version \
|
2003-05-03 03:29:54 +02:00
|
|
|
| egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
# This just becomes part of the MAKEINFO definition passed down to
|
|
|
|
# sub-makes. It lets flags be given on the command line while still
|
|
|
|
# using the makeinfo from the object tree.
|
2003-04-18 20:26:20 +02:00
|
|
|
# (Default to avoid splitting info files by setting the threshold high.)
|
|
|
|
MAKEINFOFLAGS = --split-size=5000000
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
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`
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# ---------------------------------------------
|
|
|
|
# Programs producing files for the HOST machine
|
|
|
|
# ---------------------------------------------
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
# 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
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
AS = @AS@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
AR = @AR@
|
|
|
|
AR_FLAGS = rc
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
CC = @CC@
|
|
|
|
CFLAGS = @CFLAGS@
|
|
|
|
LIBCFLAGS = $(CFLAGS)
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
CXX = @CXX@
|
|
|
|
CXXFLAGS = @CXXFLAGS@
|
|
|
|
LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
DLLTOOL = @DLLTOOL@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
NM = @NM@
|
2002-12-16 19:23:00 +01:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
LD = @LD@
|
|
|
|
LDFLAGS =
|
2002-12-16 19:23:00 +01:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
RANLIB = @RANLIB@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
WINDRES = @WINDRES@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
PICFLAG =
|
|
|
|
|
|
|
|
# -----------------------------------------------
|
|
|
|
# Programs producing files for the TARGET machine
|
|
|
|
# -----------------------------------------------
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
# This is the list of directories that may be needed in RPATH_ENVVAR
|
|
|
|
# so that prorgams built for the target machine work.
|
2004-05-13 08:41:07 +02:00
|
|
|
TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-09-25 19:22:54 +02:00
|
|
|
FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
AR_FOR_TARGET=@AR_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@
|
2003-02-28 19:01:54 +01:00
|
|
|
USUAL_AR_FOR_TARGET = ` \
|
|
|
|
if [ -f $$r/binutils/ar ] ; then \
|
|
|
|
echo $$r/binutils/ar ; \
|
|
|
|
else \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2003-02-28 19:01:54 +01:00
|
|
|
echo $(AR); \
|
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_AR_FOR_TARGET) ; \
|
2003-02-28 19:01:54 +01:00
|
|
|
fi; \
|
|
|
|
fi`
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
AS_FOR_TARGET=@AS_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@
|
2002-12-16 19:23:00 +01:00
|
|
|
USUAL_AS_FOR_TARGET = ` \
|
2002-09-25 00:51:57 +02:00
|
|
|
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 \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2002-09-25 00:51:57 +02:00
|
|
|
echo $(AS); \
|
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_AS_FOR_TARGET) ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
fi`
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
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)
|
|
|
|
# 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
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@
|
2002-12-16 19:23:00 +01:00
|
|
|
USUAL_DLLTOOL_FOR_TARGET = ` \
|
2002-09-25 00:51:57 +02:00
|
|
|
if [ -f $$r/binutils/dlltool ] ; then \
|
|
|
|
echo $$r/binutils/dlltool ; \
|
|
|
|
else \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2002-09-25 00:51:57 +02:00
|
|
|
echo $(DLLTOOL); \
|
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_DLLTOOL_FOR_TARGET) ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
fi`
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
GCJ_FOR_TARGET = @GCJ_FOR_TARGET@
|
2004-05-13 08:41:07 +02:00
|
|
|
GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@
|
2003-02-28 19:01:54 +01:00
|
|
|
|
|
|
|
LD_FOR_TARGET=@LD_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@
|
2003-02-28 19:01:54 +01:00
|
|
|
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 ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2003-02-28 19:01:54 +01:00
|
|
|
echo $(LD); \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_LD_FOR_TARGET) ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
fi`
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
LDFLAGS_FOR_TARGET =
|
|
|
|
|
|
|
|
NM_FOR_TARGET=@NM_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@
|
2003-02-28 19:01:54 +01:00
|
|
|
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 ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2003-02-28 19:01:54 +01:00
|
|
|
echo $(NM); \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_NM_FOR_TARGET) ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
fi`
|
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@
|
2002-12-16 19:23:00 +01:00
|
|
|
USUAL_RANLIB_FOR_TARGET = ` \
|
2002-09-25 00:51:57 +02:00
|
|
|
if [ -f $$r/binutils/ranlib ] ; then \
|
|
|
|
echo $$r/binutils/ranlib ; \
|
|
|
|
else \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2002-09-25 00:51:57 +02:00
|
|
|
if [ x'$(RANLIB)' != x ]; then \
|
|
|
|
echo $(RANLIB); \
|
|
|
|
else \
|
|
|
|
echo ranlib; \
|
|
|
|
fi; \
|
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_RANLIB_FOR_TARGET) ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
fi`
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@
|
2004-04-09 07:15:06 +02:00
|
|
|
CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@
|
2003-02-28 19:01:54 +01:00
|
|
|
USUAL_WINDRES_FOR_TARGET = ` \
|
|
|
|
if [ -f $$r/binutils/windres ] ; then \
|
|
|
|
echo $$r/binutils/windres ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2003-06-11 00:24:39 +02:00
|
|
|
if [ '$(host)' = '$(target)' ] ; then \
|
2003-02-28 19:01:54 +01:00
|
|
|
echo $(WINDRES); \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2004-04-09 07:15:06 +02:00
|
|
|
echo $(CONFIGURED_WINDRES_FOR_TARGET) ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
fi`
|
|
|
|
|
2003-02-28 19:01:54 +01:00
|
|
|
PICFLAG_FOR_TARGET =
|
|
|
|
|
|
|
|
# ------------------------------------
|
|
|
|
# Miscellaneous targets and flag lists
|
|
|
|
# ------------------------------------
|
|
|
|
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
@if gcc-bootstrap
|
|
|
|
# Let's leave this as the first rule in the file until toplevel
|
|
|
|
# bootstrap is fleshed out completely.
|
|
|
|
sorry:
|
|
|
|
@echo Toplevel bootstrap temporarily out of commission.
|
|
|
|
@echo Please reconfigure without --enable-bootstrap
|
|
|
|
@endif gcc-bootstrap
|
|
|
|
|
2002-09-25 00:51:57 +02:00
|
|
|
# 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.
|
2004-06-01 09:43:25 +02:00
|
|
|
@default_target@:
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
#### host and target specific makefile fragments come in here.
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
@target_makefile_frag@
|
|
|
|
@alphaieee_frag@
|
|
|
|
@ospace_frag@
|
|
|
|
@host_makefile_frag@
|
2002-09-25 00:51:57 +02:00
|
|
|
###
|
|
|
|
|
|
|
|
# Flags to pass down to all sub-makes.
|
2003-06-23 22:34:26 +02:00
|
|
|
BASE_FLAGS_TO_PASS = [+ FOR flags_to_pass +]\
|
|
|
|
"[+flag+]=$([+flag+])" [+ ENDFOR flags_to_pass +]\
|
2003-11-21 01:39:18 +01:00
|
|
|
"CONFIG_SHELL=$(SHELL)" \
|
2003-06-23 22:34:26 +02:00
|
|
|
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)"
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
# 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 = \
|
2002-12-16 19:23:00 +01:00
|
|
|
CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
|
|
|
|
RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2004-06-09 10:17:32 +02:00
|
|
|
RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS)
|
|
|
|
|
2002-09-25 00:51:57 +02:00
|
|
|
# Flags to pass down to most sub-makes, in which we're building with
|
|
|
|
# the host environment.
|
|
|
|
EXTRA_HOST_FLAGS = \
|
|
|
|
'AR=$(AR)' \
|
|
|
|
'AS=$(AS)' \
|
|
|
|
'CC=$(CC)' \
|
|
|
|
'CXX=$(CXX)' \
|
|
|
|
'DLLTOOL=$(DLLTOOL)' \
|
|
|
|
'LD=$(LD)' \
|
|
|
|
'NM=$(NM)' \
|
2003-03-04 08:32:20 +01:00
|
|
|
'RANLIB=$(RANLIB)' \
|
2002-09-25 00:51:57 +02:00
|
|
|
'WINDRES=$(WINDRES)'
|
|
|
|
|
|
|
|
FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
|
|
|
|
|
|
|
|
# Flags that are concerned with the location of the X11 include files
|
|
|
|
# and library files
|
|
|
|
#
|
|
|
|
# NOTE: until the top-level is getting the values via autoconf, it only
|
|
|
|
# causes problems to have this top-level Makefile overriding the autoconf-set
|
|
|
|
# values in child directories. Only variables that don't conflict with
|
|
|
|
# autoconf'ed ones should be passed by X11_FLAGS_TO_PASS for now.
|
|
|
|
#
|
|
|
|
X11_FLAGS_TO_PASS = \
|
|
|
|
'X11_EXTRA_CFLAGS=$(X11_EXTRA_CFLAGS)' \
|
|
|
|
'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.
|
|
|
|
EXTRA_TARGET_FLAGS = \
|
|
|
|
'AR=$$(AR_FOR_TARGET)' \
|
|
|
|
'AS=$$(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)' \
|
|
|
|
'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
|
|
|
|
'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
|
|
|
|
'NM=$$(NM_FOR_TARGET)' \
|
|
|
|
'RANLIB=$$(RANLIB_FOR_TARGET)' \
|
|
|
|
'WINDRES=$$(WINDRES_FOR_TARGET)'
|
|
|
|
|
|
|
|
TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)
|
|
|
|
|
|
|
|
# Flags to pass down to gcc. gcc builds a library, libgcc.a, so it
|
|
|
|
# unfortunately needs the native compiler and the target ar and
|
|
|
|
# ranlib.
|
|
|
|
# If any variables are added here, they must be added to do-*, below.
|
2003-06-03 22:42:13 +02:00
|
|
|
# The BUILD_* variables are a special case, which are used for the gcc
|
2002-09-25 00:51:57 +02:00
|
|
|
# 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)" \
|
2004-02-28 23:01:56 +01:00
|
|
|
"`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=/'`"
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-10-13 23:43:32 +02:00
|
|
|
GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-05-18 17:43:44 +02:00
|
|
|
.PHONY: configure-host
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
configure-host: [+
|
2003-05-18 17:43:44 +02:00
|
|
|
FOR host_modules +] \
|
|
|
|
maybe-configure-[+module+][+
|
|
|
|
ENDFOR host_modules +]
|
|
|
|
.PHONY: configure-target
|
|
|
|
configure-target: [+
|
|
|
|
FOR target_modules +] \
|
|
|
|
maybe-configure-target-[+module+][+
|
|
|
|
ENDFOR target_modules +]
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2004-06-01 09:43:25 +02:00
|
|
|
# The target built for a native non-bootstrap build.
|
|
|
|
.PHONY: all
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
all: unstage all-host all-target stage
|
2003-05-18 17:43:44 +02:00
|
|
|
|
Makefile.def (build_modules): Add bison, byacc, flex, m4, texinfo.
2004-07-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (build_modules): Add bison, byacc, flex,
m4, texinfo.
(flags_to_pass): Add FLEX.
* Makefile.tpl (BUILD_DIR_PREFIX, BASE_EXPORTS): New.
(BUILD_EXPORTS, HOST_EXPORTS, BASE_TARGET_EXPORTS): Include it.
(DEFAULT_YACC, USUAL_YACC, DEFAULT_LEX, USUAL_LEX, DEFAULT_M4,
DEFAULT_MAKEINFO): Remove.
(CONFIGURED_YACC, CONFIGURED_FLEX, CONFIGURED_BISON,
CONFIGURED_LEX, CONFIGURED_M4, CONFIGURED_MAKEINFO): Substitute.
(YACC, FLEX, BISON, LEX, M4, MAKEINFO): Define to look into
objdir or else use configured tool.
(all-build): New.
(all): Depend on it.
(Build module dependencies): Add.
* Makefile.in: Regenerate.
* configure.in: Better support for multiple build modules,
matching what is done for host/target modules. Do not look
for "plausible" locations of build tools if Canadian cross.
Use autoconf's AC_PROG_CC to find a C compiler. Define
BUILD_DIR_PREFIX. Look for flex, makeinfo and m4.
* configure: Regenerate.
From-SVN: r84017
2004-07-02 09:55:37 +02:00
|
|
|
.PHONY: all-build
|
|
|
|
all-build: [+
|
|
|
|
FOR build_modules +] \
|
|
|
|
maybe-all-build-[+module+][+
|
|
|
|
ENDFOR build_modules +]
|
2003-05-18 17:43:44 +02:00
|
|
|
.PHONY: all-host
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
all-host: [+
|
2003-05-18 17:43:44 +02:00
|
|
|
FOR host_modules +] \
|
|
|
|
maybe-all-[+module+][+
|
|
|
|
ENDFOR host_modules +]
|
|
|
|
.PHONY: all-target
|
|
|
|
all-target: [+
|
|
|
|
FOR target_modules +] \
|
|
|
|
maybe-all-target-[+module+][+
|
|
|
|
ENDFOR target_modules +]
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
# 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
|
|
|
|
# dependency (below) of X upon do-X, a ``make X'' will also do this,
|
|
|
|
# but it may do additional work as well).
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ FOR recursive_targets +]
|
2003-06-03 18:35:42 +02:00
|
|
|
.PHONY: do-[+make_target+]
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
do-[+make_target+]: unstage [+make_target+]-host [+make_target+]-target stage
|
2003-06-03 22:42:13 +02:00
|
|
|
|
|
|
|
.PHONY: [+make_target+]-host
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
[+make_target+]-host: [+
|
2003-06-03 22:42:13 +02:00
|
|
|
FOR host_modules +] \
|
|
|
|
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 +]
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDFOR recursive_targets +]
|
|
|
|
|
2002-09-25 00:51:57 +02:00
|
|
|
# Here are the targets which correspond to the do-X targets.
|
|
|
|
|
|
|
|
.PHONY: info installcheck dvi install-info
|
|
|
|
.PHONY: clean distclean mostlyclean maintainer-clean realclean
|
|
|
|
.PHONY: local-clean local-distclean local-maintainer-clean
|
|
|
|
info: do-info
|
|
|
|
installcheck: do-installcheck
|
|
|
|
dvi: do-dvi
|
|
|
|
|
2002-12-18 06:28:41 +01:00
|
|
|
# Make sure makeinfo is built before we do a `make info', if we're
|
|
|
|
# in fact building texinfo.
|
|
|
|
do-info: maybe-all-texinfo
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
install-info: do-install-info dir.info
|
2003-07-04 21:45:55 +02:00
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
if [ -f dir.info ] ; then \
|
2003-01-09 08:57:00 +01:00
|
|
|
$(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else true ; fi
|
|
|
|
|
|
|
|
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
|
2002-12-29 20:04:40 +01:00
|
|
|
-rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
|
2002-09-25 00:51:57 +02:00
|
|
|
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
|
|
|
|
rm -rf $(TARGET_SUBDIR); \
|
|
|
|
else true; fi
|
2003-04-28 04:23:46 +02:00
|
|
|
-rm -rf $(BUILD_SUBDIR)
|
2002-09-25 00:51:57 +02:00
|
|
|
-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
|
|
|
|
-rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null
|
|
|
|
-rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null
|
|
|
|
|
|
|
|
local-maintainer-clean:
|
|
|
|
@echo "This command is intended for maintainers to use;"
|
|
|
|
@echo "it deletes files that may require special tools to rebuild."
|
|
|
|
|
|
|
|
clean: do-clean local-clean
|
|
|
|
mostlyclean: do-mostlyclean local-clean
|
|
|
|
distclean: do-distclean local-clean local-distclean
|
|
|
|
maintainer-clean: local-maintainer-clean do-maintainer-clean local-clean
|
|
|
|
maintainer-clean: local-distclean
|
|
|
|
realclean: maintainer-clean
|
|
|
|
|
2003-06-03 22:42:13 +02:00
|
|
|
# Extra dependency for clean-target, owing to the mixed nature of gcc
|
|
|
|
clean-target: clean-target-libgcc
|
2002-09-25 00:51:57 +02:00
|
|
|
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
|
|
|
|
|
|
|
|
# Check target.
|
|
|
|
|
|
|
|
.PHONY: check do-check
|
2003-08-02 02:48:19 +02:00
|
|
|
check: do-check
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# Only include modules actually being configured and built.
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
do-check: unstage [+
|
2003-05-20 03:04:20 +02:00
|
|
|
FOR host_modules +] \
|
|
|
|
maybe-check-[+module+][+
|
|
|
|
ENDFOR host_modules +][+
|
|
|
|
FOR target_modules +] \
|
|
|
|
maybe-check-target-[+module+][+
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
ENDFOR target_modules +] stage
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
# Automated reporting of test results.
|
|
|
|
|
|
|
|
warning.log: build.log
|
|
|
|
$(srcdir)/contrib/warn_summary build.log > $@
|
|
|
|
|
|
|
|
mail-report.log:
|
|
|
|
if test x'$(BOOT_CFLAGS)' != x''; then \
|
|
|
|
BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
|
|
|
|
fi; \
|
|
|
|
$(srcdir)/contrib/test_summary -t >$@
|
|
|
|
chmod +x $@
|
|
|
|
echo If you really want to send e-mail, run ./$@ now
|
|
|
|
|
|
|
|
mail-report-with-warnings.log: warning.log
|
|
|
|
if test x'$(BOOT_CFLAGS)' != x''; then \
|
|
|
|
BOOT_CFLAGS='$(BOOT_CFLAGS)'; export BOOT_CFLAGS; \
|
|
|
|
fi; \
|
|
|
|
$(srcdir)/contrib/test_summary -t -i warning.log >$@
|
|
|
|
chmod +x $@
|
|
|
|
echo If you really want to send e-mail, run ./$@ now
|
|
|
|
|
|
|
|
# Installation targets.
|
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
.PHONY: install uninstall
|
2003-05-18 17:43:44 +02:00
|
|
|
install: installdirs install-host install-target
|
|
|
|
|
2003-05-20 03:04:20 +02:00
|
|
|
.PHONY: install-host-nogcc
|
|
|
|
install-host-nogcc: [+
|
2004-08-06 08:45:23 +02:00
|
|
|
FOR host_modules +][+ IF (not (= (get "module") "gcc")) +] \
|
|
|
|
maybe-install-[+module+][+ ENDIF +][+
|
2003-05-20 03:04:20 +02:00
|
|
|
ENDFOR host_modules +]
|
|
|
|
|
2003-05-18 17:43:44 +02:00
|
|
|
.PHONY: install-host
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
install-host: [+
|
2003-05-18 17:43:44 +02:00
|
|
|
FOR host_modules +] \
|
|
|
|
maybe-install-[+module+][+
|
|
|
|
ENDFOR host_modules +]
|
2003-05-20 03:04:20 +02:00
|
|
|
|
2003-05-18 17:43:44 +02:00
|
|
|
.PHONY: install-target
|
|
|
|
install-target: [+
|
|
|
|
FOR target_modules +] \
|
|
|
|
maybe-install-target-[+module+][+
|
|
|
|
ENDFOR target_modules +]
|
2002-09-25 00:51:57 +02:00
|
|
|
|
|
|
|
uninstall:
|
|
|
|
@echo "the uninstall target is not supported in this tree"
|
|
|
|
|
|
|
|
.PHONY: install.all
|
|
|
|
install.all: install-no-fixedincludes
|
|
|
|
@if [ -f ./gcc/Makefile ] ; then \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}` ; export r ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-12-23 17:54:15 +01:00
|
|
|
(cd ./gcc && \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(MAKE) $(FLAGS_TO_PASS) install-headers) ; \
|
|
|
|
else \
|
|
|
|
true ; \
|
|
|
|
fi
|
|
|
|
|
|
|
|
# install-no-fixedincludes is used because Cygnus can not distribute
|
|
|
|
# the fixed header files.
|
|
|
|
.PHONY: install-no-fixedincludes
|
2003-05-20 03:04:20 +02:00
|
|
|
install-no-fixedincludes: installdirs install-host-nogcc \
|
2003-05-18 17:43:44 +02:00
|
|
|
install-target gcc-no-fixedincludes
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
### other supporting targets
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
MAKEDIRS= \
|
|
|
|
$(DESTDIR)$(prefix) \
|
|
|
|
$(DESTDIR)$(exec_prefix)
|
|
|
|
.PHONY: installdirs
|
|
|
|
installdirs: mkinstalldirs
|
|
|
|
$(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS)
|
|
|
|
|
|
|
|
dir.info: do-install-info
|
|
|
|
if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \
|
2003-01-09 08:57:00 +01:00
|
|
|
$(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \
|
2002-12-16 19:23:00 +01:00
|
|
|
mv -f dir.info.new dir.info ; \
|
|
|
|
else true ; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi
|
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
dist:
|
|
|
|
@echo "Building a full distribution of this tree isn't done"
|
|
|
|
@echo "via 'make dist'. Check out the etc/ subdirectory"
|
|
|
|
|
|
|
|
etags tags: TAGS
|
|
|
|
|
|
|
|
# Right now this just builds TAGS in each subdirectory. emacs19 has the
|
|
|
|
# ability to use several tags files at once, so there is probably no need
|
|
|
|
# to combine them into one big TAGS file (like CVS 1.3 does). We could
|
|
|
|
# (if we felt like it) have this Makefile write a piece of elisp which
|
|
|
|
# the user could load to tell emacs19 where all the TAGS files we just
|
|
|
|
# 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+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if build-[+module+]
|
|
|
|
maybe-configure-build-[+module+]: configure-build-[+module+]
|
2002-12-29 20:04:40 +01:00
|
|
|
configure-build-[+module+]:
|
|
|
|
@test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
|
2003-07-28 05:25:51 +02:00
|
|
|
$(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/[+module+] ; \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(BUILD_EXPORTS) \
|
2003-03-05 02:45:09 +01:00
|
|
|
echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
|
|
|
|
cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
|
|
|
|
case $(srcdir) in \
|
|
|
|
/* | [A-Za-z]:[\\/]*) \
|
|
|
|
topdir=$(srcdir) ;; \
|
|
|
|
*) \
|
|
|
|
case "$(BUILD_SUBDIR)" in \
|
2002-09-25 00:51:57 +02:00
|
|
|
.) topdir="../$(srcdir)" ;; \
|
|
|
|
*) topdir="../../$(srcdir)" ;; \
|
2003-03-05 02:45:09 +01:00
|
|
|
esac ;; \
|
|
|
|
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; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2003-03-05 02:45:09 +01:00
|
|
|
true; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
else \
|
2003-03-05 02:45:09 +01:00
|
|
|
exit 1; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
2003-03-05 02:45:09 +01:00
|
|
|
else \
|
|
|
|
true; \
|
|
|
|
fi; \
|
|
|
|
srcdiroption="--srcdir=."; \
|
|
|
|
libsrcdir="."; \
|
|
|
|
else \
|
|
|
|
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
|
|
|
libsrcdir="$$s/[+module+]"; \
|
|
|
|
fi; \
|
|
|
|
rm -f no-such-file || : ; \
|
|
|
|
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
|
|
|
$(BUILD_CONFIGARGS) $${srcdiroption} \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
--with-build-subdir="$(BUILD_SUBDIR)" [+extra_configure_flags+] \
|
2003-03-05 02:45:09 +01:00
|
|
|
|| exit 1
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif build-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
|
|
|
|
.PHONY: all-build-[+module+] maybe-all-build-[+module+]
|
|
|
|
maybe-all-build-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if build-[+module+]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
TARGET-build-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
|
2004-05-21 10:00:17 +02:00
|
|
|
maybe-all-build-[+module+]: all-build-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
all-build-[+module+]: configure-build-[+module+]
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(BUILD_EXPORTS) \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
(cd $(BUILD_SUBDIR)/[+module+] && \
|
|
|
|
$(MAKE) [+extra_make_flags+] $(TARGET-build-[+module+]))
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif build-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDFOR build_modules +]
|
|
|
|
|
|
|
|
# --------------------------------------
|
|
|
|
# Modules which run on the host machine
|
|
|
|
# --------------------------------------
|
|
|
|
[+ FOR host_modules +]
|
|
|
|
.PHONY: configure-[+module+] maybe-configure-[+module+]
|
|
|
|
maybe-configure-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if [+module+]
|
|
|
|
maybe-configure-[+module+]: configure-[+module+]
|
2002-12-29 20:04:40 +01:00
|
|
|
configure-[+module+]:
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
@[+ IF bootstrap +]test -f stage_last && exit 0; \
|
|
|
|
[+ ENDIF bootstrap +]test ! -f [+module+]/Makefile || exit 0; \
|
2002-12-29 20:04:40 +01:00
|
|
|
[ -d [+module+] ] || mkdir [+module+]; \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-12-16 19:23:00 +01:00
|
|
|
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 \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_CONFIGARGS) $${srcdiroption} [+extra_configure_flags+] \
|
2002-12-16 19:23:00 +01:00
|
|
|
|| exit 1
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif [+module+]
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
.PHONY: all-[+module+] maybe-all-[+module+]
|
|
|
|
maybe-all-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if [+module+]
|
|
|
|
maybe-all-[+module+]: all-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
all-[+module+]: configure-[+module+]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
@[+ IF bootstrap +]test -f stage_last && exit 0; \
|
|
|
|
[+ ENDIF bootstrap +]r=`${PWD_COMMAND}`; export r; \
|
2003-07-04 21:45:55 +02:00
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2003-03-05 02:45:09 +01:00
|
|
|
$(SET_LIB_PATH) \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2003-03-05 02:45:09 +01:00
|
|
|
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
|
|
|
IF with_x
|
|
|
|
+] $(X11_FLAGS_TO_PASS)[+
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
ENDIF with_x +] [+extra_make_flags+] [+
|
|
|
|
IF (== (get "module") "gcc") +] \
|
|
|
|
`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` [+
|
|
|
|
ELSE +]all[+ ENDIF +])
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif [+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
|
2003-05-20 03:04:20 +02:00
|
|
|
.PHONY: check-[+module+] maybe-check-[+module+]
|
|
|
|
maybe-check-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if [+module+]
|
|
|
|
maybe-check-[+module+]: check-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ IF no_check +]
|
|
|
|
check-[+module+]:
|
|
|
|
[+ ELIF no_check_cross +]
|
|
|
|
# This module is only tested in a native toolchain.
|
|
|
|
check-[+module+]:
|
2003-06-11 00:24:39 +02:00
|
|
|
@if [ '$(host)' = '$(target)' ] ; then \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(HOST_EXPORTS) \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+
|
|
|
|
extra_make_flags+] check); \
|
2003-03-05 02:45:09 +01:00
|
|
|
fi
|
|
|
|
[+ ELSE check +]
|
|
|
|
check-[+module+]:
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2003-03-05 02:45:09 +01:00
|
|
|
$(SET_LIB_PATH) \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2003-03-05 02:45:09 +01:00
|
|
|
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
extra_make_flags+] check)
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDIF no_check +]
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif [+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
|
|
|
|
.PHONY: install-[+module+] maybe-install-[+module+]
|
|
|
|
maybe-install-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if [+module+]
|
|
|
|
maybe-install-[+module+]: install-[+module+]
|
2003-05-20 03:04:20 +02:00
|
|
|
[+ IF no_install +]
|
2002-12-16 19:23:00 +01:00
|
|
|
install-[+module+]:
|
|
|
|
[+ ELSE install +]
|
|
|
|
install-[+module+]: installdirs
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2003-03-05 02:45:09 +01:00
|
|
|
$(SET_LIB_PATH) \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2003-03-05 02:45:09 +01:00
|
|
|
(cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
extra_make_flags+] install)
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDIF no_install +]
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif [+module+]
|
2004-03-22 12:53:01 +01:00
|
|
|
|
|
|
|
# Other targets (info, dvi, etc.)
|
|
|
|
[+ FOR recursive_targets +]
|
|
|
|
.PHONY: maybe-[+make_target+]-[+module+] [+make_target+]-[+module+]
|
|
|
|
maybe-[+make_target+]-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if [+module+]
|
|
|
|
maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+]
|
2004-03-22 12:53:01 +01:00
|
|
|
[+ IF (match-value? = "missing" (get "make_target") ) +]
|
|
|
|
# [+module+] doesn't support [+make_target+].
|
|
|
|
[+make_target+]-[+module+]:
|
|
|
|
[+ ELSE +]
|
|
|
|
[+make_target+]-[+module+]: [+
|
|
|
|
FOR depend +]\
|
|
|
|
[+depend+]-[+module+] [+
|
|
|
|
ENDFOR depend +]
|
|
|
|
@[ -f ./[+module+]/Makefile ] || exit 0; \
|
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
|
|
|
$(SET_LIB_PATH) \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(HOST_EXPORTS) \
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
for flag in $(EXTRA_HOST_FLAGS) [+extra_make_flags+]; do \
|
2004-03-22 12:53:01 +01:00
|
|
|
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
|
|
|
done; \
|
|
|
|
echo "Doing [+make_target+] in [+module+]" ; \
|
|
|
|
(cd [+module+] && \
|
|
|
|
$(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
|
|
|
|
"CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
|
|
|
|
"RANLIB=$${RANLIB}" \
|
|
|
|
"DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
[+make_target+]) \
|
2004-03-22 12:53:01 +01:00
|
|
|
|| exit 1
|
|
|
|
[+ ENDIF +]
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif [+module+]
|
2004-03-22 12:53:01 +01:00
|
|
|
[+ ENDFOR recursive_targets +]
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDFOR host_modules +]
|
|
|
|
|
|
|
|
# ---------------------------------------
|
|
|
|
# Modules which run on the target machine
|
|
|
|
# ---------------------------------------
|
|
|
|
[+ FOR target_modules +]
|
|
|
|
.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
|
|
|
|
maybe-configure-target-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if target-[+module+]
|
|
|
|
maybe-configure-target-[+module+]: configure-target-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
|
2002-12-23 17:54:15 +01:00
|
|
|
# There's only one multilib.out. Cleverer subdirs shouldn't need it copied.
|
|
|
|
$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
|
2003-07-28 05:25:51 +02:00
|
|
|
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
|
2002-12-29 20:04:40 +01:00
|
|
|
rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \
|
2002-12-23 17:54:15 +01:00
|
|
|
cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-29 20:04:40 +01:00
|
|
|
configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
|
|
|
|
@test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
|
2003-07-28 05:25:51 +02:00
|
|
|
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/[+module+] ; \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(SET_LIB_PATH) \[+
|
2003-03-05 02:45:09 +01:00
|
|
|
IF raw_cxx +]
|
2004-05-25 21:37:26 +02:00
|
|
|
$(RAW_CXX_TARGET_EXPORTS) \[+
|
2003-03-05 02:45:09 +01:00
|
|
|
ELSE normal_cxx +]
|
2004-05-25 21:37:26 +02:00
|
|
|
$(NORMAL_TARGET_EXPORTS) \[+
|
2003-03-05 02:45:09 +01:00
|
|
|
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 \
|
2002-09-25 00:51:57 +02:00
|
|
|
.) topdir="../$(srcdir)" ;; \
|
|
|
|
*) topdir="../../$(srcdir)" ;; \
|
2003-03-05 02:45:09 +01:00
|
|
|
esac ;; \
|
2004-01-14 21:09:37 +01:00
|
|
|
esac; \[+ IF stage +]
|
2003-03-05 02:45:09 +01:00
|
|
|
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; \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
2003-03-05 02:45:09 +01:00
|
|
|
true; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
|
|
|
else \
|
2003-03-05 02:45:09 +01:00
|
|
|
exit 1; \
|
2002-09-25 00:51:57 +02:00
|
|
|
fi; \
|
2003-03-05 02:45:09 +01:00
|
|
|
else \
|
|
|
|
true; \
|
|
|
|
fi; \
|
|
|
|
srcdiroption="--srcdir=."; \
|
|
|
|
libsrcdir="."; \
|
2004-01-14 21:09:37 +01:00
|
|
|
else \[+ ENDIF stage +]
|
2003-03-05 02:45:09 +01:00
|
|
|
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
|
2004-01-14 21:09:37 +01:00
|
|
|
libsrcdir="$$s/[+module+]"; \[+ IF stage +]
|
|
|
|
fi; \[+ ENDIF stage +]
|
2003-03-05 02:45:09 +01:00
|
|
|
rm -f no-such-file || : ; \
|
|
|
|
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
|
|
|
|
$(TARGET_CONFIGARGS) $${srcdiroption} \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
--with-target-subdir="$(TARGET_SUBDIR)" [+extra_configure_flags+] \
|
2003-03-05 02:45:09 +01:00
|
|
|
|| exit 1
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif target-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
|
|
|
|
.PHONY: all-target-[+module+] maybe-all-target-[+module+]
|
|
|
|
maybe-all-target-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if target-[+module+]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
TARGET-target-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +]
|
2004-05-21 10:00:17 +02:00
|
|
|
maybe-all-target-[+module+]: all-target-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
all-target-[+module+]: configure-target-[+module+]
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(SET_LIB_PATH) \[+
|
|
|
|
IF raw_cxx +]
|
|
|
|
$(RAW_CXX_TARGET_EXPORTS) \[+
|
|
|
|
ELSE normal_cxx +]
|
|
|
|
$(NORMAL_TARGET_EXPORTS) \[+
|
|
|
|
ENDIF raw_cxx +]
|
2003-03-05 02:45:09 +01:00
|
|
|
(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
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
+] [+extra_make_flags+] $(TARGET-target-[+module+]))
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif target-[+module+]
|
2003-05-20 03:04:20 +02:00
|
|
|
|
|
|
|
.PHONY: check-target-[+module+] maybe-check-target-[+module+]
|
|
|
|
maybe-check-target-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if target-[+module+]
|
|
|
|
maybe-check-target-[+module+]: check-target-[+module+]
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ IF no_check +]
|
|
|
|
# Dummy target for uncheckable module.
|
|
|
|
check-target-[+module+]:
|
|
|
|
[+ ELSE check +]
|
|
|
|
check-target-[+module+]:
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(SET_LIB_PATH) \[+
|
|
|
|
IF raw_cxx +]
|
|
|
|
$(RAW_CXX_TARGET_EXPORTS) \[+
|
|
|
|
ELSE normal_cxx +]
|
|
|
|
$(NORMAL_TARGET_EXPORTS) \[+
|
|
|
|
ENDIF raw_cxx +]
|
2003-03-05 02:45:09 +01:00
|
|
|
(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
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
+] [+extra_make_flags+] check)
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDIF no_check +]
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif target-[+module+]
|
2003-05-20 03:04:20 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
.PHONY: install-target-[+module+] maybe-install-target-[+module+]
|
|
|
|
maybe-install-target-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if target-[+module+]
|
|
|
|
maybe-install-target-[+module+]: install-target-[+module+]
|
2003-05-20 03:04:20 +02:00
|
|
|
[+ IF no_install +]
|
2002-12-16 19:23:00 +01:00
|
|
|
# Dummy target for uninstallable.
|
|
|
|
install-target-[+module+]:
|
|
|
|
[+ ELSE install +]
|
|
|
|
install-target-[+module+]: installdirs
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(SET_LIB_PATH) \[+
|
|
|
|
IF raw_cxx +]
|
|
|
|
$(RAW_CXX_TARGET_EXPORTS) \[+
|
|
|
|
ELSE normal_cxx +]
|
|
|
|
$(NORMAL_TARGET_EXPORTS) \[+
|
|
|
|
ENDIF raw_cxx +]
|
2003-03-05 02:45:09 +01:00
|
|
|
(cd $(TARGET_SUBDIR)/[+module+] && \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(MAKE) $(TARGET_FLAGS_TO_PASS) [+extra_make_flags+] install)
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDIF no_install +]
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif target-[+module+]
|
2004-03-22 12:53:01 +01:00
|
|
|
|
|
|
|
# Other targets (info, dvi, etc.)
|
|
|
|
[+ FOR recursive_targets +]
|
|
|
|
.PHONY: maybe-[+make_target+]-target-[+module+] [+make_target+]-target-[+module+]
|
|
|
|
maybe-[+make_target+]-target-[+module+]:
|
2004-05-21 10:00:17 +02:00
|
|
|
@if target-[+module+]
|
|
|
|
maybe-[+make_target+]-target-[+module+]: [+make_target+]-target-[+module+]
|
2004-03-22 12:53:01 +01:00
|
|
|
[+ IF (match-value? = "missing" (get "make_target") ) +]
|
|
|
|
# [+module+] doesn't support [+make_target+].
|
|
|
|
[+make_target+]-target-[+module+]:
|
|
|
|
[+ ELSE +]
|
|
|
|
[+make_target+]-target-[+module+]: [+
|
|
|
|
FOR depend +]\
|
|
|
|
[+depend+]-target-[+module+] [+
|
|
|
|
ENDFOR depend +]
|
|
|
|
@[ -f $(TARGET_SUBDIR)/[+module+]/Makefile ] || exit 0 ; \
|
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2004-05-25 21:37:26 +02:00
|
|
|
$(SET_LIB_PATH) \[+
|
|
|
|
IF raw_cxx +]
|
|
|
|
$(RAW_CXX_TARGET_EXPORTS) \[+
|
|
|
|
ELSE normal_cxx +]
|
|
|
|
$(NORMAL_TARGET_EXPORTS) \[+
|
|
|
|
ENDIF raw_cxx +]
|
2004-03-22 12:53:01 +01:00
|
|
|
echo "Doing [+make_target+] in $(TARGET_SUBDIR)/[+module+]" ; \
|
|
|
|
for flag in $(EXTRA_TARGET_FLAGS); do \
|
|
|
|
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
|
|
|
|
done; \
|
|
|
|
(cd $(TARGET_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}" \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
[+extra_make_flags+] [+make_target+]) \
|
2004-03-22 12:53:01 +01:00
|
|
|
|| exit 1
|
|
|
|
[+ ENDIF +]
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif target-[+module+]
|
2004-03-22 12:53:01 +01:00
|
|
|
[+ ENDFOR recursive_targets +]
|
2002-12-16 19:23:00 +01:00
|
|
|
[+ ENDFOR target_modules +]
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# ----------
|
|
|
|
# GCC module
|
|
|
|
# ----------
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2004-06-01 09:43:25 +02:00
|
|
|
@if gcc-no-bootstrap
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
# GCC has some more recursive targets, which trigger the old
|
|
|
|
# (but still current, until the toplevel bootstrap project
|
|
|
|
# is finished) compiler bootstrapping rules.
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-04-17 23:04:05 +02:00
|
|
|
GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
|
|
|
|
.PHONY: $(GCC_STRAP_TARGETS)
|
2004-08-06 08:45:23 +02:00
|
|
|
$(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-09-25 00:51:57 +02:00
|
|
|
echo "Bootstrapping the compiler"; \
|
|
|
|
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
case "$@" in \
|
|
|
|
*bootstrap4-lean ) \
|
2003-03-05 02:45:09 +01:00
|
|
|
msg="Comparing stage3 and stage4 of the compiler"; \
|
|
|
|
compare=compare3-lean ;; \
|
|
|
|
*bootstrap4 ) \
|
|
|
|
msg="Comparing stage3 and stage4 of the compiler"; \
|
|
|
|
compare=compare3 ;; \
|
|
|
|
*-lean ) \
|
|
|
|
msg="Comparing stage2 and stage3 of the compiler"; \
|
|
|
|
compare=compare-lean ;; \
|
|
|
|
* ) \
|
|
|
|
msg="Comparing stage2 and stage3 of the compiler"; \
|
|
|
|
compare=compare ;; \
|
2002-09-25 00:51:57 +02:00
|
|
|
esac; \
|
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-09-25 00:51:57 +02:00
|
|
|
echo "$$msg"; \
|
|
|
|
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
|
|
|
echo "Building runtime libraries"; \
|
2004-06-09 10:17:32 +02:00
|
|
|
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2004-08-06 08:45:23 +02:00
|
|
|
profiledbootstrap: all-prebootstrap configure-gcc
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2003-06-05 18:36:12 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2004-07-08 23:49:44 +02:00
|
|
|
echo "Bootstrapping training compiler"; \
|
2003-06-05 18:36:12 +02:00
|
|
|
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2003-06-05 18:36:12 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2003-06-05 18:36:12 +02:00
|
|
|
echo "Building feedback based compiler"; \
|
|
|
|
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build
|
2004-07-08 23:49:44 +02:00
|
|
|
@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
|
2003-06-05 18:36:12 +02:00
|
|
|
|
2002-09-25 00:51:57 +02:00
|
|
|
.PHONY: cross
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
cross: all-build all-gas all-ld
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-09-25 00:51:57 +02:00
|
|
|
echo "Building the C and C++ compiler"; \
|
|
|
|
cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++"
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
|
|
|
echo "Building runtime libraries"; \
|
2004-06-09 10:17:32 +02:00
|
|
|
$(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all
|
2004-06-01 09:43:25 +02:00
|
|
|
@endif gcc-no-bootstrap
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2004-05-21 10:00:17 +02:00
|
|
|
@if gcc
|
2002-12-14 09:37:12 +01:00
|
|
|
.PHONY: check-gcc-c++
|
|
|
|
check-gcc-c++:
|
2002-09-25 00:51:57 +02:00
|
|
|
@if [ -f ./gcc/Makefile ] ; then \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-12-23 17:54:15 +01:00
|
|
|
(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \
|
2002-09-25 00:51:57 +02:00
|
|
|
else \
|
|
|
|
true; \
|
2002-12-14 09:37:12 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
.PHONY: check-c++
|
2003-08-02 02:48:19 +02:00
|
|
|
check-c++: check-target-libstdc++-v3 check-gcc-c++
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# Install the gcc headers files, but not the fixed include files,
|
|
|
|
# which Cygnus is not allowed to distribute. This rule is very
|
|
|
|
# dependent on the workings of the gcc Makefile.in.
|
|
|
|
.PHONY: gcc-no-fixedincludes
|
|
|
|
gcc-no-fixedincludes:
|
|
|
|
@if [ -f ./gcc/Makefile ]; then \
|
|
|
|
rm -rf gcc/tmp-include; \
|
|
|
|
mv gcc/include gcc/tmp-include 2>/dev/null; \
|
|
|
|
mkdir gcc/include; \
|
|
|
|
cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
|
|
|
|
touch gcc/stmp-fixinc gcc/include/fixed; \
|
|
|
|
rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
|
2003-07-04 21:45:55 +02:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
|
2002-09-25 00:51:57 +02:00
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2002-12-23 17:54:15 +01:00
|
|
|
(cd ./gcc && \
|
2002-12-16 19:23:00 +01:00
|
|
|
$(MAKE) $(GCC_FLAGS_TO_PASS) install); \
|
|
|
|
rm -rf gcc/include; \
|
|
|
|
mv gcc/tmp-include gcc/include 2>/dev/null; \
|
|
|
|
else true; fi
|
2004-05-21 10:00:17 +02:00
|
|
|
@endif gcc
|
2004-03-22 12:53:01 +01:00
|
|
|
|
2004-03-16 01:03:30 +01:00
|
|
|
# ---------------------
|
|
|
|
# GCC bootstrap support
|
|
|
|
# ---------------------
|
|
|
|
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
# 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.
|
|
|
|
|
|
|
|
.PHONY: unstage
|
|
|
|
unstage:
|
|
|
|
@if gcc-bootstrap
|
|
|
|
@[ -f stage_current ] || $(MAKE) `cat stage_last`-start
|
|
|
|
@endif gcc-bootstrap
|
|
|
|
|
|
|
|
.PHONY: stage
|
|
|
|
stage:
|
|
|
|
@if gcc-bootstrap
|
|
|
|
@$(MAKE) `cat stage_current`-end
|
|
|
|
@endif gcc-bootstrap
|
|
|
|
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
# 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 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.
|
2004-03-16 01:03:30 +01:00
|
|
|
|
|
|
|
# Bugs: This is almost certainly not parallel-make safe.
|
|
|
|
|
|
|
|
# '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@
|
|
|
|
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
# We only want to compare .o files, so set this!
|
|
|
|
objext = .o
|
2004-03-16 01:03:30 +01:00
|
|
|
|
|
|
|
# Flags to pass to stage2 and later makes.
|
|
|
|
BOOT_CFLAGS= -g -O2
|
|
|
|
POSTSTAGE1_FLAGS_TO_PASS = \
|
2004-06-09 10:17:32 +02:00
|
|
|
CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \
|
|
|
|
STAGE_PREFIX=$$r/stage[+prev+]-gcc/ \
|
2004-03-16 01:03:30 +01:00
|
|
|
CFLAGS="$(BOOT_CFLAGS)" \
|
2004-03-25 02:37:39 +01:00
|
|
|
ADAC="\$$(CC)"
|
2004-03-16 01:03:30 +01:00
|
|
|
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
# 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 +]
|
2004-06-01 09:43:25 +02:00
|
|
|
.PHONY: stage[+id+]-start stage[+id+]-end
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
|
2004-06-09 10:17:32 +02:00
|
|
|
stage[+id+]-start::
|
2004-08-30 10:02:34 +02:00
|
|
|
@[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
echo stage[+id+] > stage_current ; \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
echo stage[+id+] > stage_last[+ FOR host_modules +][+ IF bootstrap +]
|
|
|
|
@if [+ module +]
|
2004-08-30 10:02:34 +02:00
|
|
|
@[ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
set stage[+id+]-[+module+] [+module+] ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
|
|
|
|
set stage[+prev+]-[+module+] prev-[+module+] ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
|
|
|
|
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
|
2004-06-09 10:17:32 +02:00
|
|
|
stage[+id+]-end::
|
2004-08-30 10:02:34 +02:00
|
|
|
@rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
@if [+ module +]
|
2004-08-30 10:02:34 +02:00
|
|
|
@set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
set prev-[+module+] stage[+prev+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
|
|
|
|
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
|
|
|
|
# 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.
|
2004-06-01 09:43:25 +02:00
|
|
|
.PHONY: stage[+id+]-bubble
|
2004-08-30 10:02:34 +02:00
|
|
|
stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +]
|
|
|
|
@bootstrap_lean@-rm -rf stage[+lean+]-* ; $(STAMP) stage[+lean+]-lean[+ ENDIF lean +]
|
|
|
|
@if test -f stage[+id+]-lean [+
|
|
|
|
IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
|
|
|
|
echo Skipping rebuild of stage[+id+] ; \
|
|
|
|
else \
|
|
|
|
$(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
|
|
|
|
fi
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
|
|
|
|
.PHONY: all-stage[+id+]
|
|
|
|
all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
|
|
|
|
maybe-all-stage[+id+]-[+module+][+
|
|
|
|
ENDIF bootstrap+] [+ ENDFOR host_modules +]
|
|
|
|
|
|
|
|
[+ FOR host_modules +][+ IF bootstrap +]
|
2004-08-30 10:02:34 +02:00
|
|
|
.PHONY: configure-stage[+id+]-[+module+] maybe-configure-stage[+id+]-[+module+]
|
|
|
|
.PHONY: all-stage[+id+]-[+module+] maybe-all-stage[+id+]-[+module+]
|
|
|
|
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
maybe-configure-stage[+id+]-[+module+]:
|
|
|
|
maybe-all-stage[+id+]-[+module+]:
|
|
|
|
|
|
|
|
@if [+module+]-bootstrap
|
|
|
|
maybe-configure-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
2004-08-30 10:02:34 +02:00
|
|
|
configure-stage[+id+]-[+module+]:
|
|
|
|
@$(MAKE) stage[+id+]-start
|
|
|
|
@[ -f [+module+]/Makefile ] && exit 0 || : ; \
|
2004-03-16 01:03:30 +01:00
|
|
|
r=`${PWD_COMMAND}`; export r; \
|
2004-05-25 21:37:26 +02:00
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
|
|
|
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) [+ ENDIF prev +] \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
echo Configuring stage [+id+] in [+module+] ; \
|
|
|
|
cd [+module+] || exit 1; \
|
2004-03-16 01:03:30 +01:00
|
|
|
case $(srcdir) in \
|
|
|
|
\.) \
|
|
|
|
srcdiroption="--srcdir=."; \
|
|
|
|
libsrcdir=".";; \
|
|
|
|
/* | [A-Za-z]:[\\/]*) \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
srcdiroption="--srcdir=$(srcdir)/[+module+]"; \
|
|
|
|
libsrcdir="$$s/[+module+]";; \
|
2004-03-16 01:03:30 +01:00
|
|
|
*) \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
srcdiroption="--srcdir=../$(srcdir)/[+module+]"; \
|
|
|
|
libsrcdir="$$s/[+module+]";; \
|
2004-03-16 01:03:30 +01:00
|
|
|
esac; \
|
|
|
|
$(SHELL) $${libsrcdir}/configure \
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
$(HOST_CONFIGARGS) $${srcdiroption} \
|
2004-08-30 10:02:34 +02:00
|
|
|
[+stage_configure_flags+] [+extra_configure_flags+]
|
2004-03-16 01:03:30 +01:00
|
|
|
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
maybe-all-stage[+id+]-[+module+]: all-stage[+id+]-[+module+]
|
|
|
|
all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
|
2004-08-30 10:02:34 +02:00
|
|
|
@$(MAKE) stage[+id+]-start
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
2004-05-25 21:37:26 +02:00
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
|
|
|
|
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) [+ ENDIF prev +] \
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
cd [+module+] && \
|
|
|
|
$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
|
2004-06-09 10:17:32 +02:00
|
|
|
$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
|
2004-08-30 10:02:34 +02:00
|
|
|
[+stage_make_flags+] [+extra_make_flags+]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
@endif [+module+]-bootstrap
|
|
|
|
[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
|
2004-03-16 01:03:30 +01:00
|
|
|
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
# 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
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
[+ IF compare-target +]
|
2004-08-30 10:02:34 +02:00
|
|
|
[+compare-target+]:
|
|
|
|
@if test -f stage[+prev+]-lean; then \
|
|
|
|
echo Cannot compare object files as stage [+prev+] was deleted. ; \
|
|
|
|
exit 0 ; \
|
|
|
|
fi; \
|
|
|
|
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
2004-03-16 01:03:30 +01:00
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
|
|
|
rm -f .bad_compare ; \
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
cd stage[+id+]-gcc; \
|
2004-03-16 01:03:30 +01:00
|
|
|
files=`find . -name "*$(objext)" -print` ; \
|
|
|
|
cd .. ; \
|
|
|
|
for file in $${files} ; do \
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
f1=$$r/stage[+prev+]-gcc/$$file; f2=$$r/stage[+id+]-gcc/$$file; \
|
2004-04-26 13:46:42 +02:00
|
|
|
@do_compare@ > /dev/null 2>&1; \
|
2004-03-16 01:03:30 +01:00
|
|
|
test $$? -eq 1 && echo $$file differs >> .bad_compare || true; \
|
|
|
|
done ; \
|
|
|
|
if [ -f .bad_compare ]; then \
|
|
|
|
echo "Bootstrap comparison failure!"; \
|
|
|
|
cat .bad_compare; \
|
|
|
|
exit 1; \
|
|
|
|
else \
|
|
|
|
true; \
|
|
|
|
fi ; \
|
2004-08-30 10:02:34 +02:00
|
|
|
$(STAMP) [+compare-target+][+ IF prev +]
|
|
|
|
@bootstrap_lean@-rm -rf stage[+prev+]-* ; $(STAMP) stage[+prev+]-lean[+ ENDIF prev +]
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
[+ ENDIF compare-target +]
|
|
|
|
|
|
|
|
[+ IF bootstrap-target +]
|
|
|
|
.PHONY: [+bootstrap-target+]
|
2004-08-30 10:02:34 +02:00
|
|
|
[+bootstrap-target+]: stage[+id+]-bubble [+compare-target+] all
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
[+ ENDIF bootstrap-target +]
|
|
|
|
|
2004-08-30 10:02:34 +02:00
|
|
|
.PHONY: distclean-stage[+id+]
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
|
2004-06-09 10:17:32 +02:00
|
|
|
# Rules to wipe a stage and all the following ones, used for cleanstrap
|
|
|
|
[+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +]
|
|
|
|
distclean-stage[+id+]::
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
|
2004-08-30 10:02:34 +02:00
|
|
|
rm -rf stage[+id+]-* [+
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
|
|
|
|
|
|
|
|
[+ IF cleanstrap-target +]
|
|
|
|
.PHONY: [+cleanstrap-target+]
|
|
|
|
[+cleanstrap-target+]: distclean-stage1 [+bootstrap-target+]
|
|
|
|
[+ ENDIF cleanstrap-target +]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
@endif gcc-bootstrap
|
configure.in: Test the ability to symlink directories.
2005-05-24 Paolo Bonzini <bonzini@gnu.org>
* configure.in: Test the ability to symlink directories.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): New definitions.
* Makefile.tpl (configure-stage1-gcc,
configure-stage2-gcc, configure-stage3-gcc,
all-stage1-gcc, all-stage2-gcc, all-stage3-gcc,
new-bootstrap, new-cleanstrap, new-restage1, new-restage2,
new-restage3, compare): Autogenerate, see Makefile.in
entry for behavioral changes.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New autogenerated targets.
(objext, prebootstrap, BOOT_CFLAGS,
POSTSTAGE1_FLAGS_TO_PASS): Move above the autogenerated
targets.
* Makefile.in: Regenerate.
(distclean-stage1, new-stage1-start, new-stage1-end,
new-stage1-bubble, distclean-stage2, new-stage2-start,
new-stage2-end, new-stage2-bubble, distclean-stage3,
new-stage3-start, new-stage3-end): New targets.
(all-stage1-gcc): Move prebootstrap dependency from here...
(configure-stage1-gcc): ...to here.
(new-bootstrap): Use bubble targets.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
Use per-stage distclean targets.
(configure-stage1-gcc, configure-stage2-gcc,
configure-stage3-gcc, all-stage1-gcc,
all-stage2-gcc, all-stage3-gcc, new-bootstrap):
Use new-stageN-start to prepare the tree.
From-SVN: r82200
2004-05-24 13:08:12 +02:00
|
|
|
|
|
|
|
[+ ENDFOR bootstrap-stage +]
|
2004-06-09 10:17:32 +02:00
|
|
|
|
|
|
|
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); }
|
|
|
|
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
# 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
|
|
|
|
profiledbootstrap:
|
2004-06-09 10:17:32 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2004-06-09 10:17:32 +02:00
|
|
|
echo "Bootstrapping the compiler"; \
|
Makefile.def (host-modules): Add gcc.
2004-08-03 Paolo Bonzini <bonzini@gnu.org>
* Makefile.def (host-modules): Add gcc.
* Makefile.in: Regenerate.
* Makefile.tpl (sorry): New rule.
(configure-host, all-host, [+make_target+]-host, do-check,
install-host): Do not add gcc as a special case.
(host modules): Add a small special-casing for gcc. Export
extra_make_flags through the environment.
(maybe-configure-gcc, configure-gcc, maybe-all-gcc, all-gcc,
maybe-check-gcc, check-gcc, maybe-install-gcc, install-gcc,
other recursive targets for gcc): Remove.
(all, do-[+make_target+], do-check): Wrap between unstage and stage.
(stage, unstage): New rules.
(stage[+id+]-start, stage[+id+]-end, [+compare-target+],
distclean-stage[+id+]): Use stage_current.
([+bootstrap-target+], profiledbootstrap): Do not invoke manually
the stage*-start rules.
From-SVN: r85468
2004-08-03 11:35:46 +02:00
|
|
|
$(MAKE) stageprofile-bubble distclean-stagefeedback
|
2004-06-09 10:17:32 +02:00
|
|
|
@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
|
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
|
|
|
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
|
|
|
|
$(SET_LIB_PATH) \
|
Makefile.tpl (configure-build-[+module+], [...]): Pass [+extra_configure_args+].
2004-06-22 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (configure-build-[+module+],
configure-[+module+], configure-target-[+module+]): Pass
[+extra_configure_args+].
(all-build-[+module+], all-[+module+], check-[+module+],
install-[+module+], [+make_target+]-[+module+],
all-target-[+module+], check-target-[+module+],
install-target-[+module+], [+make_target+]-target-[+module+]):
Pass [+extra_make_args+].
(HOST_EXPORTS): Include the former GCC_HOST_EXPORTS.
(GCC_HOST_EXPORTS): Remove.
(configure-gcc, all-gcc, GCC_STRAP_TARGETS, profiledbootstrap,
cross, check-gcc, check-gcc-c++, install-gcc,
gcc-no-fixedincludes, [+make_target+]-gcc, stage[+id+]-bubble):
Replace GCC_HOST_EXPORTS with HOST_EXPORTS.
* Makefile.in: Regenerate.
From-SVN: r83542
2004-06-23 10:36:05 +02:00
|
|
|
$(HOST_EXPORTS) \
|
2004-06-09 10:17:32 +02:00
|
|
|
echo "Building feedback based compiler"; \
|
|
|
|
$(MAKE) stagefeedback-bubble stagefeedback-end
|
2004-06-01 09:43:25 +02:00
|
|
|
@endif gcc-bootstrap
|
2004-04-24 08:42:54 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# --------------------------------------
|
|
|
|
# Dependencies between different modules
|
|
|
|
# --------------------------------------
|
|
|
|
|
2004-08-06 08:45:23 +02:00
|
|
|
# Generic dependencies for target modules on host stuff, especially gcc
|
|
|
|
[+ FOR target_modules +]
|
|
|
|
configure-target-[+module+]: maybe-all-gcc
|
|
|
|
[+ ENDFOR target_modules +]
|
|
|
|
|
|
|
|
[+ 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 +]
|
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# 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
|
2004-08-06 08:45:23 +02:00
|
|
|
# are made here to depend on a 'maybe-' target. If you're not sure,
|
2002-12-16 19:23:00 +01:00
|
|
|
# it's safer to use a soft dependency.
|
|
|
|
|
2004-08-06 08:45:23 +02:00
|
|
|
[+ ;; 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.
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
(define make-dep (lambda (module-kind on-kind)
|
2004-08-06 08:45:23 +02:00
|
|
|
(string-append
|
|
|
|
(dep-target module-kind "module" #t) ": "
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
(dep-target on-kind "on" (exist? "hard")))))
|
2004-08-06 08:45:23 +02:00
|
|
|
|
|
|
|
;; 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" is the dependency is on an "install" target,
|
|
|
|
;; or if the LHS 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
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
;; modules on a build module (e.g. all-gcc on all-build-bison). All this
|
2004-08-06 08:45:23 +02:00
|
|
|
;; is only necessary for host modules.
|
|
|
|
(define dep-kind (lambda ()
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
(if (and (hash-ref boot-modules (dep-module "module"))
|
|
|
|
(=* (dep-module "on") "build-"))
|
|
|
|
"prebootstrap"
|
2004-08-06 08:45:23 +02:00
|
|
|
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
(if (or (= (dep-subtarget "on") "install-")
|
|
|
|
(=* (dep-module "on") "target-")
|
|
|
|
(not (hash-ref boot-modules (dep-module "module"))))
|
|
|
|
"normal"
|
|
|
|
"bootstrap"))))
|
2004-08-06 08:45:23 +02:00
|
|
|
|
|
|
|
;; 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 +]
|
|
|
|
|
|
|
|
# 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.
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
[+ FOR dependencies +][+ (make-dep "" "") +]
|
|
|
|
[+ CASE (dep-kind) +]
|
|
|
|
[+ == "prebootstrap"
|
2004-08-06 08:45:23 +02:00
|
|
|
+][+ FOR bootstrap_stage +]
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
[+ (make-dep (dep-stage) "") +][+
|
|
|
|
ENDFOR bootstrap_stage +]
|
|
|
|
all-prebootstrap: [+ (dep-target "" "on" (exist? "hard")) +]
|
|
|
|
[+ == "bootstrap"
|
|
|
|
+][+ FOR bootstrap_stage +]
|
|
|
|
[+ (make-dep (dep-stage) (dep-stage)) +][+
|
2004-08-06 08:45:23 +02:00
|
|
|
ENDFOR bootstrap_stage +]
|
|
|
|
[+ ESAC +][+
|
|
|
|
ENDFOR dependencies +]
|
|
|
|
|
Makefile.in: Regenerate.
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* configure: Regenerate.
* Makefile.def (bootstrap-stage): Rename extra_*_flags to
stage_*_flags.
* Makefile.tpl (configure-[+module+], all-[+module+]): Exit
for bootstrapped modules if toplevel bootstrap is going.
(GCC bootstrap): Generate per-stage targets for all bootstrapped
modules. Adjust for changes in Makefile.def. Enable several
rules even in non-bootstrap mode, just to avoid peppering the
template with unnecessary "@if/@endif gcc-bootstrap" pairs.
(stage-[+prev+]-bubble): Remove.
* Makefile.def (Dependencies): Depend on all-build-bison,
all-build-flex, all-build-byacc, all-build-texinfo, rather
than the host variations.
* Makefile.tpl (BUILD_DIR_PREFIX): Remove. Replace throughout
with BUILD_SUBDIR.
(BISON): Update for recent Bisons.
(YACC): Fix typo.
(cross): Depend on all-build.
(all): Do not depend on all-build.
(prebootstrap): Remove.
(dep-kind): Accept separate prefixes for MODULE and ON variables.
(Prebootstrap dependencies): Add them to the per-stage targets
and to all-prebootstrap.
* configure.in (build_configdirs): Always enable build_tools.
(BUILD_DIR_PREFIX): Remove.
* Makefile.def (gcc): Add target variable.
(gdb, expect, guile, tk, tix): Replace with_x with extra_make_flags.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
gcc/ChangeLog:
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Trust toplevel's notion of BISON/FLEX/MAKEINFO.
No need to check if in a cross configuration.
* configure: Regenerate.
* calls.c (precompute_register_parameters):
Inline preserve_subexpressions_p ().
* expmed.c (expand_mult_const, emit_store_flag): Likewise.
* optabs.c (expand_binop, expand_twoval_binop, prepare_cmp_insn):
Likewise.
* expr.c (get_subtarget): Likewise.
* rtl.h (preserve_subexpressions_p): Remove.
* stmt.c (preserve_subexpressions_p): Remove.
* dojump.c (do_jump) <COND_EXPR, EQ_EXPR, NE_EXPR,
TRUTH_ANDIF_EXPR, TRUTH_ORIF_EXPR, COMPOUND_EXPR>:
Abort on gimplified cases.
From-SVN: r86111
2004-08-17 09:27:16 +02:00
|
|
|
# Non-toplevel bootstrap rules must depend on several packages, to be built
|
|
|
|
# before gcc. Another wart that will go away, hopefully soon.
|
2004-08-06 08:45:23 +02:00
|
|
|
@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
|
|
|
|
|
2002-09-26 06:14:02 +02:00
|
|
|
GDB_TK = @GDB_TK@
|
2004-08-06 08:45:23 +02:00
|
|
|
all-gdb: $(gdbnlmrequirements) $(GDB_TK)
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# Serialization dependencies. Host configures don't work well in parallel to
|
|
|
|
# each other, due to contention over config.cache. Target configures and
|
|
|
|
# build configures are similar.
|
|
|
|
@serialization_dependencies@
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-16 19:23:00 +01:00
|
|
|
# --------------------------------
|
|
|
|
# Regenerating top level configury
|
|
|
|
# --------------------------------
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2002-12-23 17:54:15 +01:00
|
|
|
# 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.
|
2002-12-29 20:04:40 +01:00
|
|
|
multilib.out: maybe-all-gcc
|
2003-07-04 21:45:55 +02:00
|
|
|
@r=`${PWD_COMMAND}`; export r; \
|
2002-12-23 17:54:15 +01:00
|
|
|
echo "Checking multilib configuration..."; \
|
|
|
|
$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
|
|
|
|
$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
|
|
|
|
|
2002-09-25 00:51:57 +02:00
|
|
|
# Rebuilding Makefile.in, using autogen.
|
2002-12-28 17:24:47 +01:00
|
|
|
AUTOGEN = autogen
|
2003-02-20 00:37:24 +01:00
|
|
|
$(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def
|
2002-12-28 17:24:47 +01:00
|
|
|
cd $(srcdir) && $(AUTOGEN) Makefile.def
|
2002-09-25 00:51:57 +02:00
|
|
|
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
# Rebuilding Makefile.
|
2002-12-28 17:24:47 +01:00
|
|
|
Makefile: $(srcdir)/Makefile.in config.status
|
|
|
|
CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
|
|
|
|
|
|
config.status: configure $(gcc_version_trigger)
|
2003-11-21 01:39:18 +01:00
|
|
|
CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck
|
2002-09-25 00:51:57 +02:00
|
|
|
|
configure.in: Convert to autoconf script.
(toplev)
* configure.in: Convert to autoconf script. Blow away lots
of now-redundant Makefile fragments.
* configure: Generate using Autoconf.
* Makefile.tpl: Rewrite to reflect autoconfiscation.
* Makefile.in: Regenerate.
(config)
* acx.m4: New.
* mh-a68bsd, mh-aix386, mh-apollo68, mh-delta88, mh-hp300,
mh-hpux, mh-hpux8, mh-irix5, mh-irix6, mh-ncrsvr43, mh-openedition,
mh-riscos, mh-sysv: Delete.
* mh-cxux, mh-dgux386, mh-interix, mh-lynxrs6k, mh-ncr3000,
mh-necv4, mh-sco, mh-solaris, mh-sysv4, mh-sysv5, mt-v810: Simplify.
From-SVN: r60558
2002-12-28 07:57:50 +01:00
|
|
|
# Rebuilding configure.
|
2002-12-28 17:24:47 +01:00
|
|
|
AUTOCONF = autoconf
|
2003-02-20 00:37:24 +01:00
|
|
|
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
|
2002-12-28 17:24:47 +01:00
|
|
|
cd $(srcdir) && $(AUTOCONF)
|
2002-09-25 00:51:57 +02:00
|
|
|
|
2003-03-14 21:44:37 +01:00
|
|
|
# ------------------------------
|
|
|
|
# Special directives to GNU Make
|
|
|
|
# ------------------------------
|
|
|
|
|
|
|
|
# Don't pass command-line variables to submakes.
|
|
|
|
.NOEXPORT:
|
|
|
|
MAKEOVERRIDES=
|
|
|
|
|
2002-09-25 00:51:57 +02:00
|
|
|
# end of Makefile.in
|