[gcc-7] 15/354: - update more patch for current trunk

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:22 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 16a9df11338197cc134178823432e206232bfb64
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Tue Nov 15 17:49:25 2016 +0000

     - update more patch for current trunk
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9055 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/config-ml.diff                  |   3 +-
 debian/patches/cross-biarch.diff               |   9 ---
 debian/patches/gdc-config-ml.diff              |  55 -------------
 debian/patches/gdc-cross-install-location.diff |   8 +-
 debian/patches/gdc-libphobos-build.diff        | 106 ++++++++++++-------------
 5 files changed, 60 insertions(+), 121 deletions(-)

diff --git a/debian/patches/config-ml.diff b/debian/patches/config-ml.diff
index 1478ea8..e9631bc 100644
--- a/debian/patches/config-ml.diff
+++ b/debian/patches/config-ml.diff
@@ -31,7 +31,7 @@ Index: b/src/config-ml.in
  # Remove extraneous blanks from multidirs.
  # Tests like `if [ -n "$multidirs" ]' require it.
  multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
-@@ -877,9 +896,20 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
+@@ -878,9 +897,19 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
  	fi
      fi
  
@@ -41,7 +41,6 @@ Index: b/src/config-ml.in
 +      case $arg in
 +      *CC=*)  ml_configure_args=${ml_config_env} ;;
 +      *CXX=*) ml_configure_args=${ml_config_env} ;;
-+      *GCJ=*) ml_configure_args=${ml_config_env} ;;
 +      *) ;;
 +      esac
 +    done
