From e3f56a99f66298bb505d0426950b9716a853a5df Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 30 May 2019 11:17:19 +0100 Subject: Revert "Sync top level files with versions from gcc." This reverts commit f948b2de97884bfb4e5fc11d40a6bea9e0b096ae. --- Makefile.def | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index 893299b963c..e3a94f2c7de 100644 --- a/Makefile.def +++ b/Makefile.def @@ -4,7 +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-2019 Free Software Foundation +// Copyright 2002-2017 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 @@ -63,7 +63,7 @@ host_modules= { module= mpfr; lib_path=src/.libs; bootstrap=true; extra_make_flags='AM_CFLAGS="-DNO_ASM"'; no_install= true; }; host_modules= { module= mpc; lib_path=src/.libs; bootstrap=true; - extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode'; + extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@'; no_install= true; }; host_modules= { module= isl; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@'; @@ -146,6 +146,8 @@ target_modules = { module= libvtv; bootstrap=true; lib_path=.libs; raw_cxx=true; }; +target_modules = { module= libcilkrts; + lib_path=.libs; }; target_modules = { module= liboffloadmic; lib_path=.libs; extra_configure_flags='@extra_liboffloadmic_configure_flags@'; }; @@ -157,9 +159,6 @@ target_modules = { module= libquadmath; }; target_modules = { module= libgfortran; }; target_modules = { module= libobjc; }; target_modules = { module= libgo; }; -target_modules = { module= libhsail-rt; }; -target_modules = { module= libphobos; - lib_path=src/.libs; }; target_modules = { module= libtermcap; no_check=true; missing=mostlyclean; missing=clean; @@ -272,8 +271,6 @@ flags_to_pass = { flag= STAGE1_CHECKING ; }; flags_to_pass = { flag= STAGE1_LANGUAGES ; }; flags_to_pass = { flag= GNATBIND ; }; flags_to_pass = { flag= GNATMAKE ; }; -flags_to_pass = { flag= GDC ; }; -flags_to_pass = { flag= GDCFLAGS ; }; // Target tools flags_to_pass = { flag= AR_FOR_TARGET ; }; @@ -287,8 +284,6 @@ flags_to_pass = { flag= FLAGS_FOR_TARGET ; }; flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; }; flags_to_pass = { flag= GOC_FOR_TARGET ; }; flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; }; -flags_to_pass = { flag= GDC_FOR_TARGET ; }; -flags_to_pass = { flag= GDCFLAGS_FOR_TARGET ; }; flags_to_pass = { flag= LD_FOR_TARGET ; }; flags_to_pass = { flag= LIPO_FOR_TARGET ; }; flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; }; @@ -548,6 +543,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; }; // on libgcc and newlib/libgloss. lang_env_dependencies = { module=libitm; cxx=true; }; lang_env_dependencies = { module=libffi; cxx=true; }; +lang_env_dependencies = { module=libcilkrts; cxx=true; }; lang_env_dependencies = { module=liboffloadmic; cxx=true; }; lang_env_dependencies = { module=newlib; no_c=true; }; lang_env_dependencies = { module=libgloss; no_c=true; }; @@ -564,11 +560,6 @@ 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-libphobos; on=configure-target-libbacktrace; }; -dependencies = { module=configure-target-libphobos; on=configure-target-zlib; }; -dependencies = { module=all-target-libphobos; on=all-target-libbacktrace; }; -dependencies = { module=all-target-libphobos; on=all-target-zlib; }; -dependencies = { module=all-target-libphobos; on=all-target-libatomic; }; dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; }; dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; }; @@ -582,11 +573,12 @@ dependencies = { module=all-target-liboffloadmic; on=all-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-libphobos; on=install-target-libatomic; }; 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-liboffloadmic; on=install-target-libstdc++-v3; }; dependencies = { module=install-target-liboffloadmic; on=install-target-libgcc; }; dependencies = { module=install-target-libitm; on=install-target-libgcc; }; @@ -620,12 +612,7 @@ languages = { language=objc; gcc-check-target=check-objc; lib-check-target=check-target-libobjc; }; languages = { language=obj-c++; gcc-check-target=check-obj-c++; }; languages = { language=go; gcc-check-target=check-go; - lib-check-target=check-target-libgo; - lib-check-target=check-gotools; }; -languages = { language=brig; gcc-check-target=check-brig; - lib-check-target=check-target-libhsail-rt; }; -languages = { language=d; gcc-check-target=check-d; - lib-check-target=check-target-libphobos; }; + lib-check-target=check-target-libgo; }; // Toplevel bootstrap bootstrap_stage = { id=1 ; }; @@ -644,15 +631,5 @@ bootstrap_stage = { bootstrap_stage = { id=profile ; prev=1 ; }; bootstrap_stage = { - id=train; prev=profile ; } ; -bootstrap_stage = { - id=feedback ; prev=train; + id=feedback ; prev=profile ; bootstrap_target=profiledbootstrap ; }; -bootstrap_stage = { - id=autoprofile ; prev=1 ; - autoprofile="$$s/gcc/config/i386/$(AUTO_PROFILE)" ; }; -bootstrap_stage = { - id=autofeedback ; prev=autoprofile ; - bootstrap_target=autoprofiledbootstrap ; - profile_data="PERF_DATA=perf.data" ; }; - -- cgit v1.2.1