summaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-08-26 14:34:38 +0000
committerH.J. Lu <hjl.tools@gmail.com>2012-08-26 14:34:38 +0000
commitce3c5eda0b8d664790bc633a1013193a3289dff0 (patch)
treea77dfe87e25375232e3a53183180520798e5e1ec /Makefile.tpl
parent612c0a30f8008106f59c017d711a68862239b041 (diff)
downloadgdb-ce3c5eda0b8d664790bc633a1013193a3289dff0.tar.gz
Sync toplevel files with GCC tree
2012-08-14 Diego Novillo <dnovillo@google.com> Merge from cxx-conversion branch. * Makefile.tpl (STAGE[+id+]_CXXFLAGS): Remove POSTSTAGE1_CONFIGURE_FLAGS. * Makefile.in: Regenerate. * configure.ac (ENABLE_BUILD_WITH_CXX): Remove. Update all users. Force C++ when bootstrapping. * configure: Regenerate. 2012-07-06 Richard Guenther <rguenther@suse.de> * Makefile.def (cloog): Pass $(HOST_GMPINC) and $(HOST_ISLINC) as CPPFLAGS, pass path to built gmp as LDFLAGS, always use --with-gmp=system. * Makefile.in: Regenerated. * configure: Likewise. 2012-07-06 Richard Guenther <rguenther@suse.de> * configure.ac (extra_isl_gmp_configure_flags): Initialize and subst. * Makefile.def (isl): Use extra_isl_gmp_configure_flags and supply V=1 as extra_make_flags. * configure: Regenerated. * Makefile.in: Likewise. 2012-07-03 Richard Guenther <rguenther@suse.de> * Makfile.def (isl): Remove not necessary extra_exports and extra_make_flags. (cloog): Use $$CPPFLAGS instead of ${CPPFLAGS}. * Makefile.in: Regenerated. 2012-07-03 Richard Guenther <rguenther@suse.de> * Makefile.def (cloog): Add V=1 to extra_make_flags. * configure.ac: If either the ISL or the CLooG check failed do not try to build in-tree versions. * Makefile.in: Regenerated. * configure: Regenerated. 2012-07-02 Richard Guenther <rguenther@suse.de> Michael Matz <matz@suse.de> Tobias Grosser <tobias@grosser.es> Sebastian Pop <sebpop@gmail.com> * Makefile.def: Add ISL host module, remove PPL host module. Adjust ClooG host module to use the proper ISL. * Makefile.tpl: Pass ISL include flags instead of PPL ones. * configure.ac: Include config/isl.m4. Add ISL host library, remove PPL. Remove PPL configury, add ISL configury, adjust ClooG configury. * Makefile.in: Regenerated. * configure: Likewise. 2012-07-02 Richard Guenther <rguenther@suse.de> Merge from graphite branch 2011-07-21 Tobias Grosser <tobias@grosser.es> * configure: Regenerated. * config/cloog.m4: Remove support for CLooG-ppl and CLooG-parma, both cloog.org and legacy versions. The only supported version will be CLooG with the isl backend. 2011-07-21 Tobias Grosser <tobias@grosser.es> * configure: Regenerated. * configure.ac: Require cloog isl 0.17.0 2011-07-21 Tobias Grosser <tobias@grosser.es> * configure: Regenerated. * config/cloog.m4: Do not define CLOOG_ORG 2012-06-29 Steven Bosscher <steven@gcc.gnu.org> * configure.ac: Skip C if explicitly selected. * configure: Regenerate. 2012-06-28 Christophe Lyon <christophe.lyon@st.com> * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Make sure they contain -O2. * configure: Regenerate. 2012-06-20 Jason Merrill <jason@redhat.com> * Makefile.tpl (check-target-libgomp-c++): New. (check-target-libitm-c++): New. * Makefile.def (c++): Add them. * Makefile.in: Regenerate. 2012-05-16 Olivier Hainque <hainque@adacore.com> * Makefile.tpl (gcc-no-fixedincludes): Rename into ... (gcc-install-no-fixedincludes): Now forwarder to local target in gcc/ (install-no-fixedincludes): Adjust accordingly. * Makefile.in: Regenerate. 2012-05-09 Nick Clifton <nickc@redhat.com> Paul Smith <psmith@gnu.org> PR bootstrap/50461 * configure.ac (mpfr-dir): When using in-tree MPFR sources allow for the fact that from release v3.1.0 of MPFR the source files were moved into a src sub-directory. * configure: Regenerate. 2012-05-07 Janne Blomqvist <jb@gcc.gnu.org> * configure.ac: Bump minimum MPFR version to 2.4.0. * configure: Regenerated. 2012-05-01 Richard Henderson <rth@redhat.com> * Makefile.def (libatomic): New target_module. * configure.ac (target_libraries): Add libatomic. (noconfigdirs): Check if libatomic is supported. * Makefile.in, configure: Rebuild. config/ 2012-08-26 Art Haas <ahaas@impactweather.com> * cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test. 2012-07-04 Tristan Gingold <gingold@adacore.com> * isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling. Fix comments. 2012-07-03 Richard Guenther <rguenther@suse.de> * cloog.m4: Remove debugging print. 2012-07-03 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS. 2012-07-02 Richard Guenther <rguenther@suse.de> * isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer. Fix version test. 2012-07-02 Richard Guenther <rguenther@suse.de> Michael Matz <matz@suse.de> Tobias Grosser <tobias@grosser.es> Sebastian Pop <sebpop@gmail.com> * cloog.m4: Set up to work against ISL only. * isl.m4: New file.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl61
1 files changed, 29 insertions, 32 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index ae263e6d36f..f2c3f48b7d2 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -222,8 +222,7 @@ HOST_EXPORTS = \
HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \
GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \
GMPINC="$(HOST_GMPINC)"; export GMPINC; \
- PPLLIBS="$(HOST_PPLLIBS)"; export PPLLIBS; \
- PPLINC="$(HOST_PPLINC)"; export PPLINC; \
+ ISLINC="$(HOST_ISLINC)"; export ISLINC; \
CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \
CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \
LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \
@@ -313,9 +312,8 @@ NORMAL_TARGET_EXPORTS = \
HOST_GMPLIBS = @gmplibs@
HOST_GMPINC = @gmpinc@
-# Where to find PPL
-HOST_PPLLIBS = @ppllibs@
-HOST_PPLINC = @pplinc@
+# Where to find ISL
+HOST_ISLINC = @islinc@
# Where to find CLOOG
HOST_CLOOGLIBS = @clooglibs@
@@ -425,7 +423,6 @@ TFLAGS =
STAGE_CFLAGS = $(BOOT_CFLAGS)
STAGE_TFLAGS = $(TFLAGS)
STAGE_CONFIGURE_FLAGS=@stage2_werror_flag@
-POSTSTAGE1_CONFIGURE_FLAGS = @POSTSTAGE1_CONFIGURE_FLAGS@
[+ FOR bootstrap-stage +]
# Defaults for stage [+id+]; some are overridden below.
@@ -436,10 +433,7 @@ STAGE[+id+]_CXXFLAGS = $(CXXFLAGS)
STAGE[+id+]_CXXFLAGS = $(STAGE[+id+]_CFLAGS)
@endif target-libstdc++-v3-bootstrap
STAGE[+id+]_TFLAGS = $(STAGE_TFLAGS)
-# STAGE1_CONFIGURE_FLAGS overridden below, so we can use
-# POSTSTAGE1_CONFIGURE_FLAGS here.
-STAGE[+id+]_CONFIGURE_FLAGS = \
- $(STAGE_CONFIGURE_FLAGS) $(POSTSTAGE1_CONFIGURE_FLAGS)
+STAGE[+id+]_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS)
[+ ENDFOR bootstrap-stage +]
# Only build the C compiler for stage1, because that is the only one that
@@ -457,9 +451,6 @@ STAGE1_LANGUAGES = @stage1_languages@
# 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.
-# * Don't remove this, because above we added
-# POSTSTAGE1_CONFIGURE_FLAGS to STAGE[+id+]_CONFIGURE_FLAGS, which
-# we don't want for STAGE1_CONFIGURE_FLAGS.
STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
@@ -906,11 +897,12 @@ install.all: install-no-fixedincludes
true ; \
fi
-# install-no-fixedincludes is used because Cygnus can not distribute
-# the fixed header files.
+# install-no-fixedincludes is used to allow the elaboration of binary packages
+# suitable for distribution, where we cannot include the fixed system header
+# files.
.PHONY: install-no-fixedincludes
install-no-fixedincludes: installdirs install-host-nogcc \
- install-target gcc-no-fixedincludes
+ install-target gcc-install-no-fixedincludes
.PHONY: install-strip
install-strip:
@@ -1414,6 +1406,20 @@ check-target-libmudflap-c++:
@endif target-libmudflap
+@if target-libgomp
+.PHONY: check-target-libgomp-c++
+check-target-libgomp-c++:
+ $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libgomp
+
+@endif target-libgomp
+
+@if target-libitm
+.PHONY: check-target-libitm-c++
+check-target-libitm-c++:
+ $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++.exp" check-target-libitm
+
+@endif target-libitm
+
# ----------
# GCC module
# ----------
@@ -1443,25 +1449,16 @@ check-gcc-[+language+]:
check-[+language+]: check-gcc-[+language+][+ FOR lib-check-target +] [+ lib-check-target +][+ ENDFOR lib-check-target +]
[+ ENDFOR languages +]
-# 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:
+# The gcc part of install-no-fixedincludes, which relies on an intimate
+# knowledge of how a number of gcc internal targets (inter)operate. Delegate.
+.PHONY: gcc-install-no-fixedincludes
+gcc-install-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; \
r=`${PWD_COMMAND}`; export r; \
- s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- (cd ./gcc && \
- $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
- rm -rf gcc/include; \
- mv gcc/tmp-include gcc/include 2>/dev/null; \
+ (cd ./gcc \
+ && $(MAKE) $(GCC_FLAGS_TO_PASS) install-no-fixedincludes); \
else true; fi
@endif gcc