Index: Makefile.def |
diff --git a/Makefile.def b/Makefile.def |
index 9e41ff50a5bf0a06d68d0c4313844e05020bdca0..32296d1160f8205177a405fbf91a67d2325ff8b7 100644 |
--- a/Makefile.def |
+++ b/Makefile.def |
@@ -4,8 +4,7 @@ AutoGen definitions Makefile.tpl; |
// Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'. |
// This file was originally written by Nathanael Nerode. |
// |
-// Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
-// Free Software Foundation |
+// Copyright 2002-2013 Free Software Foundation |
// |
// This file is free software; you can redistribute it and/or modify |
// it under the terms of the GNU General Public License as published by |
@@ -32,8 +31,8 @@ build_modules= { module= m4; }; |
build_modules= { module= texinfo; }; |
build_modules= { module= fixincludes; }; |
-host_modules= { module= bfd; lib_path=.libs; bootstrap=true; }; |
-host_modules= { module= opcodes; lib_path=.libs; bootstrap=true; }; |
+host_modules= { module= bfd; bootstrap=true; }; |
+host_modules= { module= opcodes; bootstrap=true; }; |
host_modules= { module= binutils; bootstrap=true; }; |
host_modules= { module= bison; no_check_cross= true; }; |
host_modules= { module= cgen; }; |
@@ -61,13 +60,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'; |
@@ -79,6 +79,7 @@ host_modules= { module= tcl; |
missing=mostlyclean; }; |
host_modules= { module= itcl; }; |
host_modules= { module= ld; bootstrap=true; }; |
+host_modules= { module= libbacktrace; bootstrap=true; }; |
host_modules= { module= libcpp; bootstrap=true; }; |
host_modules= { module= libdecnumber; bootstrap=true; }; |
host_modules= { module= libgui; }; |
@@ -116,10 +117,20 @@ target_modules = { module= libstdc++-v3; |
bootstrap=true; |
lib_path=src/.libs; |
raw_cxx=true; }; |
-target_modules = { module= libmudflap; lib_path=.libs; }; |
+target_modules = { module= libsanitizer; |
+ bootstrap=true; |
+ lib_path=.libs; |
+ raw_cxx=true; }; |
+target_modules = { module= libvtv; |
+ bootstrap=true; |
+ lib_path=.libs; |
+ raw_cxx=true; }; |
+target_modules = { module= libcilkrts; |
+ lib_path=.libs; }; |
target_modules = { module= libssp; lib_path=.libs; }; |
target_modules = { module= newlib; }; |
target_modules = { module= libgcc; bootstrap=true; no_check=true; }; |
+target_modules = { module= libbacktrace; }; |
target_modules = { module= libquadmath; }; |
target_modules = { module= libgfortran; }; |
target_modules = { module= libobjc; }; |
@@ -131,7 +142,7 @@ target_modules = { module= libtermcap; no_check=true; |
missing=maintainer-clean; }; |
target_modules = { module= winsup; }; |
target_modules = { module= libgloss; no_check=true; }; |
-target_modules = { module= libffi; }; |
+target_modules = { module= libffi; no_install=true; }; |
target_modules = { module= libjava; raw_cxx=true; |
extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; }; |
target_modules = { module= zlib; }; |
@@ -139,6 +150,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. |
@@ -282,6 +295,7 @@ dependencies = { module=all-build-fixincludes; on=all-build-libiberty; }; |
// Host modules specific to gcc. |
dependencies = { module=configure-gcc; on=configure-intl; }; |
+dependencies = { module=configure-gcc; on=all-gmp; }; |
dependencies = { module=configure-gcc; on=all-lto-plugin; }; |
dependencies = { module=configure-gcc; on=all-binutils; }; |
dependencies = { module=configure-gcc; on=all-gas; }; |
@@ -289,11 +303,9 @@ dependencies = { module=configure-gcc; on=all-ld; }; |
dependencies = { module=configure-gcc; on=all-gold; }; |
dependencies = { module=configure-gcc; on=all-libelf; }; |
dependencies = { module=all-gcc; on=all-libiberty; hard=true; }; |
-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; }; |
@@ -301,6 +313,7 @@ dependencies = { module=all-gcc; on=all-build-flex; }; |
dependencies = { module=all-gcc; on=all-build-libiberty; }; |
dependencies = { module=all-gcc; on=all-build-fixincludes; }; |
dependencies = { module=all-gcc; on=all-zlib; }; |
+dependencies = { module=all-gcc; on=all-libbacktrace; hard=true; }; |
dependencies = { module=all-gcc; on=all-libcpp; hard=true; }; |
dependencies = { module=all-gcc; on=all-libdecnumber; hard=true; }; |
dependencies = { module=all-gcc; on=all-libiberty; }; |
@@ -313,6 +326,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 +343,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; }; |
@@ -363,6 +377,9 @@ dependencies = { module=all-bfd; on=all-intl; }; |
dependencies = { module=configure-opcodes; on=configure-libiberty; hard=true; }; |
dependencies = { module=all-opcodes; on=all-libiberty; }; |
+// We must build gas before binutils, gprof, ld and gold to avoid race |
+// condition in the prev-gcc/as script during bootstrap of combined tree |
+// with GCC and binutils. See PR gas/14899 for details. |
dependencies = { module=configure-binutils; on=configure-intl; }; |
dependencies = { module=all-binutils; on=all-libiberty; }; |
dependencies = { module=all-binutils; on=all-opcodes; }; |
@@ -370,6 +387,7 @@ dependencies = { module=all-binutils; on=all-bfd; }; |
dependencies = { module=all-binutils; on=all-build-flex; }; |
dependencies = { module=all-binutils; on=all-build-bison; }; |
dependencies = { module=all-binutils; on=all-intl; }; |
+dependencies = { module=all-binutils; on=all-gas; }; |
// We put install-opcodes before install-binutils because the installed |
// binutils might be on PATH, and they might need the shared opcodes |
@@ -391,6 +409,7 @@ dependencies = { module=all-gprof; on=all-libiberty; }; |
dependencies = { module=all-gprof; on=all-bfd; }; |
dependencies = { module=all-gprof; on=all-opcodes; }; |
dependencies = { module=all-gprof; on=all-intl; }; |
+dependencies = { module=all-gprof; on=all-gas; }; |
dependencies = { module=configure-ld; on=configure-intl; }; |
dependencies = { module=all-ld; on=all-libiberty; }; |
dependencies = { module=all-ld; on=all-bfd; }; |
@@ -398,6 +417,7 @@ dependencies = { module=all-ld; on=all-opcodes; }; |
dependencies = { module=all-ld; on=all-build-bison; }; |
dependencies = { module=all-ld; on=all-build-flex; }; |
dependencies = { module=all-ld; on=all-intl; }; |
+dependencies = { module=all-ld; on=all-gas; }; |
dependencies = { module=install-ld; on=install-gold; }; |
dependencies = { module=install-strip-ld; on=install-strip-gold; }; |
dependencies = { module=configure-gold; on=configure-intl; }; |
@@ -405,6 +425,7 @@ dependencies = { module=all-gold; on=all-libiberty; }; |
dependencies = { module=all-gold; on=all-intl; }; |
dependencies = { module=all-gold; on=all-bfd; }; |
dependencies = { module=all-gold; on=all-build-bison; }; |
+dependencies = { module=all-gold; on=all-gas; }; |
dependencies = { module=check-gold; on=all-binutils; }; |
dependencies = { module=check-gold; on=all-gas; }; |
@@ -471,6 +492,8 @@ 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=libcilkrts; 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; }; |
@@ -484,7 +507,9 @@ dependencies = { module=configure-target-fastjar; on=configure-target-zlib; }; |
dependencies = { module=all-target-fastjar; on=all-target-zlib; }; |
dependencies = { module=configure-target-libgo; on=configure-target-libffi; }; |
dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; }; |
+dependencies = { module=all-target-libgo; on=all-target-libbacktrace; }; |
dependencies = { module=all-target-libgo; on=all-target-libffi; }; |
+dependencies = { module=all-target-libgo; on=all-target-libatomic; }; |
dependencies = { module=configure-target-libjava; on=configure-target-zlib; }; |
dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; }; |
dependencies = { module=configure-target-libjava; on=configure-target-libffi; }; |
@@ -495,11 +520,27 @@ dependencies = { module=all-target-libjava; on=all-target-libffi; }; |
dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; }; |
dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; }; |
dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; |
+dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; }; |
+dependencies = { module=configure-target-libvtv; on=all-target-libstdc++-v3; }; |
// parallel_list.o and parallel_settings.o depend on omp.h, which is |
// generated by the libgomp configure. Unfortunately, due to the use of |
// recursive make, we can't be that specific. |
dependencies = { module=all-target-libstdc++-v3; on=configure-target-libgomp; }; |
+dependencies = { module=install-target-libgo; on=install-target-libatomic; }; |
+dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; }; |
+dependencies = { module=install-target-libgfortran; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; }; |
+dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libvtv; on=install-target-libstdc++-v3; }; |
+dependencies = { module=install-target-libvtv; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v3; }; |
+dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libjava; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libitm; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libobjc; on=install-target-libgcc; }; |
+dependencies = { module=install-target-libstdc++-v3; on=install-target-libgcc; }; |
+ |
// Target modules in the 'src' repository. |
lang_env_dependencies = { module=libtermcap; }; |
lang_env_dependencies = { module=rda; }; |
@@ -512,9 +553,10 @@ 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-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; }; |