Skip to content
This repository was archived by the owner on Jul 15, 2021. It is now read-only.

Commit e3f56a9

Browse files
nickcliftonnickclifton
committed
Revert "Sync top level files with versions from gcc."
This reverts commit f948b2d.
1 parent ae9ac79 commit e3f56a9

File tree

6 files changed

+575
-10293
lines changed

6 files changed

+575
-10293
lines changed

Diff for: ‎ChangeLog

-27
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,6 @@
33
* src-release.sh (do_proto_toplev): Add libctf to list of
44
directories that can be disabled.
55

6-
2019-05-29 Nick Clifton <[email protected]>
7-
8-
Import this patch from gcc mainline:
9-
2018-10-28 Iain Buclaw <[email protected]>
10-
11-
* Makefile.def (target_modules): Add libphobos.
12-
(flags_to_pass): Add GDC, GDCFLAGS, GDC_FOR_TARGET and
13-
GDCFLAGS_FOR_TARGET.
14-
(dependencies): Make libphobos depend on libatomic, libbacktrace
15-
configure, and zlib configure.
16-
(language): Add language d.
17-
* Makefile.in: Rebuild.
18-
* Makefile.tpl (BUILD_EXPORTS): Add GDC and GDCFLAGS.
19-
(HOST_EXPORTS): Add GDC.
20-
(POSTSTAGE1_HOST_EXPORTS): Add GDC and GDC_FOR_BUILD.
21-
(BASE_TARGET_EXPORTS): Add GDC.
22-
(GDC_FOR_BUILD, GDC, GDCFLAGS): New variables.
23-
(GDC_FOR_TARGET, GDC_FLAGS_FOR_TARGET): New variables.
24-
(EXTRA_HOST_FLAGS): Add GDC.
25-
(STAGE1_FLAGS_TO_PASS): Add GDC.
26-
(EXTRA_TARGET_FLAGS): Add GDC and GDCFLAGS.
27-
* config-ml.in: Treat GDC and GDCFLAGS like other compiler/flag
28-
environment variables.
29-
* configure: Rebuild.
30-
* configure.ac: Add target-libphobos to target_libraries. Set and
31-
substitute GDC_FOR_BUILD and GDC_FOR_TARGET.
32-
336
2019-05-29 Nick Clifton <[email protected]>
347

358
* configure.ac (noconfigdirs): Add libctf if the target does not use

Diff for: ‎Makefile.def