diff --git a/debian/patches/cross-biarch.diff b/debian/patches/cross-biarch.diff
index 27e2ff9..ed6c7f3 100644
--- a/debian/patches/cross-biarch.diff
+++ b/debian/patches/cross-biarch.diff
@@ -62,15 +62,6 @@ Index: b/src/config-ml.in
  	  "${ML_POPDIR}"/*)
  	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
  	  *)
-@@ -830,6 +851,8 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
- 	  case $arg in
- 	  -[BIL]"${ML_POPDIR}"/*)
- 	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-+	  -B*/lib/)
-+	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "$FILTER_"`' ' ;;
- 	  "${ML_POPDIR}"/*)
- 	    GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
- 	  *)
 @@ -842,6 +865,8 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
  	  case $arg in
  	  -[BIL]"${ML_POPDIR}"/*)
diff --git a/debian/patches/gdc-config-ml.diff b/debian/patches/gdc-config-ml.diff
deleted file mode 100644
index 1e124c6..0000000
--- a/debian/patches/gdc-config-ml.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-# DP: config-ml.in: Add D support.
-
-2015-04-30  Matthias Klose  <doko at ubuntu.com>
-
-        * config-ml.in: Add D support: treat GDC and GDCFLAGS like other
-        compiler/flag environment variables.
-
-Index: b/src/config-ml.in
-===================================================================
---- a/src/config-ml.in
-+++ b/src/config-ml.in
-@@ -525,6 +525,7 @@ multi-do:
- 				GCJFLAGS="$(GCJFLAGS) $${flags}" \
- 				GOCFLAGS="$(GOCFLAGS) $${flags}" \
- 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
-+				DFLAGS="$(DFLAGS) $${flags}" \
- 				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
- 				LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
- 				LDFLAGS="$(LDFLAGS) $${flags}" \
-@@ -757,7 +758,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
-         break
-       fi
-     done
--    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
-+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags" GDC="${GDC_}$flags"'
- 
-     if [ "${with_target_subdir}" = "." ]; then
- 	CC_=$CC' '
-@@ -766,6 +767,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
- 	GCJ_=$GCJ' '
- 	GFORTRAN_=$GFORTRAN' '
- 	GOC_=$GOC' '
-+	GDC_=$GDC' '
-     else
- 	# Create a regular expression that matches any string as long
- 	# as ML_POPDIR.
-@@ -842,6 +844,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n
- 	  esac
- 	done
- 
-+	GDC_=
-+	for arg in ${GDC}; do
-+	  case $arg in
-+	  -[BIL]"${ML_POPDIR}"/*)
-+	    GDC_="${GDC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-+	  "${ML_POPDIR}"/*)
-+	    GDC_="${GDC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
-+	  *)
-+	    GDC_="${GDC_}${arg} " ;;
-+	  esac
-+	done
-+
- 	if test "x${LD_LIBRARY_PATH+set}" = xset; then
- 	  LD_LIBRARY_PATH_=
- 	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
diff --git a/debian/patches/gdc-cross-install-location.diff b/debian/patches/gdc-cross-install-location.diff
index d4d112a..be75f79 100644
--- a/debian/patches/gdc-cross-install-location.diff
+++ b/debian/patches/gdc-cross-install-location.diff
@@ -1,13 +1,17 @@
+Index: b/src/libphobos/configure.ac
+===================================================================
 --- a/src/libphobos/configure.ac
 +++ b/src/libphobos/configure.ac
-@@ -94,6 +94,7 @@
+@@ -96,6 +96,7 @@ DRUNTIME_LIBRARIES_ZLIB
  DRUNTIME_LIBBACKTRACE_SETUP
  DRUNTIME_INSTALL_DIRECTORIES
- DRUNTIME_VERSION
+ DRUNTIME_LIB_VERSIONS
 +# trigger rebuild of the configure file
  
  # Set default flags (after DRUNTIME_WERROR!)
  if test -z "$DFLAGS"; then
+Index: b/src/libphobos/m4/druntime.m4
+===================================================================
 --- a/src/libphobos/m4/druntime.m4
 +++ b/src/libphobos/m4/druntime.m4
 @@ -78,7 +78,7 @@ AC_DEFUN([DRUNTIME_INSTALL_DIRECTORIES],
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 3e39641..4a7550a 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -12,7 +12,7 @@ Index: b/src/Makefile.def
  target_modules = { module= libtermcap; no_check=true;
                     missing=mostlyclean;
                     missing=clean;
-@@ -284,6 +285,7 @@ flags_to_pass = { flag= GCJ_FOR_TARGET ;
+@@ -283,6 +284,7 @@ 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 ; };
@@ -20,7 +20,7 @@ Index: b/src/Makefile.def
  flags_to_pass = { flag= LD_FOR_TARGET ; };
  flags_to_pass = { flag= LIPO_FOR_TARGET ; };
  flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
-@@ -552,6 +554,8 @@ dependencies = { module=configure-target
+@@ -551,6 +553,8 @@ dependencies = { module=configure-target
  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; };
@@ -29,7 +29,7 @@ Index: b/src/Makefile.def
  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; };
-@@ -606,6 +610,8 @@ languages = { language=objc;	gcc-check-t
+@@ -605,6 +609,8 @@ languages = { language=objc;	gcc-check-t
  languages = { language=obj-c++;	gcc-check-target=check-obj-c++; };
  languages = { language=go;	gcc-check-target=check-go;
  				lib-check-target=check-target-libgo; };
@@ -42,7 +42,7 @@ Index: b/src/Makefile.in
 ===================================================================
 --- a/src/Makefile.in
 +++ b/src/Makefile.in
-@@ -157,6 +157,7 @@ BUILD_EXPORTS = \
+@@ -156,6 +156,7 @@ BUILD_EXPORTS = \
  	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
  	GOC="$(GOC_FOR_BUILD)"; export GOC; \
  	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
@@ -50,39 +50,39 @@ Index: b/src/Makefile.in
  	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
  	LD="$(LD_FOR_BUILD)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-@@ -194,6 +195,7 @@ HOST_EXPORTS = \
- 	GCJ="$(GCJ)"; export GCJ; \
+@@ -192,6 +193,7 @@ HOST_EXPORTS = \
+ 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
  	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
  	GOC="$(GOC)"; export GOC; \
 +	GDC="$(GDC)"; export GDC; \
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -282,6 +284,7 @@ BASE_TARGET_EXPORTS = \
- 	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
+@@ -279,6 +281,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; \
 +	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -348,6 +351,7 @@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
- GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
+@@ -344,6 +347,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@
 +GDC_FOR_BUILD = @GDC_FOR_BUILD@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -558,6 +562,7 @@ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @
- GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
+@@ -553,6 +557,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@
 +GDC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GDC_FOR_TARGET@
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -782,6 +787,7 @@ BASE_FLAGS_TO_PASS = \
+@@ -776,6 +781,7 @@ BASE_FLAGS_TO_PASS = \
  	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
  	"GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
  	"GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
@@ -90,15 +90,15 @@ Index: b/src/Makefile.in
  	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
  	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
  	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-@@ -842,6 +848,7 @@ EXTRA_HOST_FLAGS = \
- 	'GCJ=$(GCJ)' \
+@@ -835,6 +841,7 @@ EXTRA_HOST_FLAGS = \
+ 	'DLLTOOL=$(DLLTOOL)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
 +	'GDC=$(GDC)' \
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -899,6 +906,7 @@ EXTRA_TARGET_FLAGS = \
+@@ -891,6 +898,7 @@ 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)' \
@@ -106,7 +106,7 @@ Index: b/src/Makefile.in
  	'LD=$(COMPILER_LD_FOR_TARGET)' \
  	'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
  	'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
-@@ -1001,6 +1009,7 @@ configure-target:  \
+@@ -993,6 +1001,7 @@ configure-target:  \
      maybe-configure-target-libgfortran \
      maybe-configure-target-libobjc \
      maybe-configure-target-libgo \
@@ -114,7 +114,7 @@ Index: b/src/Makefile.in
      maybe-configure-target-libtermcap \
      maybe-configure-target-winsup \
      maybe-configure-target-libgloss \
-@@ -1167,6 +1176,7 @@ all-target: maybe-all-target-libquadmath
+@@ -1159,6 +1168,7 @@ all-target: maybe-all-target-libquadmath
  all-target: maybe-all-target-libgfortran
  all-target: maybe-all-target-libobjc
  all-target: maybe-all-target-libgo
@@ -122,7 +122,7 @@ Index: b/src/Makefile.in
  all-target: maybe-all-target-libtermcap
  all-target: maybe-all-target-winsup
  all-target: maybe-all-target-libgloss
-@@ -1260,6 +1270,7 @@ info-target: maybe-info-target-libquadma
+@@ -1252,6 +1262,7 @@ info-target: maybe-info-target-libquadma
  info-target: maybe-info-target-libgfortran
  info-target: maybe-info-target-libobjc
  info-target: maybe-info-target-libgo
@@ -130,7 +130,7 @@ Index: b/src/Makefile.in
  info-target: maybe-info-target-libtermcap
  info-target: maybe-info-target-winsup
  info-target: maybe-info-target-libgloss
-@@ -1346,6 +1357,7 @@ dvi-target: maybe-dvi-target-libquadmath
+@@ -1338,6 +1349,7 @@ dvi-target: maybe-dvi-target-libquadmath
  dvi-target: maybe-dvi-target-libgfortran
  dvi-target: maybe-dvi-target-libobjc
  dvi-target: maybe-dvi-target-libgo
@@ -138,7 +138,7 @@ Index: b/src/Makefile.in
  dvi-target: maybe-dvi-target-libtermcap
  dvi-target: maybe-dvi-target-winsup
  dvi-target: maybe-dvi-target-libgloss
-@@ -1432,6 +1444,7 @@ pdf-target: maybe-pdf-target-libquadmath
+@@ -1424,6 +1436,7 @@ pdf-target: maybe-pdf-target-libquadmath
  pdf-target: maybe-pdf-target-libgfortran
  pdf-target: maybe-pdf-target-libobjc
  pdf-target: maybe-pdf-target-libgo
@@ -146,7 +146,7 @@ Index: b/src/Makefile.in
  pdf-target: maybe-pdf-target-libtermcap
  pdf-target: maybe-pdf-target-winsup
  pdf-target: maybe-pdf-target-libgloss
-@@ -1518,6 +1531,7 @@ html-target: maybe-html-target-libquadma
+@@ -1510,6 +1523,7 @@ html-target: maybe-html-target-libquadma
  html-target: maybe-html-target-libgfortran
  html-target: maybe-html-target-libobjc
  html-target: maybe-html-target-libgo
@@ -154,7 +154,7 @@ Index: b/src/Makefile.in
  html-target: maybe-html-target-libtermcap
  html-target: maybe-html-target-winsup
  html-target: maybe-html-target-libgloss
-@@ -1604,6 +1618,7 @@ TAGS-target: maybe-TAGS-target-libquadma
+@@ -1596,6 +1610,7 @@ TAGS-target: maybe-TAGS-target-libquadma
  TAGS-target: maybe-TAGS-target-libgfortran
  TAGS-target: maybe-TAGS-target-libobjc
  TAGS-target: maybe-TAGS-target-libgo
@@ -162,7 +162,7 @@ Index: b/src/Makefile.in
  TAGS-target: maybe-TAGS-target-libtermcap
  TAGS-target: maybe-TAGS-target-winsup
  TAGS-target: maybe-TAGS-target-libgloss
-@@ -1690,6 +1705,7 @@ install-info-target: maybe-install-info-
+@@ -1682,6 +1697,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-libgfortran
  install-info-target: maybe-install-info-target-libobjc
  install-info-target: maybe-install-info-target-libgo
@@ -170,7 +170,7 @@ Index: b/src/Makefile.in
  install-info-target: maybe-install-info-target-libtermcap
  install-info-target: maybe-install-info-target-winsup
  install-info-target: maybe-install-info-target-libgloss
-@@ -1776,6 +1792,7 @@ install-pdf-target: maybe-install-pdf-ta
+@@ -1768,6 +1784,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-libgfortran
  install-pdf-target: maybe-install-pdf-target-libobjc
  install-pdf-target: maybe-install-pdf-target-libgo
@@ -178,7 +178,7 @@ Index: b/src/Makefile.in
  install-pdf-target: maybe-install-pdf-target-libtermcap
  install-pdf-target: maybe-install-pdf-target-winsup
  install-pdf-target: maybe-install-pdf-target-libgloss
-@@ -1862,6 +1879,7 @@ install-html-target: maybe-install-html-
+@@ -1854,6 +1871,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-libgfortran
  install-html-target: maybe-install-html-target-libobjc
  install-html-target: maybe-install-html-target-libgo
@@ -186,7 +186,7 @@ Index: b/src/Makefile.in
  install-html-target: maybe-install-html-target-libtermcap
  install-html-target: maybe-install-html-target-winsup
  install-html-target: maybe-install-html-target-libgloss
-@@ -1948,6 +1966,7 @@ installcheck-target: maybe-installcheck-
+@@ -1940,6 +1958,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-libgfortran
  installcheck-target: maybe-installcheck-target-libobjc
  installcheck-target: maybe-installcheck-target-libgo
@@ -194,7 +194,7 @@ Index: b/src/Makefile.in
  installcheck-target: maybe-installcheck-target-libtermcap
  installcheck-target: maybe-installcheck-target-winsup
  installcheck-target: maybe-installcheck-target-libgloss
-@@ -2034,6 +2053,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+@@ -2026,6 +2045,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-libgfortran
  mostlyclean-target: maybe-mostlyclean-target-libobjc
  mostlyclean-target: maybe-mostlyclean-target-libgo
@@ -202,7 +202,7 @@ Index: b/src/Makefile.in
  mostlyclean-target: maybe-mostlyclean-target-libtermcap
  mostlyclean-target: maybe-mostlyclean-target-winsup
  mostlyclean-target: maybe-mostlyclean-target-libgloss
-@@ -2120,6 +2140,7 @@ clean-target: maybe-clean-target-libquad
+@@ -2112,6 +2132,7 @@ clean-target: maybe-clean-target-libquad
  clean-target: maybe-clean-target-libgfortran
  clean-target: maybe-clean-target-libobjc
  clean-target: maybe-clean-target-libgo
@@ -210,7 +210,7 @@ Index: b/src/Makefile.in
  clean-target: maybe-clean-target-libtermcap
  clean-target: maybe-clean-target-winsup
  clean-target: maybe-clean-target-libgloss
-@@ -2206,6 +2227,7 @@ distclean-target: maybe-distclean-target
+@@ -2198,6 +2219,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-libgfortran
  distclean-target: maybe-distclean-target-libobjc
  distclean-target: maybe-distclean-target-libgo
@@ -218,7 +218,7 @@ Index: b/src/Makefile.in
  distclean-target: maybe-distclean-target-libtermcap
  distclean-target: maybe-distclean-target-winsup
  distclean-target: maybe-distclean-target-libgloss
-@@ -2292,6 +2314,7 @@ maintainer-clean-target: maybe-maintaine
+@@ -2284,6 +2306,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-libgfortran
  maintainer-clean-target: maybe-maintainer-clean-target-libobjc
  maintainer-clean-target: maybe-maintainer-clean-target-libgo
@@ -226,7 +226,7 @@ Index: b/src/Makefile.in
  maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
  maintainer-clean-target: maybe-maintainer-clean-target-winsup
  maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-@@ -2434,6 +2457,7 @@ check-target:  \
+@@ -2426,6 +2449,7 @@ check-target:  \
      maybe-check-target-libgfortran \
      maybe-check-target-libobjc \
      maybe-check-target-libgo \
@@ -234,7 +234,7 @@ Index: b/src/Makefile.in
      maybe-check-target-libtermcap \
      maybe-check-target-winsup \
      maybe-check-target-libgloss \
-@@ -2616,6 +2640,7 @@ install-target:  \
+@@ -2608,6 +2632,7 @@ install-target:  \
      maybe-install-target-libgfortran \
      maybe-install-target-libobjc \
      maybe-install-target-libgo \
@@ -242,7 +242,7 @@ Index: b/src/Makefile.in
      maybe-install-target-libtermcap \
      maybe-install-target-winsup \
      maybe-install-target-libgloss \
-@@ -2722,6 +2747,7 @@ install-strip-target:  \
+@@ -2714,6 +2739,7 @@ install-strip-target:  \
      maybe-install-strip-target-libgfortran \
      maybe-install-strip-target-libobjc \
      maybe-install-strip-target-libgo \
@@ -250,7 +250,7 @@ Index: b/src/Makefile.in
      maybe-install-strip-target-libtermcap \
      maybe-install-strip-target-winsup \
      maybe-install-strip-target-libgloss \
-@@ -46122,6 +46148,464 @@ maintainer-clean-target-libgo:
+@@ -46114,6 +46140,464 @@ maintainer-clean-target-libgo:
  
  
  
@@ -715,7 +715,7 @@ Index: b/src/Makefile.in
  .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
  maybe-configure-target-libtermcap:
  @if gcc-bootstrap
-@@ -51863,6 +52347,14 @@ check-gcc-go:
+@@ -51858,6 +52342,14 @@ check-gcc-go:
  	(cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-go);
  check-go: check-gcc-go check-target-libgo
  
@@ -730,7 +730,7 @@ Index: b/src/Makefile.in
  
  # The gcc part of install-no-fixedincludes, which relies on an intimate
  # knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
-@@ -54740,6 +55232,7 @@ configure-target-libquadmath: stage_last
+@@ -54735,6 +55227,7 @@ configure-target-libquadmath: stage_last
  configure-target-libgfortran: stage_last
  configure-target-libobjc: stage_last
  configure-target-libgo: stage_last
@@ -738,7 +738,7 @@ Index: b/src/Makefile.in
  configure-target-libtermcap: stage_last
  configure-target-winsup: stage_last
  configure-target-libgloss: stage_last
-@@ -54775,6 +55268,7 @@ configure-target-libquadmath: maybe-all-
+@@ -54770,6 +55263,7 @@ configure-target-libquadmath: maybe-all-
  configure-target-libgfortran: maybe-all-gcc
  configure-target-libobjc: maybe-all-gcc
  configure-target-libgo: maybe-all-gcc
@@ -746,7 +746,7 @@ Index: b/src/Makefile.in
  configure-target-libtermcap: maybe-all-gcc
  configure-target-winsup: maybe-all-gcc
  configure-target-libgloss: maybe-all-gcc
-@@ -55803,6 +56297,8 @@ configure-target-libgo: maybe-all-target
+@@ -55798,6 +56292,8 @@ 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
@@ -755,7 +755,7 @@ Index: b/src/Makefile.in
  configure-target-libobjc: maybe-configure-target-boehm-gc
  all-target-libobjc: maybe-all-target-boehm-gc
  configure-target-libstdc++-v3: maybe-configure-target-libgomp
-@@ -55931,6 +56427,7 @@ configure-target-libquadmath: maybe-all-
+@@ -55926,6 +56422,7 @@ configure-target-libquadmath: maybe-all-
  configure-target-libgfortran: maybe-all-target-libgcc
  configure-target-libobjc: maybe-all-target-libgcc
  configure-target-libgo: maybe-all-target-libgcc
@@ -763,7 +763,7 @@ Index: b/src/Makefile.in
  configure-target-libtermcap: maybe-all-target-libgcc
  configure-target-winsup: maybe-all-target-libgcc
  configure-target-libgloss: maybe-all-target-libgcc
-@@ -55973,6 +56470,8 @@ configure-target-libobjc: maybe-all-targ
+@@ -55968,6 +56465,8 @@ configure-target-libobjc: maybe-all-targ
  
  configure-target-libgo: maybe-all-target-newlib maybe-all-target-libgloss
  
@@ -776,7 +776,7 @@ Index: b/src/Makefile.tpl
 ===================================================================
 --- a/src/Makefile.tpl
 +++ b/src/Makefile.tpl
-@@ -160,6 +160,7 @@ BUILD_EXPORTS = \
+@@ -159,6 +159,7 @@ BUILD_EXPORTS = \
  	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
  	GOC="$(GOC_FOR_BUILD)"; export GOC; \
  	GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
@@ -784,47 +784,47 @@ Index: b/src/Makefile.tpl
  	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
  	LD="$(LD_FOR_BUILD)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-@@ -197,6 +198,7 @@ HOST_EXPORTS = \
- 	GCJ="$(GCJ)"; export GCJ; \
+@@ -195,6 +196,7 @@ HOST_EXPORTS = \
+ 	CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
  	GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
  	GOC="$(GOC)"; export GOC; \
 +	GDC="$(GDC)"; export GDC; \
  	AR="$(AR)"; export AR; \
  	AS="$(AS)"; export AS; \
  	CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -285,6 +287,7 @@ BASE_TARGET_EXPORTS = \
- 	GCJ="$(GCJ_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GCJ; \
+@@ -282,6 +284,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; \
 +	GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
  	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
  	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
  	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -351,6 +354,7 @@ DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
- GCJ_FOR_BUILD = @GCJ_FOR_BUILD@
+@@ -347,6 +350,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@
 +GDC_FOR_BUILD = @GDC_FOR_BUILD@
  LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
  LD_FOR_BUILD = @LD_FOR_BUILD@
  NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -491,6 +495,7 @@ RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @
- GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@
+@@ -486,6 +490,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@
 +GDC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GDC_FOR_TARGET@
  DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
  LD_FOR_TARGET=@LD_FOR_TARGET@
  
-@@ -617,6 +622,7 @@ EXTRA_HOST_FLAGS = \
- 	'GCJ=$(GCJ)' \
+@@ -611,6 +616,7 @@ EXTRA_HOST_FLAGS = \
+ 	'DLLTOOL=$(DLLTOOL)' \
  	'GFORTRAN=$(GFORTRAN)' \
  	'GOC=$(GOC)' \
 +	'GDC=$(GDC)' \
  	'LD=$(LD)' \
  	'LIPO=$(LIPO)' \
  	'NM=$(NM)' \
-@@ -674,6 +680,7 @@ EXTRA_TARGET_FLAGS = \
+@@ -667,6 +673,7 @@ 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)' \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git



More information about the Reproducible-commits mailing list