From a626f4eeb06c43596176af7053f5289458eca492 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sun, 26 Aug 2012 14:34:40 +0000 Subject: Sync toplevel files with GCC tree 2012-08-14 Diego Novillo 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 * 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 * 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 * 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 * 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 Michael Matz Tobias Grosser Sebastian Pop * 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 Merge from graphite branch 2011-07-21 Tobias Grosser * 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 * configure: Regenerated. * configure.ac: Require cloog isl 0.17.0 2011-07-21 Tobias Grosser * configure: Regenerated. * config/cloog.m4: Do not define CLOOG_ORG 2012-06-29 Steven Bosscher * configure.ac: Skip C if explicitly selected. * configure: Regenerate. 2012-06-28 Christophe Lyon * configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Make sure they contain -O2. * configure: Regenerate. 2012-06-20 Jason Merrill * 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 * 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 Paul Smith 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 * configure.ac: Bump minimum MPFR version to 2.4.0. * configure: Regenerated. 2012-05-01 Richard Henderson * 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 * cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test. 2012-07-04 Tristan Gingold * isl.m4 (ISL_CHECK_VERSION): Set to yes if cross-compiling. Fix comments. 2012-07-03 Richard Guenther * cloog.m4: Remove debugging print. 2012-07-03 Rainer Orth * isl.m4 (ISL_CHECK_VERSION): Add -lisl to LIBS, not LDFLAGS. 2012-07-02 Richard Guenther * isl.m4 (_ISL_CHECK_CT_PROG): Omit main function header/footer. Fix version test. 2012-07-02 Richard Guenther Michael Matz Tobias Grosser Sebastian Pop * cloog.m4: Set up to work against ISL only. * isl.m4: New file. --- Makefile.def | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index 9e41ff50a..b9e301419 100644 --- a/Makefile.def +++ b/Makefile.def @@ -61,13 +61,14 @@ host_modules= { module= mpfr; lib_path=.libs; bootstrap=true; host_modules= { module= mpc; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@'; no_install= true; }; -host_modules= { module= ppl; lib_path=src/.libs; bootstrap=true; - extra_configure_flags='--disable-shared --with-libgmp-prefix=$$r/$(HOST_SUBDIR)/gmp/ --with-libgmpxx-prefix=$$r/$(HOST_SUBDIR)/gmp/'; +host_modules= { module= isl; lib_path=.libs; bootstrap=true; + extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@'; + extra_make_flags='V=1'; no_install= true; }; host_modules= { module= cloog; lib_path=.libs; bootstrap=true; - extra_configure_flags='--disable-shared --with-gmp-library=$$r/$(HOST_SUBDIR)/gmp/.libs --with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-bits=gmp --with-ppl'; - extra_exports='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}"; export CPPFLAGS; LDFLAGS="$$LDFLAGS ${HOST_PPLLIBS}"; export LDFLAGS; '; - extra_make_flags='CPPFLAGS="${CPPFLAGS} ${HOST_PPLINC}" LDFLAGS="$$LDFLAGS"'; + extra_configure_flags='--disable-shared --with-gmp=system --with-bits=gmp --with-isl=system'; + extra_exports='CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; '; + extra_make_flags='CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1'; no_install= true; }; host_modules= { module= libelf; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared'; @@ -139,6 +140,8 @@ target_modules = { module= boehm-gc; }; target_modules = { module= rda; }; target_modules = { module= libada; }; target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; }; +target_modules = { module= libitm; lib_path=.libs; }; +target_modules = { module= libatomic; lib_path=.libs; }; // These are (some of) the make targets to be done in each subdirectory. // Not all; these are the ones which don't have special options. @@ -293,7 +296,6 @@ dependencies = { module=all-gcc; on=all-gmp; }; dependencies = { module=all-gcc; on=all-intl; }; dependencies = { module=all-gcc; on=all-mpfr; }; dependencies = { module=all-gcc; on=all-mpc; }; -dependencies = { module=all-gcc; on=all-ppl; }; dependencies = { module=all-gcc; on=all-cloog; }; dependencies = { module=all-gcc; on=all-build-texinfo; }; dependencies = { module=all-gcc; on=all-build-bison; }; @@ -313,6 +315,7 @@ dependencies = { module=html-gcc; on=all-build-libiberty; }; dependencies = { module=install-gcc ; on=install-fixincludes; }; dependencies = { module=install-gcc ; on=install-lto-plugin; }; dependencies = { module=install-strip-gcc ; on=install-strip-fixincludes; }; +dependencies = { module=install-strip-gcc ; on=install-strip-lto-plugin; }; dependencies = { module=configure-libcpp; on=configure-libiberty; hard=true; }; dependencies = { module=configure-libcpp; on=configure-intl; }; @@ -329,9 +332,9 @@ dependencies = { module=all-utils; on=all-libiberty; }; dependencies = { module=configure-mpfr; on=all-gmp; }; dependencies = { module=configure-mpc; on=all-mpfr; }; -dependencies = { module=configure-ppl; on=all-gmp; }; -dependencies = { module=configure-ppl; on=all-mpfr; }; -dependencies = { module=configure-cloog; on=all-ppl; }; +dependencies = { module=configure-isl; on=all-gmp; }; +dependencies = { module=configure-cloog; on=all-isl; }; +dependencies = { module=configure-cloog; on=all-gmp; }; // Host modules specific to gdb. dependencies = { module=configure-gdb; on=all-intl; }; @@ -471,6 +474,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; }; // environment (e.g. on libstdc++). By default target modules depend // on libgcc and newlib/libgloss. lang_env_dependencies = { module=libjava; cxx=true; }; +lang_env_dependencies = { module=libitm; cxx=true; }; lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=libgloss; no_c=true; }; lang_env_dependencies = { module=libgcc; no_gcc=true; no_c=true; }; @@ -512,9 +516,11 @@ dependencies = { module=configure-target-newlib; on=all-ld; }; dependencies = { module=configure-target-libgfortran; on=all-target-libquadmath; }; languages = { language=c; gcc-check-target=check-gcc; }; -languages = { language=c++; gcc-check-target="check-c++ check-c++0x"; +languages = { language=c++; gcc-check-target=check-c++; lib-check-target=check-target-libstdc++-v3; - lib-check-target=check-target-libmudflap-c++; }; + lib-check-target=check-target-libmudflap-c++; + lib-check-target=check-target-libitm-c++; + lib-check-target=check-target-libgomp-c++; }; languages = { language=fortran; gcc-check-target=check-fortran; lib-check-target=check-target-libquadmath; lib-check-target=check-target-libgfortran; }; -- cgit v1.2.3