+9-32
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ AutoGen definitions Makefile.tpl;
44
// Makefile.in is generated from Makefile.tpl by 'autogen Makefile.def'.
55
// This file was originally written by Nathanael Nerode.
66
//
7-
// Copyright 2002-2019 Free Software Foundation
7+
// Copyright 2002-2017 Free Software Foundation
88
//
99
// This file is free software; you can redistribute it and/or modify
1010
// 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;
6363
extra_make_flags='AM_CFLAGS="-DNO_ASM"';
6464
no_install= true; };
6565
host_modules= { module= mpc; lib_path=src/.libs; bootstrap=true;
66-
extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ --disable-maintainer-mode';
66+
extra_configure_flags='--disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@';
6767
no_install= true; };
6868
host_modules= { module= isl; lib_path=.libs; bootstrap=true;
6969
extra_configure_flags='--disable-shared @extra_isl_gmp_configure_flags@';
@@ -146,6 +146,8 @@ target_modules = { module= libvtv;
146146
bootstrap=true;
147147
lib_path=.libs;
148148
raw_cxx=true; };
149+
target_modules = { module= libcilkrts;
150+
lib_path=.libs; };
149151
target_modules = { module= liboffloadmic;
150152
lib_path=.libs;
151153
extra_configure_flags='@extra_liboffloadmic_configure_flags@'; };
@@ -157,9 +159,6 @@ target_modules = { module= libquadmath; };
157159
target_modules = { module= libgfortran; };
158160
target_modules = { module= libobjc; };
159161
target_modules = { module= libgo; };
160-
target_modules = { module= libhsail-rt; };
161-
target_modules = { module= libphobos;
162-
lib_path=src/.libs; };
163162
target_modules = { module= libtermcap; no_check=true;
164163
missing=mostlyclean;
165164
missing=clean;
@@ -272,8 +271,6 @@ flags_to_pass = { flag= STAGE1_CHECKING ; };
272271
flags_to_pass = { flag= STAGE1_LANGUAGES ; };
273272
flags_to_pass = { flag= GNATBIND ; };
274273
flags_to_pass = { flag= GNATMAKE ; };
275-
flags_to_pass = { flag= GDC ; };
276-
flags_to_pass = { flag= GDCFLAGS ; };
277274

278275
// Target tools
279276
flags_to_pass = { flag= AR_FOR_TARGET ; };
@@ -287,8 +284,6 @@ flags_to_pass = { flag= FLAGS_FOR_TARGET ; };
287284
flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
288285
flags_to_pass = { flag= GOC_FOR_TARGET ; };
289286
flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
290-
flags_to_pass = { flag= GDC_FOR_TARGET ; };
291-
flags_to_pass = { flag= GDCFLAGS_FOR_TARGET ; };
292287
flags_to_pass = { flag= LD_FOR_TARGET ; };
293288
flags_to_pass = { flag= LIPO_FOR_TARGET ; };
294289
flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
@@ -548,6 +543,7 @@ dependencies = { module=all-m4; on=all-build-texinfo; };
548543
// on libgcc and newlib/libgloss.
549544
lang_env_dependencies = { module=libitm; cxx=true; };
550545
lang_env_dependencies = { module=libffi; cxx=true; };
546+
lang_env_dependencies = { module=libcilkrts; cxx=true; };
551547
lang_env_dependencies = { module=liboffloadmic; cxx=true; };
552548
lang_env_dependencies = { module=newlib; no_c=true; };
553549
lang_env_dependencies = { module=libgloss; no_c=true; };
@@ -564,11 +560,6 @@ dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; };
564560
dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
565561
dependencies = { module=all-target-libgo; on=all-target-libffi; };
566562
dependencies = { module=all-target-libgo; on=all-target-libatomic; };
567-
dependencies = { module=configure-target-libphobos; on=configure-target-libbacktrace; };
568-
dependencies = { module=configure-target-libphobos; on=configure-target-zlib; };
569-
dependencies = { module=all-target-libphobos; on=all-target-libbacktrace; };
570-
dependencies = { module=all-target-libphobos; on=all-target-zlib; };
571-
dependencies = { module=all-target-libphobos; on=all-target-libatomic; };
572563
dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
573564
dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; };
574565
dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
@@ -582,11 +573,12 @@ dependencies = { module=all-target-liboffloadmic; on=all-target-libgomp; };
582573
dependencies = { module=install-target-libgo; on=install-target-libatomic; };
583574
dependencies = { module=install-target-libgfortran; on=install-target-libquadmath; };
584575
dependencies = { module=install-target-libgfortran; on=install-target-libgcc; };
585-
dependencies = { module=install-target-libphobos; on=install-target-libatomic; };
586576
dependencies = { module=install-target-libsanitizer; on=install-target-libstdc++-v3; };
587577
dependencies = { module=install-target-libsanitizer; on=install-target-libgcc; };
588578
dependencies = { module=install-target-libvtv; on=install-target-libstdc++-v3; };
589579
dependencies = { module=install-target-libvtv; on=install-target-libgcc; };
580+
dependencies = { module=install-target-libcilkrts; on=install-target-libstdc++-v3; };
581+
dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; };
590582
dependencies = { module=install-target-liboffloadmic; on=install-target-libstdc++-v3; };
591583
dependencies = { module=install-target-liboffloadmic; on=install-target-libgcc; };
592584
dependencies = { module=install-target-libitm; on=install-target-libgcc; };
@@ -620,12 +612,7 @@ languages = { language=objc; gcc-check-target=check-objc;
620612
lib-check-target=check-target-libobjc; };
621613
languages = { language=obj-c++; gcc-check-target=check-obj-c++; };
622614
languages = { language=go; gcc-check-target=check-go;
623-
lib-check-target=check-target-libgo;
624-
lib-check-target=check-gotools; };
625-
languages = { language=brig; gcc-check-target=check-brig;
626-
lib-check-target=check-target-libhsail-rt; };
627-
languages = { language=d; gcc-check-target=check-d;
628-
lib-check-target=check-target-libphobos; };
615+
lib-check-target=check-target-libgo; };
629616

630617
// Toplevel bootstrap
631618
bootstrap_stage = { id=1 ; };
@@ -644,15 +631,5 @@ bootstrap_stage = {
644631
bootstrap_stage = {
645632
id=profile ; prev=1 ; };
646633
bootstrap_stage = {
647-
id=train; prev=profile ; } ;
648-
bootstrap_stage = {
649-
id=feedback ; prev=train;
634+
id=feedback ; prev=profile ;
650635
bootstrap_target=profiledbootstrap ; };
651-
bootstrap_stage = {
652-
id=autoprofile ; prev=1 ;
653-
autoprofile="$$s/gcc/config/i386/$(AUTO_PROFILE)" ; };
654-
bootstrap_stage = {
655-
id=autofeedback ; prev=autoprofile ;
656-
bootstrap_target=autoprofiledbootstrap ;
657-
profile_data="PERF_DATA=perf.data" ; };
658-

0 commit comments

Comments
 (0)