From acd367ad7f953142f910b669f9d0c7700b5473f6 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Wed, 29 Aug 2018 00:23:07 +0200 Subject: [PATCH 1/4] fix Bug 303: libgphobos.spec not found linking stage2 --- gcc/d/patches/patch-toplev-8.patch | 112 ++++++++++++------------ gcc/d/patches/patch-toplev-ddmd-8.patch | 38 ++++---- 2 files changed, 77 insertions(+), 73 deletions(-) diff --git a/gcc/d/patches/patch-toplev-8.patch b/gcc/d/patches/patch-toplev-8.patch index 4dc3ad2e5..2503c405b 100644 --- a/gcc/d/patches/patch-toplev-8.patch +++ b/gcc/d/patches/patch-toplev-8.patch @@ -78,20 +78,22 @@ This implements building of libphobos library in GCC. AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ -@@ -256,6 +259,12 @@ POSTSTAGE1_HOST_EXPORTS = \ +@@ -256,6 +259,14 @@ POSTSTAGE1_HOST_EXPORTS = \ CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ $(POSTSTAGE1_CXX_EXPORT) \ $(LTO_EXPORTS) \ + GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -+ -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \ ++ -B$(build_tooldir)/bin/ $(GDCFLAGS_FOR_TARGET) \ ++ -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \ + -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \ -+ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs"; \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \ + export GDC; \ + GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \ GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \ LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \ HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS; -@@ -278,6 +287,7 @@ BASE_TARGET_EXPORTS = \ +@@ -278,6 +289,7 @@ BASE_TARGET_EXPORTS = \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \ GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \ @@ -99,7 +101,7 @@ This implements building of libphobos library in GCC. DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ -@@ -342,6 +352,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ +@@ -342,6 +354,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@ GOC_FOR_BUILD = @GOC_FOR_BUILD@ @@ -107,7 +109,7 @@ This implements building of libphobos library in GCC. LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LD_FOR_BUILD = @LD_FOR_BUILD@ NM_FOR_BUILD = @NM_FOR_BUILD@ -@@ -399,6 +410,7 @@ STRIP = @STRIP@ +@@ -399,6 +412,7 @@ STRIP = @STRIP@ WINDRES = @WINDRES@ WINDMC = @WINDMC@ @@ -115,7 +117,7 @@ This implements building of libphobos library in GCC. GNATBIND = @GNATBIND@ GNATMAKE = @GNATMAKE@ -@@ -408,6 +420,7 @@ LIBCFLAGS = $(CFLAGS) +@@ -408,6 +422,7 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates GOCFLAGS = $(CFLAGS) @@ -123,7 +125,7 @@ This implements building of libphobos library in GCC. CREATE_GCOV = create_gcov -@@ -564,6 +577,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ +@@ -564,6 +579,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@ @@ -131,7 +133,7 @@ This implements building of libphobos library in GCC. DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ -@@ -588,6 +602,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG +@@ -588,6 +604,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@ GOCFLAGS_FOR_TARGET = -O2 -g @@ -139,7 +141,7 @@ This implements building of libphobos library in GCC. FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -@@ -612,7 +627,7 @@ all: +@@ -612,7 +629,7 @@ all: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the target machine work. @@ -148,7 +150,7 @@ This implements building of libphobos library in GCC. @if target-libstdc++-v3 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: -@@ -638,6 +653,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TA +@@ -638,6 +655,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TA TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs: @endif target-libssp @@ -159,7 +161,7 @@ This implements building of libphobos library in GCC. @if target-libgomp TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs: @endif target-libgomp -@@ -772,6 +791,8 @@ BASE_FLAGS_TO_PASS = \ +@@ -772,6 +793,8 @@ BASE_FLAGS_TO_PASS = \ "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ "GNATBIND=$(GNATBIND)" \ "GNATMAKE=$(GNATMAKE)" \ @@ -168,7 +170,7 @@ This implements building of libphobos library in GCC. "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ -@@ -783,6 +804,8 @@ BASE_FLAGS_TO_PASS = \ +@@ -783,6 +806,8 @@ BASE_FLAGS_TO_PASS = \ "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \ "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \ @@ -177,7 +179,7 @@ This implements building of libphobos library in GCC. "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \ "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \ -@@ -845,6 +868,7 @@ EXTRA_HOST_FLAGS = \ +@@ -845,6 +870,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'GFORTRAN=$(GFORTRAN)' \ 'GOC=$(GOC)' \ @@ -185,7 +187,7 @@ This implements building of libphobos library in GCC. 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ -@@ -869,6 +893,7 @@ STAGE1_FLAGS_TO_PASS = \ +@@ -869,6 +895,7 @@ STAGE1_FLAGS_TO_PASS = \ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \ @@ -193,7 +195,7 @@ This implements building of libphobos library in GCC. GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ -@@ -901,6 +926,8 @@ EXTRA_TARGET_FLAGS = \ +@@ -901,6 +928,8 @@ EXTRA_TARGET_FLAGS = \ 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \ @@ -202,7 +204,7 @@ This implements building of libphobos library in GCC. 'LD=$(COMPILER_LD_FOR_TARGET)' \ 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ -@@ -1003,6 +1030,7 @@ configure-target: \ +@@ -1003,6 +1032,7 @@ configure-target: \ maybe-configure-target-libobjc \ maybe-configure-target-libgo \ maybe-configure-target-libhsail-rt \ @@ -210,7 +212,7 @@ This implements building of libphobos library in GCC. maybe-configure-target-libtermcap \ maybe-configure-target-winsup \ maybe-configure-target-libgloss \ -@@ -1168,6 +1196,7 @@ all-target: maybe-all-target-libgfortran +@@ -1168,6 +1198,7 @@ all-target: maybe-all-target-libgfortran all-target: maybe-all-target-libobjc all-target: maybe-all-target-libgo all-target: maybe-all-target-libhsail-rt @@ -218,7 +220,7 @@ This implements building of libphobos library in GCC. all-target: maybe-all-target-libtermcap all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss -@@ -1260,6 +1289,7 @@ info-target: maybe-info-target-libgfortr +@@ -1260,6 +1291,7 @@ info-target: maybe-info-target-libgfortr info-target: maybe-info-target-libobjc info-target: maybe-info-target-libgo info-target: maybe-info-target-libhsail-rt @@ -226,7 +228,7 @@ This implements building of libphobos library in GCC. info-target: maybe-info-target-libtermcap info-target: maybe-info-target-winsup info-target: maybe-info-target-libgloss -@@ -1345,6 +1375,7 @@ dvi-target: maybe-dvi-target-libgfortran +@@ -1345,6 +1377,7 @@ dvi-target: maybe-dvi-target-libgfortran dvi-target: maybe-dvi-target-libobjc dvi-target: maybe-dvi-target-libgo dvi-target: maybe-dvi-target-libhsail-rt @@ -234,7 +236,7 @@ This implements building of libphobos library in GCC. dvi-target: maybe-dvi-target-libtermcap dvi-target: maybe-dvi-target-winsup dvi-target: maybe-dvi-target-libgloss -@@ -1430,6 +1461,7 @@ pdf-target: maybe-pdf-target-libgfortran +@@ -1430,6 +1463,7 @@ pdf-target: maybe-pdf-target-libgfortran pdf-target: maybe-pdf-target-libobjc pdf-target: maybe-pdf-target-libgo pdf-target: maybe-pdf-target-libhsail-rt @@ -242,7 +244,7 @@ This implements building of libphobos library in GCC. pdf-target: maybe-pdf-target-libtermcap pdf-target: maybe-pdf-target-winsup pdf-target: maybe-pdf-target-libgloss -@@ -1515,6 +1547,7 @@ html-target: maybe-html-target-libgfortr +@@ -1515,6 +1549,7 @@ html-target: maybe-html-target-libgfortr html-target: maybe-html-target-libobjc html-target: maybe-html-target-libgo html-target: maybe-html-target-libhsail-rt @@ -250,7 +252,7 @@ This implements building of libphobos library in GCC. html-target: maybe-html-target-libtermcap html-target: maybe-html-target-winsup html-target: maybe-html-target-libgloss -@@ -1600,6 +1633,7 @@ TAGS-target: maybe-TAGS-target-libgfortr +@@ -1600,6 +1635,7 @@ TAGS-target: maybe-TAGS-target-libgfortr TAGS-target: maybe-TAGS-target-libobjc TAGS-target: maybe-TAGS-target-libgo TAGS-target: maybe-TAGS-target-libhsail-rt @@ -258,7 +260,7 @@ This implements building of libphobos library in GCC. TAGS-target: maybe-TAGS-target-libtermcap TAGS-target: maybe-TAGS-target-winsup TAGS-target: maybe-TAGS-target-libgloss -@@ -1685,6 +1719,7 @@ install-info-target: maybe-install-info- +@@ -1685,6 +1721,7 @@ install-info-target: maybe-install-info- install-info-target: maybe-install-info-target-libobjc install-info-target: maybe-install-info-target-libgo install-info-target: maybe-install-info-target-libhsail-rt @@ -266,7 +268,7 @@ This implements building of libphobos library in GCC. install-info-target: maybe-install-info-target-libtermcap install-info-target: maybe-install-info-target-winsup install-info-target: maybe-install-info-target-libgloss -@@ -1770,6 +1805,7 @@ install-pdf-target: maybe-install-pdf-ta +@@ -1770,6 +1807,7 @@ install-pdf-target: maybe-install-pdf-ta install-pdf-target: maybe-install-pdf-target-libobjc install-pdf-target: maybe-install-pdf-target-libgo install-pdf-target: maybe-install-pdf-target-libhsail-rt @@ -274,7 +276,7 @@ This implements building of libphobos library in GCC. install-pdf-target: maybe-install-pdf-target-libtermcap install-pdf-target: maybe-install-pdf-target-winsup install-pdf-target: maybe-install-pdf-target-libgloss -@@ -1855,6 +1891,7 @@ install-html-target: maybe-install-html- +@@ -1855,6 +1893,7 @@ install-html-target: maybe-install-html- install-html-target: maybe-install-html-target-libobjc install-html-target: maybe-install-html-target-libgo install-html-target: maybe-install-html-target-libhsail-rt @@ -282,7 +284,7 @@ This implements building of libphobos library in GCC. install-html-target: maybe-install-html-target-libtermcap install-html-target: maybe-install-html-target-winsup install-html-target: maybe-install-html-target-libgloss -@@ -1940,6 +1977,7 @@ installcheck-target: maybe-installcheck- +@@ -1940,6 +1979,7 @@ installcheck-target: maybe-installcheck- installcheck-target: maybe-installcheck-target-libobjc installcheck-target: maybe-installcheck-target-libgo installcheck-target: maybe-installcheck-target-libhsail-rt @@ -290,7 +292,7 @@ This implements building of libphobos library in GCC. installcheck-target: maybe-installcheck-target-libtermcap installcheck-target: maybe-installcheck-target-winsup installcheck-target: maybe-installcheck-target-libgloss -@@ -2025,6 +2063,7 @@ mostlyclean-target: maybe-mostlyclean-ta +@@ -2025,6 +2065,7 @@ mostlyclean-target: maybe-mostlyclean-ta mostlyclean-target: maybe-mostlyclean-target-libobjc mostlyclean-target: maybe-mostlyclean-target-libgo mostlyclean-target: maybe-mostlyclean-target-libhsail-rt @@ -298,7 +300,7 @@ This implements building of libphobos library in GCC. mostlyclean-target: maybe-mostlyclean-target-libtermcap mostlyclean-target: maybe-mostlyclean-target-winsup mostlyclean-target: maybe-mostlyclean-target-libgloss -@@ -2110,6 +2149,7 @@ clean-target: maybe-clean-target-libgfor +@@ -2110,6 +2151,7 @@ clean-target: maybe-clean-target-libgfor clean-target: maybe-clean-target-libobjc clean-target: maybe-clean-target-libgo clean-target: maybe-clean-target-libhsail-rt @@ -306,7 +308,7 @@ This implements building of libphobos library in GCC. clean-target: maybe-clean-target-libtermcap clean-target: maybe-clean-target-winsup clean-target: maybe-clean-target-libgloss -@@ -2195,6 +2235,7 @@ distclean-target: maybe-distclean-target +@@ -2195,6 +2237,7 @@ distclean-target: maybe-distclean-target distclean-target: maybe-distclean-target-libobjc distclean-target: maybe-distclean-target-libgo distclean-target: maybe-distclean-target-libhsail-rt @@ -314,7 +316,7 @@ This implements building of libphobos library in GCC. distclean-target: maybe-distclean-target-libtermcap distclean-target: maybe-distclean-target-winsup distclean-target: maybe-distclean-target-libgloss -@@ -2280,6 +2321,7 @@ maintainer-clean-target: maybe-maintaine +@@ -2280,6 +2323,7 @@ maintainer-clean-target: maybe-maintaine maintainer-clean-target: maybe-maintainer-clean-target-libobjc maintainer-clean-target: maybe-maintainer-clean-target-libgo maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt @@ -322,7 +324,7 @@ This implements building of libphobos library in GCC. maintainer-clean-target: maybe-maintainer-clean-target-libtermcap maintainer-clean-target: maybe-maintainer-clean-target-winsup maintainer-clean-target: maybe-maintainer-clean-target-libgloss -@@ -2421,6 +2463,7 @@ check-target: \ +@@ -2421,6 +2465,7 @@ check-target: \ maybe-check-target-libobjc \ maybe-check-target-libgo \ maybe-check-target-libhsail-rt \ @@ -330,7 +332,7 @@ This implements building of libphobos library in GCC. maybe-check-target-libtermcap \ maybe-check-target-winsup \ maybe-check-target-libgloss \ -@@ -2602,6 +2645,7 @@ install-target: \ +@@ -2602,6 +2647,7 @@ install-target: \ maybe-install-target-libobjc \ maybe-install-target-libgo \ maybe-install-target-libhsail-rt \ @@ -338,7 +340,7 @@ This implements building of libphobos library in GCC. maybe-install-target-libtermcap \ maybe-install-target-winsup \ maybe-install-target-libgloss \ -@@ -2707,6 +2751,7 @@ install-strip-target: \ +@@ -2707,6 +2753,7 @@ install-strip-target: \ maybe-install-strip-target-libobjc \ maybe-install-strip-target-libgo \ maybe-install-strip-target-libhsail-rt \ @@ -346,7 +348,7 @@ This implements building of libphobos library in GCC. maybe-install-strip-target-libtermcap \ maybe-install-strip-target-winsup \ maybe-install-strip-target-libgloss \ -@@ -48201,6 +48246,464 @@ maintainer-clean-target-libhsail-rt: +@@ -48201,6 +48248,464 @@ maintainer-clean-target-libhsail-rt: @@ -811,7 +813,7 @@ This implements building of libphobos library in GCC. .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap maybe-configure-target-libtermcap: @if gcc-bootstrap -@@ -53582,6 +54085,14 @@ check-gcc-brig: +@@ -53582,6 +54087,14 @@ check-gcc-brig: (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig); check-brig: check-gcc-brig check-target-libhsail-rt @@ -826,7 +828,7 @@ This implements building of libphobos library in GCC. # The gcc part of install-no-fixedincludes, which relies on an intimate # knowledge of how a number of gcc internal targets (inter)operate. Delegate. -@@ -56783,6 +57294,7 @@ configure-target-libgfortran: stage_last +@@ -56783,6 +57296,7 @@ configure-target-libgfortran: stage_last configure-target-libobjc: stage_last configure-target-libgo: stage_last configure-target-libhsail-rt: stage_last @@ -834,7 +836,7 @@ This implements building of libphobos library in GCC. configure-target-libtermcap: stage_last configure-target-winsup: stage_last configure-target-libgloss: stage_last -@@ -56818,6 +57330,7 @@ configure-target-libgfortran: maybe-all- +@@ -56818,6 +57332,7 @@ configure-target-libgfortran: maybe-all- configure-target-libobjc: maybe-all-gcc configure-target-libgo: maybe-all-gcc configure-target-libhsail-rt: maybe-all-gcc @@ -842,7 +844,7 @@ This implements building of libphobos library in GCC. configure-target-libtermcap: maybe-all-gcc configure-target-winsup: maybe-all-gcc configure-target-libgloss: maybe-all-gcc -@@ -57934,6 +58447,11 @@ configure-target-libgo: maybe-all-target +@@ -57934,6 +58449,11 @@ configure-target-libgo: maybe-all-target all-target-libgo: maybe-all-target-libbacktrace all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic @@ -854,7 +856,7 @@ This implements building of libphobos library in GCC. configure-target-libstdc++-v3: maybe-configure-target-libgomp configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp -@@ -57983,6 +58501,7 @@ all-target-liboffloadmic: maybe-all-targ +@@ -57983,6 +58503,7 @@ all-target-liboffloadmic: maybe-all-targ install-target-libgo: maybe-install-target-libatomic install-target-libgfortran: maybe-install-target-libquadmath install-target-libgfortran: maybe-install-target-libgcc @@ -862,7 +864,7 @@ This implements building of libphobos library in GCC. install-target-libsanitizer: maybe-install-target-libstdc++-v3 install-target-libsanitizer: maybe-install-target-libgcc install-target-libvtv: maybe-install-target-libstdc++-v3 -@@ -58067,6 +58586,7 @@ configure-target-libgfortran: maybe-all- +@@ -58067,6 +58588,7 @@ configure-target-libgfortran: maybe-all- configure-target-libobjc: maybe-all-target-libgcc configure-target-libgo: maybe-all-target-libgcc configure-target-libhsail-rt: maybe-all-target-libgcc @@ -870,7 +872,7 @@ This implements building of libphobos library in GCC. configure-target-libtermcap: maybe-all-target-libgcc configure-target-winsup: maybe-all-target-libgcc configure-target-libgloss: maybe-all-target-libgcc -@@ -58107,6 +58627,8 @@ configure-target-libgo: maybe-all-target +@@ -58107,6 +58629,8 @@ configure-target-libgo: maybe-all-target configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss @@ -898,20 +900,22 @@ This implements building of libphobos library in GCC. AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ -@@ -259,6 +262,12 @@ POSTSTAGE1_HOST_EXPORTS = \ +@@ -259,6 +262,14 @@ POSTSTAGE1_HOST_EXPORTS = \ CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ $(POSTSTAGE1_CXX_EXPORT) \ $(LTO_EXPORTS) \ + GDC="$$r/$(HOST_SUBDIR)/prev-gcc/gdc$(exeext) -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ -+ -B$(build_tooldir)/bin/ $(GDC_FLAGS_FOR_TARGET) \ ++ -B$(build_tooldir)/bin/ $(GDCFLAGS_FOR_TARGET) \ ++ -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \ + -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \ -+ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs"; \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \ + export GDC; \ + GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \ GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \ LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \ HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS; -@@ -281,6 +290,7 @@ BASE_TARGET_EXPORTS = \ +@@ -281,6 +292,7 @@ BASE_TARGET_EXPORTS = \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \ GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \ @@ -919,7 +923,7 @@ This implements building of libphobos library in GCC. DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ -@@ -345,6 +355,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ +@@ -345,6 +357,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@ GOC_FOR_BUILD = @GOC_FOR_BUILD@ @@ -927,7 +931,7 @@ This implements building of libphobos library in GCC. LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LD_FOR_BUILD = @LD_FOR_BUILD@ NM_FOR_BUILD = @NM_FOR_BUILD@ -@@ -402,6 +413,7 @@ STRIP = @STRIP@ +@@ -402,6 +415,7 @@ STRIP = @STRIP@ WINDRES = @WINDRES@ WINDMC = @WINDMC@ @@ -935,7 +939,7 @@ This implements building of libphobos library in GCC. GNATBIND = @GNATBIND@ GNATMAKE = @GNATMAKE@ -@@ -411,6 +423,7 @@ LIBCFLAGS = $(CFLAGS) +@@ -411,6 +425,7 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates GOCFLAGS = $(CFLAGS) @@ -943,7 +947,7 @@ This implements building of libphobos library in GCC. CREATE_GCOV = create_gcov -@@ -487,6 +500,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ +@@ -487,6 +502,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@ @@ -951,7 +955,7 @@ This implements building of libphobos library in GCC. DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ -@@ -511,6 +525,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG +@@ -511,6 +527,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@ GOCFLAGS_FOR_TARGET = -O2 -g @@ -959,7 +963,7 @@ This implements building of libphobos library in GCC. FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -@@ -612,6 +627,7 @@ EXTRA_HOST_FLAGS = \ +@@ -612,6 +629,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'GFORTRAN=$(GFORTRAN)' \ 'GOC=$(GOC)' \ @@ -967,7 +971,7 @@ This implements building of libphobos library in GCC. 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ -@@ -636,6 +652,7 @@ STAGE1_FLAGS_TO_PASS = \ +@@ -636,6 +654,7 @@ STAGE1_FLAGS_TO_PASS = \ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \ @@ -975,7 +979,7 @@ This implements building of libphobos library in GCC. GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ -@@ -668,6 +685,8 @@ EXTRA_TARGET_FLAGS = \ +@@ -668,6 +687,8 @@ EXTRA_TARGET_FLAGS = \ 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \ diff --git a/gcc/d/patches/patch-toplev-ddmd-8.patch b/gcc/d/patches/patch-toplev-ddmd-8.patch index 1a4dcf7fa..bb149fa60 100644 --- a/gcc/d/patches/patch-toplev-ddmd-8.patch +++ b/gcc/d/patches/patch-toplev-ddmd-8.patch @@ -27,7 +27,7 @@ // Not all; these are the ones which don't have special options. --- a/Makefile.in +++ b/Makefile.in -@@ -1190,13 +1190,17 @@ all-target: maybe-all-target-newlib +@@ -1192,13 +1192,17 @@ all-target: maybe-all-target-newlib @if target-libgcc-no-bootstrap all-target: maybe-all-target-libgcc @endif target-libgcc-no-bootstrap @@ -45,7 +45,7 @@ all-target: maybe-all-target-libtermcap all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss -@@ -1208,7 +1212,9 @@ all-target: maybe-all-target-libada +@@ -1210,7 +1214,9 @@ all-target: maybe-all-target-libada all-target: maybe-all-target-libgomp @endif target-libgomp-no-bootstrap all-target: maybe-all-target-libitm @@ -55,7 +55,7 @@ # Do a target for all the subdirectories. A ``make do-X'' will do a # ``make X'' in all subdirectories (because, in general, there is a -@@ -45506,7 +45512,6 @@ configure-target-libbacktrace: stage_cur +@@ -45508,7 +45514,6 @@ configure-target-libbacktrace: stage_cur @if target-libbacktrace maybe-configure-target-libbacktrace: configure-target-libbacktrace configure-target-libbacktrace: @@ -63,7 +63,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libbacktrace..."; \ -@@ -45544,6 +45549,412 @@ configure-target-libbacktrace: +@@ -45546,6 +45551,412 @@ configure-target-libbacktrace: @@ -476,7 +476,7 @@ .PHONY: all-target-libbacktrace maybe-all-target-libbacktrace -@@ -45555,7 +45966,6 @@ all-target-libbacktrace: stage_current +@@ -45557,7 +45968,6 @@ all-target-libbacktrace: stage_current TARGET-target-libbacktrace=all maybe-all-target-libbacktrace: all-target-libbacktrace all-target-libbacktrace: configure-target-libbacktrace @@ -484,7 +484,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ -@@ -45566,6 +45976,387 @@ all-target-libbacktrace: configure-targe +@@ -45568,6 +45978,387 @@ all-target-libbacktrace: configure-targe @@ -872,7 +872,7 @@ .PHONY: check-target-libbacktrace maybe-check-target-libbacktrace -@@ -48254,7 +49045,6 @@ configure-target-libphobos: stage_curren +@@ -48256,7 +49047,6 @@ configure-target-libphobos: stage_curren @if target-libphobos maybe-configure-target-libphobos: configure-target-libphobos configure-target-libphobos: @@ -880,7 +880,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libphobos..."; \ -@@ -48292,6 +49082,412 @@ configure-target-libphobos: +@@ -48294,6 +49084,412 @@ configure-target-libphobos: @@ -1293,7 +1293,7 @@ .PHONY: all-target-libphobos maybe-all-target-libphobos -@@ -48303,7 +49499,6 @@ all-target-libphobos: stage_current +@@ -48305,7 +49501,6 @@ all-target-libphobos: stage_current TARGET-target-libphobos=all maybe-all-target-libphobos: all-target-libphobos all-target-libphobos: configure-target-libphobos @@ -1301,7 +1301,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ -@@ -48314,6 +49509,387 @@ all-target-libphobos: configure-target-l +@@ -48316,6 +49511,387 @@ all-target-libphobos: configure-target-l @@ -1689,7 +1689,7 @@ .PHONY: check-target-libphobos maybe-check-target-libphobos -@@ -53539,7 +55115,6 @@ configure-target-libatomic: stage_curren +@@ -53541,7 +55117,6 @@ configure-target-libatomic: stage_curren @if target-libatomic maybe-configure-target-libatomic: configure-target-libatomic configure-target-libatomic: @@ -1697,7 +1697,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libatomic..."; \ -@@ -53577,6 +55152,412 @@ configure-target-libatomic: +@@ -53579,6 +55154,412 @@ configure-target-libatomic: @@ -2110,7 +2110,7 @@ .PHONY: all-target-libatomic maybe-all-target-libatomic -@@ -53588,7 +55569,6 @@ all-target-libatomic: stage_current +@@ -53590,7 +55571,6 @@ all-target-libatomic: stage_current TARGET-target-libatomic=all maybe-all-target-libatomic: all-target-libatomic all-target-libatomic: configure-target-libatomic @@ -2118,7 +2118,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ -@@ -53599,6 +55579,387 @@ all-target-libatomic: configure-target-l +@@ -53601,6 +55581,387 @@ all-target-libatomic: configure-target-l @@ -2506,7 +2506,7 @@ .PHONY: check-target-libatomic maybe-check-target-libatomic -@@ -57288,13 +59649,29 @@ configure-stagetrain-target-libgcc: mayb +@@ -57290,13 +59651,29 @@ configure-stagetrain-target-libgcc: mayb configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc configure-stageautoprofile-target-libgcc: maybe-all-stageautoprofile-gcc configure-stageautofeedback-target-libgcc: maybe-all-stageautofeedback-gcc @@ -2538,7 +2538,7 @@ configure-target-libtermcap: stage_last configure-target-winsup: stage_last configure-target-libgloss: stage_last -@@ -57312,7 +59689,15 @@ configure-stagefeedback-target-libgomp: +@@ -57314,7 +59691,15 @@ configure-stagefeedback-target-libgomp: configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-gcc configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-gcc configure-target-libitm: stage_last @@ -2555,7 +2555,7 @@ @endif gcc-bootstrap @if gcc-no-bootstrap -@@ -58448,10 +60833,40 @@ all-target-libgo: maybe-all-target-libba +@@ -58450,10 +60835,40 @@ all-target-libgo: maybe-all-target-libba all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic configure-target-libphobos: maybe-configure-target-libbacktrace @@ -2596,7 +2596,7 @@ configure-target-libstdc++-v3: maybe-configure-target-libgomp configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp -@@ -58561,6 +60976,24 @@ configure-stagetrain-target-libvtv: mayb +@@ -58563,6 +60978,24 @@ configure-stagetrain-target-libvtv: mayb configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-target-libgcc configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-target-libgcc @@ -2621,7 +2621,7 @@ configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc -@@ -58570,6 +61003,15 @@ configure-stagetrain-target-libgomp: may +@@ -58572,6 +61005,15 @@ configure-stagetrain-target-libgomp: may configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-target-libgcc configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-target-libgcc From d7dda2d982ffbdd667c97a0e96dd7d72ebeb567f Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 28 Aug 2018 22:33:40 +0200 Subject: [PATCH 2/4] Cherry-pick from dmd fix for building front-end with master --- gcc/d/dmd/mtype.d | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/d/dmd/mtype.d b/gcc/d/dmd/mtype.d index b4672a5a0..a9ae6ff8f 100644 --- a/gcc/d/dmd/mtype.d +++ b/gcc/d/dmd/mtype.d @@ -3409,10 +3409,10 @@ extern (C++) final class TypeBasic : Type EnumDeclaration ed = (cast(TypeEnum)to).sym; if (ed.isSpecial()) { - /* Special enums that allow implicit conversions to them - * with a MATCH.convert - */ + /* Special enums that allow implicit conversions to them. */ tob = to.toBasetype().isTypeBasic(); + if (tob) + return implicitConvTo(tob); } else return MATCH.nomatch; From 6188a5e0edda46cf0d7331cc5c7f0b1160f00910 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Tue, 28 Aug 2018 22:34:22 +0200 Subject: [PATCH 3/4] Fix gagged warnings when instantiating longdouble opAssign. --- gcc/d/dmd/root/longdouble.d | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc/d/dmd/root/longdouble.d b/gcc/d/dmd/root/longdouble.d index fe6d86cf6..2e34e1291 100644 --- a/gcc/d/dmd/root/longdouble.d +++ b/gcc/d/dmd/root/longdouble.d @@ -41,6 +41,7 @@ struct longdouble } longdouble opAssign(T)(T r) + if (!is (T : longdouble)) { this.set(r); return this; From 192541ba3fb23065cd185e3de03f06b70a4ec479 Mon Sep 17 00:00:00 2001 From: Iain Buclaw Date: Wed, 29 Aug 2018 01:39:42 +0200 Subject: [PATCH 4/4] Bootstrap compiler also depends on libstdc++ --- gcc/d/patches/patch-toplev-8.patch | 106 ++++++++++++------------ gcc/d/patches/patch-toplev-ddmd-8.patch | 38 ++++----- 2 files changed, 73 insertions(+), 71 deletions(-) diff --git a/gcc/d/patches/patch-toplev-8.patch b/gcc/d/patches/patch-toplev-8.patch index 2503c405b..fa70f3777 100644 --- a/gcc/d/patches/patch-toplev-8.patch +++ b/gcc/d/patches/patch-toplev-8.patch @@ -78,7 +78,7 @@ This implements building of libphobos library in GCC. AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ -@@ -256,6 +259,14 @@ POSTSTAGE1_HOST_EXPORTS = \ +@@ -256,6 +259,15 @@ POSTSTAGE1_HOST_EXPORTS = \ CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ $(POSTSTAGE1_CXX_EXPORT) \ $(LTO_EXPORTS) \ @@ -87,13 +87,14 @@ This implements building of libphobos library in GCC. + -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \ + -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \ + -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \ -+ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs"; \ + export GDC; \ + GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \ GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \ LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \ HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS; -@@ -278,6 +289,7 @@ BASE_TARGET_EXPORTS = \ +@@ -278,6 +290,7 @@ BASE_TARGET_EXPORTS = \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \ GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \ @@ -101,7 +102,7 @@ This implements building of libphobos library in GCC. DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ -@@ -342,6 +354,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ +@@ -342,6 +355,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@ GOC_FOR_BUILD = @GOC_FOR_BUILD@ @@ -109,7 +110,7 @@ This implements building of libphobos library in GCC. LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LD_FOR_BUILD = @LD_FOR_BUILD@ NM_FOR_BUILD = @NM_FOR_BUILD@ -@@ -399,6 +412,7 @@ STRIP = @STRIP@ +@@ -399,6 +413,7 @@ STRIP = @STRIP@ WINDRES = @WINDRES@ WINDMC = @WINDMC@ @@ -117,7 +118,7 @@ This implements building of libphobos library in GCC. GNATBIND = @GNATBIND@ GNATMAKE = @GNATMAKE@ -@@ -408,6 +422,7 @@ LIBCFLAGS = $(CFLAGS) +@@ -408,6 +423,7 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates GOCFLAGS = $(CFLAGS) @@ -125,7 +126,7 @@ This implements building of libphobos library in GCC. CREATE_GCOV = create_gcov -@@ -564,6 +579,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ +@@ -564,6 +580,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@ @@ -133,7 +134,7 @@ This implements building of libphobos library in GCC. DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ -@@ -588,6 +604,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG +@@ -588,6 +605,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@ GOCFLAGS_FOR_TARGET = -O2 -g @@ -141,7 +142,7 @@ This implements building of libphobos library in GCC. FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -@@ -612,7 +629,7 @@ all: +@@ -612,7 +630,7 @@ all: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the target machine work. @@ -150,7 +151,7 @@ This implements building of libphobos library in GCC. @if target-libstdc++-v3 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: -@@ -638,6 +655,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TA +@@ -638,6 +656,10 @@ TARGET_LIB_PATH_liboffloadmic = $$r/$(TA TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs: @endif target-libssp @@ -161,7 +162,7 @@ This implements building of libphobos library in GCC. @if target-libgomp TARGET_LIB_PATH_libgomp = $$r/$(TARGET_SUBDIR)/libgomp/.libs: @endif target-libgomp -@@ -772,6 +793,8 @@ BASE_FLAGS_TO_PASS = \ +@@ -772,6 +794,8 @@ BASE_FLAGS_TO_PASS = \ "STAGE1_LANGUAGES=$(STAGE1_LANGUAGES)" \ "GNATBIND=$(GNATBIND)" \ "GNATMAKE=$(GNATMAKE)" \ @@ -170,7 +171,7 @@ This implements building of libphobos library in GCC. "AR_FOR_TARGET=$(AR_FOR_TARGET)" \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ -@@ -783,6 +806,8 @@ BASE_FLAGS_TO_PASS = \ +@@ -783,6 +807,8 @@ BASE_FLAGS_TO_PASS = \ "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \ "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \ @@ -179,7 +180,7 @@ This implements building of libphobos library in GCC. "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \ "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \ -@@ -845,6 +870,7 @@ EXTRA_HOST_FLAGS = \ +@@ -845,6 +871,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'GFORTRAN=$(GFORTRAN)' \ 'GOC=$(GOC)' \ @@ -187,7 +188,7 @@ This implements building of libphobos library in GCC. 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ -@@ -869,6 +895,7 @@ STAGE1_FLAGS_TO_PASS = \ +@@ -869,6 +896,7 @@ STAGE1_FLAGS_TO_PASS = \ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \ @@ -195,7 +196,7 @@ This implements building of libphobos library in GCC. GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ -@@ -901,6 +928,8 @@ EXTRA_TARGET_FLAGS = \ +@@ -901,6 +929,8 @@ EXTRA_TARGET_FLAGS = \ 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \ @@ -204,7 +205,7 @@ This implements building of libphobos library in GCC. 'LD=$(COMPILER_LD_FOR_TARGET)' \ 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ -@@ -1003,6 +1032,7 @@ configure-target: \ +@@ -1003,6 +1033,7 @@ configure-target: \ maybe-configure-target-libobjc \ maybe-configure-target-libgo \ maybe-configure-target-libhsail-rt \ @@ -212,7 +213,7 @@ This implements building of libphobos library in GCC. maybe-configure-target-libtermcap \ maybe-configure-target-winsup \ maybe-configure-target-libgloss \ -@@ -1168,6 +1198,7 @@ all-target: maybe-all-target-libgfortran +@@ -1168,6 +1199,7 @@ all-target: maybe-all-target-libgfortran all-target: maybe-all-target-libobjc all-target: maybe-all-target-libgo all-target: maybe-all-target-libhsail-rt @@ -220,7 +221,7 @@ This implements building of libphobos library in GCC. all-target: maybe-all-target-libtermcap all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss -@@ -1260,6 +1291,7 @@ info-target: maybe-info-target-libgfortr +@@ -1260,6 +1292,7 @@ info-target: maybe-info-target-libgfortr info-target: maybe-info-target-libobjc info-target: maybe-info-target-libgo info-target: maybe-info-target-libhsail-rt @@ -228,7 +229,7 @@ This implements building of libphobos library in GCC. info-target: maybe-info-target-libtermcap info-target: maybe-info-target-winsup info-target: maybe-info-target-libgloss -@@ -1345,6 +1377,7 @@ dvi-target: maybe-dvi-target-libgfortran +@@ -1345,6 +1378,7 @@ dvi-target: maybe-dvi-target-libgfortran dvi-target: maybe-dvi-target-libobjc dvi-target: maybe-dvi-target-libgo dvi-target: maybe-dvi-target-libhsail-rt @@ -236,7 +237,7 @@ This implements building of libphobos library in GCC. dvi-target: maybe-dvi-target-libtermcap dvi-target: maybe-dvi-target-winsup dvi-target: maybe-dvi-target-libgloss -@@ -1430,6 +1463,7 @@ pdf-target: maybe-pdf-target-libgfortran +@@ -1430,6 +1464,7 @@ pdf-target: maybe-pdf-target-libgfortran pdf-target: maybe-pdf-target-libobjc pdf-target: maybe-pdf-target-libgo pdf-target: maybe-pdf-target-libhsail-rt @@ -244,7 +245,7 @@ This implements building of libphobos library in GCC. pdf-target: maybe-pdf-target-libtermcap pdf-target: maybe-pdf-target-winsup pdf-target: maybe-pdf-target-libgloss -@@ -1515,6 +1549,7 @@ html-target: maybe-html-target-libgfortr +@@ -1515,6 +1550,7 @@ html-target: maybe-html-target-libgfortr html-target: maybe-html-target-libobjc html-target: maybe-html-target-libgo html-target: maybe-html-target-libhsail-rt @@ -252,7 +253,7 @@ This implements building of libphobos library in GCC. html-target: maybe-html-target-libtermcap html-target: maybe-html-target-winsup html-target: maybe-html-target-libgloss -@@ -1600,6 +1635,7 @@ TAGS-target: maybe-TAGS-target-libgfortr +@@ -1600,6 +1636,7 @@ TAGS-target: maybe-TAGS-target-libgfortr TAGS-target: maybe-TAGS-target-libobjc TAGS-target: maybe-TAGS-target-libgo TAGS-target: maybe-TAGS-target-libhsail-rt @@ -260,7 +261,7 @@ This implements building of libphobos library in GCC. TAGS-target: maybe-TAGS-target-libtermcap TAGS-target: maybe-TAGS-target-winsup TAGS-target: maybe-TAGS-target-libgloss -@@ -1685,6 +1721,7 @@ install-info-target: maybe-install-info- +@@ -1685,6 +1722,7 @@ install-info-target: maybe-install-info- install-info-target: maybe-install-info-target-libobjc install-info-target: maybe-install-info-target-libgo install-info-target: maybe-install-info-target-libhsail-rt @@ -268,7 +269,7 @@ This implements building of libphobos library in GCC. install-info-target: maybe-install-info-target-libtermcap install-info-target: maybe-install-info-target-winsup install-info-target: maybe-install-info-target-libgloss -@@ -1770,6 +1807,7 @@ install-pdf-target: maybe-install-pdf-ta +@@ -1770,6 +1808,7 @@ install-pdf-target: maybe-install-pdf-ta install-pdf-target: maybe-install-pdf-target-libobjc install-pdf-target: maybe-install-pdf-target-libgo install-pdf-target: maybe-install-pdf-target-libhsail-rt @@ -276,7 +277,7 @@ This implements building of libphobos library in GCC. install-pdf-target: maybe-install-pdf-target-libtermcap install-pdf-target: maybe-install-pdf-target-winsup install-pdf-target: maybe-install-pdf-target-libgloss -@@ -1855,6 +1893,7 @@ install-html-target: maybe-install-html- +@@ -1855,6 +1894,7 @@ install-html-target: maybe-install-html- install-html-target: maybe-install-html-target-libobjc install-html-target: maybe-install-html-target-libgo install-html-target: maybe-install-html-target-libhsail-rt @@ -284,7 +285,7 @@ This implements building of libphobos library in GCC. install-html-target: maybe-install-html-target-libtermcap install-html-target: maybe-install-html-target-winsup install-html-target: maybe-install-html-target-libgloss -@@ -1940,6 +1979,7 @@ installcheck-target: maybe-installcheck- +@@ -1940,6 +1980,7 @@ installcheck-target: maybe-installcheck- installcheck-target: maybe-installcheck-target-libobjc installcheck-target: maybe-installcheck-target-libgo installcheck-target: maybe-installcheck-target-libhsail-rt @@ -292,7 +293,7 @@ This implements building of libphobos library in GCC. installcheck-target: maybe-installcheck-target-libtermcap installcheck-target: maybe-installcheck-target-winsup installcheck-target: maybe-installcheck-target-libgloss -@@ -2025,6 +2065,7 @@ mostlyclean-target: maybe-mostlyclean-ta +@@ -2025,6 +2066,7 @@ mostlyclean-target: maybe-mostlyclean-ta mostlyclean-target: maybe-mostlyclean-target-libobjc mostlyclean-target: maybe-mostlyclean-target-libgo mostlyclean-target: maybe-mostlyclean-target-libhsail-rt @@ -300,7 +301,7 @@ This implements building of libphobos library in GCC. mostlyclean-target: maybe-mostlyclean-target-libtermcap mostlyclean-target: maybe-mostlyclean-target-winsup mostlyclean-target: maybe-mostlyclean-target-libgloss -@@ -2110,6 +2151,7 @@ clean-target: maybe-clean-target-libgfor +@@ -2110,6 +2152,7 @@ clean-target: maybe-clean-target-libgfor clean-target: maybe-clean-target-libobjc clean-target: maybe-clean-target-libgo clean-target: maybe-clean-target-libhsail-rt @@ -308,7 +309,7 @@ This implements building of libphobos library in GCC. clean-target: maybe-clean-target-libtermcap clean-target: maybe-clean-target-winsup clean-target: maybe-clean-target-libgloss -@@ -2195,6 +2237,7 @@ distclean-target: maybe-distclean-target +@@ -2195,6 +2238,7 @@ distclean-target: maybe-distclean-target distclean-target: maybe-distclean-target-libobjc distclean-target: maybe-distclean-target-libgo distclean-target: maybe-distclean-target-libhsail-rt @@ -316,7 +317,7 @@ This implements building of libphobos library in GCC. distclean-target: maybe-distclean-target-libtermcap distclean-target: maybe-distclean-target-winsup distclean-target: maybe-distclean-target-libgloss -@@ -2280,6 +2323,7 @@ maintainer-clean-target: maybe-maintaine +@@ -2280,6 +2324,7 @@ maintainer-clean-target: maybe-maintaine maintainer-clean-target: maybe-maintainer-clean-target-libobjc maintainer-clean-target: maybe-maintainer-clean-target-libgo maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt @@ -324,7 +325,7 @@ This implements building of libphobos library in GCC. maintainer-clean-target: maybe-maintainer-clean-target-libtermcap maintainer-clean-target: maybe-maintainer-clean-target-winsup maintainer-clean-target: maybe-maintainer-clean-target-libgloss -@@ -2421,6 +2465,7 @@ check-target: \ +@@ -2421,6 +2466,7 @@ check-target: \ maybe-check-target-libobjc \ maybe-check-target-libgo \ maybe-check-target-libhsail-rt \ @@ -332,7 +333,7 @@ This implements building of libphobos library in GCC. maybe-check-target-libtermcap \ maybe-check-target-winsup \ maybe-check-target-libgloss \ -@@ -2602,6 +2647,7 @@ install-target: \ +@@ -2602,6 +2648,7 @@ install-target: \ maybe-install-target-libobjc \ maybe-install-target-libgo \ maybe-install-target-libhsail-rt \ @@ -340,7 +341,7 @@ This implements building of libphobos library in GCC. maybe-install-target-libtermcap \ maybe-install-target-winsup \ maybe-install-target-libgloss \ -@@ -2707,6 +2753,7 @@ install-strip-target: \ +@@ -2707,6 +2754,7 @@ install-strip-target: \ maybe-install-strip-target-libobjc \ maybe-install-strip-target-libgo \ maybe-install-strip-target-libhsail-rt \ @@ -348,7 +349,7 @@ This implements building of libphobos library in GCC. maybe-install-strip-target-libtermcap \ maybe-install-strip-target-winsup \ maybe-install-strip-target-libgloss \ -@@ -48201,6 +48248,464 @@ maintainer-clean-target-libhsail-rt: +@@ -48201,6 +48249,464 @@ maintainer-clean-target-libhsail-rt: @@ -813,7 +814,7 @@ This implements building of libphobos library in GCC. .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap maybe-configure-target-libtermcap: @if gcc-bootstrap -@@ -53582,6 +54087,14 @@ check-gcc-brig: +@@ -53582,6 +54088,14 @@ check-gcc-brig: (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig); check-brig: check-gcc-brig check-target-libhsail-rt @@ -828,7 +829,7 @@ This implements building of libphobos library in GCC. # The gcc part of install-no-fixedincludes, which relies on an intimate # knowledge of how a number of gcc internal targets (inter)operate. Delegate. -@@ -56783,6 +57296,7 @@ configure-target-libgfortran: stage_last +@@ -56783,6 +57297,7 @@ configure-target-libgfortran: stage_last configure-target-libobjc: stage_last configure-target-libgo: stage_last configure-target-libhsail-rt: stage_last @@ -836,7 +837,7 @@ This implements building of libphobos library in GCC. configure-target-libtermcap: stage_last configure-target-winsup: stage_last configure-target-libgloss: stage_last -@@ -56818,6 +57332,7 @@ configure-target-libgfortran: maybe-all- +@@ -56818,6 +57333,7 @@ configure-target-libgfortran: maybe-all- configure-target-libobjc: maybe-all-gcc configure-target-libgo: maybe-all-gcc configure-target-libhsail-rt: maybe-all-gcc @@ -844,7 +845,7 @@ This implements building of libphobos library in GCC. configure-target-libtermcap: maybe-all-gcc configure-target-winsup: maybe-all-gcc configure-target-libgloss: maybe-all-gcc -@@ -57934,6 +58449,11 @@ configure-target-libgo: maybe-all-target +@@ -57934,6 +58450,11 @@ configure-target-libgo: maybe-all-target all-target-libgo: maybe-all-target-libbacktrace all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic @@ -856,7 +857,7 @@ This implements building of libphobos library in GCC. configure-target-libstdc++-v3: maybe-configure-target-libgomp configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp -@@ -57983,6 +58503,7 @@ all-target-liboffloadmic: maybe-all-targ +@@ -57983,6 +58504,7 @@ all-target-liboffloadmic: maybe-all-targ install-target-libgo: maybe-install-target-libatomic install-target-libgfortran: maybe-install-target-libquadmath install-target-libgfortran: maybe-install-target-libgcc @@ -864,7 +865,7 @@ This implements building of libphobos library in GCC. install-target-libsanitizer: maybe-install-target-libstdc++-v3 install-target-libsanitizer: maybe-install-target-libgcc install-target-libvtv: maybe-install-target-libstdc++-v3 -@@ -58067,6 +58588,7 @@ configure-target-libgfortran: maybe-all- +@@ -58067,6 +58589,7 @@ configure-target-libgfortran: maybe-all- configure-target-libobjc: maybe-all-target-libgcc configure-target-libgo: maybe-all-target-libgcc configure-target-libhsail-rt: maybe-all-target-libgcc @@ -872,7 +873,7 @@ This implements building of libphobos library in GCC. configure-target-libtermcap: maybe-all-target-libgcc configure-target-winsup: maybe-all-target-libgcc configure-target-libgloss: maybe-all-target-libgcc -@@ -58107,6 +58629,8 @@ configure-target-libgo: maybe-all-target +@@ -58107,6 +58630,8 @@ configure-target-libgo: maybe-all-target configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss @@ -900,7 +901,7 @@ This implements building of libphobos library in GCC. AR="$(AR)"; export AR; \ AS="$(AS)"; export AS; \ CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \ -@@ -259,6 +262,14 @@ POSTSTAGE1_HOST_EXPORTS = \ +@@ -259,6 +262,15 @@ POSTSTAGE1_HOST_EXPORTS = \ CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ $(POSTSTAGE1_CXX_EXPORT) \ $(LTO_EXPORTS) \ @@ -909,13 +910,14 @@ This implements building of libphobos library in GCC. + -B$$r/prev-$(TARGET_SUBDIR)/libphobos/src \ + -I$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime -I$$s/libphobos/libdruntime \ + -L$$r/prev-$(TARGET_SUBDIR)/libphobos/src/.libs \ -+ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs"; \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libphobos/libdruntime/.libs \ ++ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs"; \ + export GDC; \ + GDC_FOR_BUILD="$$GDC"; export GDC_FOR_BUILD; \ GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \ LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \ HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS; -@@ -281,6 +292,7 @@ BASE_TARGET_EXPORTS = \ +@@ -281,6 +293,7 @@ BASE_TARGET_EXPORTS = \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \ GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \ @@ -923,7 +925,7 @@ This implements building of libphobos library in GCC. DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \ LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ -@@ -345,6 +357,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ +@@ -345,6 +358,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@ GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@ GOC_FOR_BUILD = @GOC_FOR_BUILD@ @@ -931,7 +933,7 @@ This implements building of libphobos library in GCC. LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ LD_FOR_BUILD = @LD_FOR_BUILD@ NM_FOR_BUILD = @NM_FOR_BUILD@ -@@ -402,6 +415,7 @@ STRIP = @STRIP@ +@@ -402,6 +416,7 @@ STRIP = @STRIP@ WINDRES = @WINDRES@ WINDMC = @WINDMC@ @@ -939,7 +941,7 @@ This implements building of libphobos library in GCC. GNATBIND = @GNATBIND@ GNATMAKE = @GNATMAKE@ -@@ -411,6 +425,7 @@ LIBCFLAGS = $(CFLAGS) +@@ -411,6 +426,7 @@ LIBCFLAGS = $(CFLAGS) CXXFLAGS = @CXXFLAGS@ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates GOCFLAGS = $(CFLAGS) @@ -947,7 +949,7 @@ This implements building of libphobos library in GCC. CREATE_GCOV = create_gcov -@@ -487,6 +502,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ +@@ -487,6 +503,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@ @@ -955,7 +957,7 @@ This implements building of libphobos library in GCC. DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ LD_FOR_TARGET=@LD_FOR_TARGET@ -@@ -511,6 +527,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG +@@ -511,6 +528,7 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARG LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates LDFLAGS_FOR_TARGET = @LDFLAGS_FOR_TARGET@ GOCFLAGS_FOR_TARGET = -O2 -g @@ -963,7 +965,7 @@ This implements building of libphobos library in GCC. FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ -@@ -612,6 +629,7 @@ EXTRA_HOST_FLAGS = \ +@@ -612,6 +630,7 @@ EXTRA_HOST_FLAGS = \ 'DLLTOOL=$(DLLTOOL)' \ 'GFORTRAN=$(GFORTRAN)' \ 'GOC=$(GOC)' \ @@ -971,7 +973,7 @@ This implements building of libphobos library in GCC. 'LD=$(LD)' \ 'LIPO=$(LIPO)' \ 'NM=$(NM)' \ -@@ -636,6 +654,7 @@ STAGE1_FLAGS_TO_PASS = \ +@@ -636,6 +655,7 @@ STAGE1_FLAGS_TO_PASS = \ POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ CXX="$${CXX}" CXX_FOR_BUILD="$${CXX_FOR_BUILD}" \ @@ -979,7 +981,7 @@ This implements building of libphobos library in GCC. GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ -@@ -668,6 +687,8 @@ EXTRA_TARGET_FLAGS = \ +@@ -668,6 +688,8 @@ EXTRA_TARGET_FLAGS = \ 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \ diff --git a/gcc/d/patches/patch-toplev-ddmd-8.patch b/gcc/d/patches/patch-toplev-ddmd-8.patch index bb149fa60..f9be98579 100644 --- a/gcc/d/patches/patch-toplev-ddmd-8.patch +++ b/gcc/d/patches/patch-toplev-ddmd-8.patch @@ -27,7 +27,7 @@ // Not all; these are the ones which don't have special options. --- a/Makefile.in +++ b/Makefile.in -@@ -1192,13 +1192,17 @@ all-target: maybe-all-target-newlib +@@ -1193,13 +1193,17 @@ all-target: maybe-all-target-newlib @if target-libgcc-no-bootstrap all-target: maybe-all-target-libgcc @endif target-libgcc-no-bootstrap @@ -45,7 +45,7 @@ all-target: maybe-all-target-libtermcap all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss -@@ -1210,7 +1214,9 @@ all-target: maybe-all-target-libada +@@ -1211,7 +1215,9 @@ all-target: maybe-all-target-libada all-target: maybe-all-target-libgomp @endif target-libgomp-no-bootstrap all-target: maybe-all-target-libitm @@ -55,7 +55,7 @@ # Do a target for all the subdirectories. A ``make do-X'' will do a # ``make X'' in all subdirectories (because, in general, there is a -@@ -45508,7 +45514,6 @@ configure-target-libbacktrace: stage_cur +@@ -45509,7 +45515,6 @@ configure-target-libbacktrace: stage_cur @if target-libbacktrace maybe-configure-target-libbacktrace: configure-target-libbacktrace configure-target-libbacktrace: @@ -63,7 +63,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libbacktrace..."; \ -@@ -45546,6 +45551,412 @@ configure-target-libbacktrace: +@@ -45547,6 +45552,412 @@ configure-target-libbacktrace: @@ -476,7 +476,7 @@ .PHONY: all-target-libbacktrace maybe-all-target-libbacktrace -@@ -45557,7 +45968,6 @@ all-target-libbacktrace: stage_current +@@ -45558,7 +45969,6 @@ all-target-libbacktrace: stage_current TARGET-target-libbacktrace=all maybe-all-target-libbacktrace: all-target-libbacktrace all-target-libbacktrace: configure-target-libbacktrace @@ -484,7 +484,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ -@@ -45568,6 +45978,387 @@ all-target-libbacktrace: configure-targe +@@ -45569,6 +45979,387 @@ all-target-libbacktrace: configure-targe @@ -872,7 +872,7 @@ .PHONY: check-target-libbacktrace maybe-check-target-libbacktrace -@@ -48256,7 +49047,6 @@ configure-target-libphobos: stage_curren +@@ -48257,7 +49048,6 @@ configure-target-libphobos: stage_curren @if target-libphobos maybe-configure-target-libphobos: configure-target-libphobos configure-target-libphobos: @@ -880,7 +880,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libphobos..."; \ -@@ -48294,6 +49084,412 @@ configure-target-libphobos: +@@ -48295,6 +49085,412 @@ configure-target-libphobos: @@ -1293,7 +1293,7 @@ .PHONY: all-target-libphobos maybe-all-target-libphobos -@@ -48305,7 +49501,6 @@ all-target-libphobos: stage_current +@@ -48306,7 +49502,6 @@ all-target-libphobos: stage_current TARGET-target-libphobos=all maybe-all-target-libphobos: all-target-libphobos all-target-libphobos: configure-target-libphobos @@ -1301,7 +1301,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ -@@ -48316,6 +49511,387 @@ all-target-libphobos: configure-target-l +@@ -48317,6 +49512,387 @@ all-target-libphobos: configure-target-l @@ -1689,7 +1689,7 @@ .PHONY: check-target-libphobos maybe-check-target-libphobos -@@ -53541,7 +55117,6 @@ configure-target-libatomic: stage_curren +@@ -53542,7 +55118,6 @@ configure-target-libatomic: stage_curren @if target-libatomic maybe-configure-target-libatomic: configure-target-libatomic configure-target-libatomic: @@ -1697,7 +1697,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libatomic..."; \ -@@ -53579,6 +55154,412 @@ configure-target-libatomic: +@@ -53580,6 +55155,412 @@ configure-target-libatomic: @@ -2110,7 +2110,7 @@ .PHONY: all-target-libatomic maybe-all-target-libatomic -@@ -53590,7 +55571,6 @@ all-target-libatomic: stage_current +@@ -53591,7 +55572,6 @@ all-target-libatomic: stage_current TARGET-target-libatomic=all maybe-all-target-libatomic: all-target-libatomic all-target-libatomic: configure-target-libatomic @@ -2118,7 +2118,7 @@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ -@@ -53601,6 +55581,387 @@ all-target-libatomic: configure-target-l +@@ -53602,6 +55582,387 @@ all-target-libatomic: configure-target-l @@ -2506,7 +2506,7 @@ .PHONY: check-target-libatomic maybe-check-target-libatomic -@@ -57290,13 +59651,29 @@ configure-stagetrain-target-libgcc: mayb +@@ -57291,13 +59652,29 @@ configure-stagetrain-target-libgcc: mayb configure-stagefeedback-target-libgcc: maybe-all-stagefeedback-gcc configure-stageautoprofile-target-libgcc: maybe-all-stageautoprofile-gcc configure-stageautofeedback-target-libgcc: maybe-all-stageautofeedback-gcc @@ -2538,7 +2538,7 @@ configure-target-libtermcap: stage_last configure-target-winsup: stage_last configure-target-libgloss: stage_last -@@ -57314,7 +59691,15 @@ configure-stagefeedback-target-libgomp: +@@ -57315,7 +59692,15 @@ configure-stagefeedback-target-libgomp: configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-gcc configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-gcc configure-target-libitm: stage_last @@ -2555,7 +2555,7 @@ @endif gcc-bootstrap @if gcc-no-bootstrap -@@ -58450,10 +60835,40 @@ all-target-libgo: maybe-all-target-libba +@@ -58451,10 +60836,40 @@ all-target-libgo: maybe-all-target-libba all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic configure-target-libphobos: maybe-configure-target-libbacktrace @@ -2596,7 +2596,7 @@ configure-target-libstdc++-v3: maybe-configure-target-libgomp configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp -@@ -58563,6 +60978,24 @@ configure-stagetrain-target-libvtv: mayb +@@ -58564,6 +60979,24 @@ configure-stagetrain-target-libvtv: mayb configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-target-libgcc configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-target-libgcc @@ -2621,7 +2621,7 @@ configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc -@@ -58572,6 +61005,15 @@ configure-stagetrain-target-libgomp: may +@@ -58573,6 +61006,15 @@ configure-stagetrain-target-libgomp: may configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc configure-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-target-libgcc configure-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-target-libgcc