[gcc-7] 279/354: - Refresh patches

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:51:15 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 fb7a6f7c891cbacc3e9880f96c83cf106eaac4d7
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Wed Aug 30 09:36:27 2017 +0000

     - Refresh patches
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9646 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/ada-749574.diff             | 16 +++++++++-------
 debian/patches/ada-armel-libatomic.diff    | 10 +++++++---
 debian/patches/ada-gnattools-cross.diff    | 24 ++++++++++++------------
 debian/patches/ada-sjlj.diff               | 12 ++++++------
 debian/patches/ada-tools-move-ldflags.diff |  8 +++++---
 debian/patches/arm-multilib-defaults.diff  |  4 ++--
 debian/patches/g++-multiarch-incdir.diff   |  6 +++---
 debian/patches/gcc-foffload-default.diff   | 20 +++++++++++++-------
 debian/patches/gcc-fuse-ld-lld.diff        |  2 +-
 debian/patches/gcc-gfdl-build.diff         |  2 +-
 debian/patches/gcc-hash-style-gnu.diff     |  2 +-
 debian/patches/gcc-ice-apport.diff         |  2 +-
 debian/patches/gcc-ice-dump.diff           |  2 +-
 debian/patches/gcc-multiarch.diff          |  8 ++++----
 debian/patches/gcc-textdomain.diff         |  2 +-
 debian/patches/gdc-7.diff                  | 14 +++++++-------
 debian/patches/gdc-libphobos-build.diff    |  4 ++--
 debian/patches/sys-auxv-header.diff        |  2 +-
 18 files changed, 77 insertions(+), 63 deletions(-)

diff --git a/debian/patches/ada-749574.diff b/debian/patches/ada-749574.diff
index 74daeac..c59a661 100644
--- a/debian/patches/ada-749574.diff
+++ b/debian/patches/ada-749574.diff
@@ -19,9 +19,11 @@ Description: array index out of range in gnatlink
     Ada.Text_IO.Put_Line (Boolean'Image (G (1 .. 2) = "ab"));
  end A;
 
+Index: b/src/gcc/ada/gnatlink.adb
+===================================================================
 --- a/src/gcc/ada/gnatlink.adb
 +++ b/src/gcc/ada/gnatlink.adb
-@@ -238,6 +238,9 @@
+@@ -239,6 +239,9 @@ procedure Gnatlink is
     procedure Write_Usage;
     --  Show user the program options
  
@@ -31,7 +33,7 @@ Description: array index out of range in gnatlink
     ---------------
     -- Base_Name --
     ---------------
-@@ -524,7 +527,7 @@
+@@ -525,7 +528,7 @@ procedure Gnatlink is
                    Binder_Options.Table (Binder_Options.Last) :=
                      Linker_Options.Table (Linker_Options.Last);
  
@@ -40,7 +42,7 @@ Description: array index out of range in gnatlink
                    if Arg'Length = 7 then
                       Exit_With_Error ("Missing argument for --LINK=");
                    end if;
-@@ -537,7 +540,7 @@
+@@ -538,7 +541,7 @@ procedure Gnatlink is
                         ("Could not locate linker: " & Arg (8 .. Arg'Last));
                    end if;
  
@@ -49,7 +51,7 @@ Description: array index out of range in gnatlink
                    declare
                       Program_Args : constant Argument_List_Access :=
                                        Argument_String_To_List
-@@ -1258,13 +1261,9 @@
+@@ -1259,13 +1262,9 @@ procedure Gnatlink is
                                           1 .. Linker_Options.Last
                                         loop
                                            if Linker_Options.Table (J) /= null
@@ -66,7 +68,7 @@ Description: array index out of range in gnatlink
                                            then
                                               --  We have found an already
                                               --  specified run_path_option:
-@@ -1381,6 +1380,17 @@
+@@ -1382,6 +1381,17 @@ procedure Gnatlink is
        Status := fclose (Fd);
     end Process_Binder_File;
  
@@ -84,7 +86,7 @@ Description: array index out of range in gnatlink
     -----------
     -- Usage --
     -----------
-@@ -1894,8 +1904,8 @@
+@@ -1896,8 +1906,8 @@ begin
           while J <= Linker_Options.Last loop
              if Linker_Options.Table (J).all = "-Xlinker"
                and then J < Linker_Options.Last
@@ -95,7 +97,7 @@ Description: array index out of range in gnatlink
              then
                 if Stack_Op then
                    Linker_Options.Table (J .. Linker_Options.Last - 2) :=
-@@ -1926,13 +1935,9 @@
+@@ -1928,13 +1938,9 @@ begin
              --  Here we just check for a canonical form that matches the
              --  pragma Linker_Options set in the NT runtime.
  
diff --git a/debian/patches/ada-armel-libatomic.diff b/debian/patches/ada-armel-libatomic.diff
index a4a4316..1bbfddc 100644
--- a/debian/patches/ada-armel-libatomic.diff
+++ b/debian/patches/ada-armel-libatomic.diff
@@ -10,19 +10,23 @@ Bug-Debian: https://bugs.debian.org/861734
 Author: Matthias Klose <doko at debian.org>
 Author: Nicolas Boulenguez <nicolas at debian.org>
 
+Index: b/src/gcc/ada/gcc-interface/Makefile.in
+===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1948,6 +1948,7 @@
-
+@@ -1942,6 +1942,7 @@ endif
+ 
  # ARM linux, GNU eabi
  ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
 +  MISCLIB = -L../../../$(target_alias)/libatomic/.libs -latomic
    LIBGNAT_TARGET_PAIRS = \
    a-intnam.ads<a-intnam-linux.ads \
    s-inmaop.adb<s-inmaop-posix.adb \
+Index: b/src/Makefile.def
+===================================================================
 --- a/src/Makefile.def
 +++ b/src/Makefile.def
-@@ -367,6 +367,8 @@
+@@ -400,6 +400,8 @@ dependencies = { module=all-gnattools; o
  dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
  dependencies = { module=all-target-libgnatvsn; on=all-target-libada; };
  
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
index 94b3617..6e15677 100644
--- a/debian/patches/ada-gnattools-cross.diff
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -26,7 +26,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
 ===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -1641,6 +1668,11 @@ ifeq ($(strip $(filter-out s390% linux%,
+@@ -1641,6 +1641,11 @@ ifeq ($(strip $(filter-out s390% linux%,
    LIBRARY_VERSION := $(LIB_VERSION)
  endif
  
@@ -38,7 +38,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  # HP/PA HP-UX 10
  ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
    LIBGNAT_TARGET_PAIRS = \
-@@ -2644,6 +2649,20 @@
+@@ -2644,6 +2649,20 @@ gnatlink-re: ../stamp-tools gnatmake-re
  		    --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
  	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
  
@@ -59,7 +59,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  # Needs to be built with CC=gcc
  # Since the RTL should be built with the latest compiler, remove the
  #  stamp target in the parent directory whenever gnat1 is rebuilt
-@@ -2706,14 +2657,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2693,14 +2712,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  #     Also install the .dSYM directories if they exist (these directories
  #     contain the debug information for the shared libraries on darwin)
  	for file in gnat gnarl; do \
@@ -76,7 +76,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	   if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
  	      $(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
  	        $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
-@@ -2735,8 +2741,7 @@
+@@ -2725,8 +2740,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  	touch ../stamp-gnatlib2-$(RTSDIR)
  	$(RM) ../stamp-gnatlib-$(RTSDIR)
  
@@ -86,7 +86,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	$(MKDIR) $(RTSDIR)
  	$(CHMOD) u+w $(RTSDIR)
  # Copy target independent sources
-@@ -2803,7 +2737,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
+@@ -2790,7 +2804,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
  	    $(OSCONS_EXTRACT) ; \
  	    ../bldtools/oscons/xoscons s-oscons)
  
@@ -95,7 +95,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	test -f $(RTSDIR)/s-oscons.ads || exit 1
  # C files
  	$(MAKE) -C $(RTSDIR) \
-@@ -2837,36 +2842,51 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
+@@ -2824,36 +2838,51 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
  		$(RANLIB_FOR_TARGET) $(RTSDIR)/libgmem$(arext)
          endif
  	$(CHMOD) a-wx $(RTSDIR)/*.ali
@@ -163,7 +163,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  	# Create static libgnat and libgnarl compiled with -fPIC
  	$(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
-@@ -2877,6 +2897,8 @@ gnatlib-shared-default:
+@@ -2864,6 +2893,8 @@ gnatlib-shared-default:
  	   $(addprefix $(RTSDIR)/,$(GNATRTL_TASKING_OBJS))
  	$(RANLIB_FOR_TARGET) $(RTSDIR)/libgnarl_pic$(arext)
  
@@ -172,7 +172,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  gnatlib-shared-dual:
  	$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2885,21 +2832,15 @@ gnatlib-shared-dual:
+@@ -2872,21 +2903,15 @@ gnatlib-shared-dual:
  	     GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
  	     MULTISUBDIR="$(MULTISUBDIR)" \
  	     THREAD_KIND="$(THREAD_KIND)" \
@@ -197,7 +197,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  gnatlib-shared-dual-win32:
  	$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2909,17 +2850,15 @@ gnatlib-shared-dual-win32:
+@@ -2896,17 +2921,15 @@ gnatlib-shared-dual-win32:
  	     PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
  	     MULTISUBDIR="$(MULTISUBDIR)" \
  	     THREAD_KIND="$(THREAD_KIND)" \
@@ -222,7 +222,7 @@ Index: b/src/gnattools/Makefile.in
 ===================================================================
 --- a/src/gnattools/Makefile.in
 +++ b/src/gnattools/Makefile.in
-@@ -75,15 +75,21 @@
+@@ -76,15 +76,21 @@ CXX_LFLAGS = \
   -L../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs
  
  # Variables for gnattools, native
@@ -247,7 +247,7 @@ Index: b/src/gnattools/Makefile.in
  	"exeext=$(exeext)" \
  	"fsrcdir=$(fsrcdir)" \
  	"srcdir=$(fsrcdir)" \
-@@ -190,6 +199,10 @@
+@@ -190,6 +196,10 @@ $(GCC_DIR)/stamp-tools:
  # to be able to build gnatmake without a version of gnatmake around. Once 
  # everything has been compiled once, gnatmake can be recompiled with itself 
  # (see target regnattools) 
@@ -258,7 +258,7 @@ Index: b/src/gnattools/Makefile.in
  gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib-rts
  	# gnattools1
  	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
-@@ -198,6 +211,13 @@
+@@ -198,6 +208,13 @@ gnattools-native: $(GCC_DIR)/stamp-tools
  	# gnattools2
  	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
  	  $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index d86a44a..a0381e2 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -410,7 +410,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
 ===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -191,7 +191,7 @@ TOOLSCASE =
+@@ -190,7 +190,7 @@ TOOLSCASE =
  
  # Multilib handling
  MULTISUBDIR =
@@ -419,7 +419,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  
  # Link flags used to build gnat tools.  By default we prefer to statically
  # link with libgcc to avoid a dependency on shared libgcc (which is tricky
-@@ -2673,6 +2673,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2728,6 +2728,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
  	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
  	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
  
@@ -446,7 +446,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  ../stamp-gnatlib2-$(RTSDIR):
  	$(RM) $(RTSDIR)/s-*.ali
  	$(RM) $(RTSDIR)/s-*$(objext)
-@@ -2938,7 +2958,7 @@ gnatlib-shared:
+@@ -3009,7 +3029,7 @@ gnatlib-shared:
  # commenting the pragma instead of deleting the line, as the latter might
  # result in getting multiple blank lines, hence possible style check errors.
  gnatlib-sjlj:
@@ -455,7 +455,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
  	sed \
  	  -e 's/Frontend_Exceptions.*/Frontend_Exceptions       : constant Boolean := True;/' \
-@@ -2947,6 +2967,7 @@ gnatlib-sjlj:
+@@ -3018,6 +3038,7 @@ gnatlib-sjlj:
  	  $(RTSDIR)/system.ads > $(RTSDIR)/s.ads
  	$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
  	$(MAKE) $(FLAGS_TO_PASS) \
@@ -463,7 +463,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
  	     EH_MECHANISM="" \
  	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
  	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -2998,6 +3019,8 @@ b_gnatm.o : b_gnatm.adb
+@@ -3069,6 +3090,8 @@ b_gnatm.o : b_gnatm.adb
  
  ADA_INCLUDE_DIR = $(libsubdir)/adainclude
  ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
@@ -491,7 +491,7 @@ Index: b/src/gcc/ada/gcc-interface/Make-lang.in
 ===================================================================
 --- a/src/gcc/ada/gcc-interface/Make-lang.in
 +++ b/src/gcc/ada/gcc-interface/Make-lang.in
-@@ -784,6 +784,7 @@ ada.install-common:
+@@ -788,6 +788,7 @@ ada.install-common:
  
  install-gnatlib:
  	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib$(LIBGNAT_TARGET)
diff --git a/debian/patches/ada-tools-move-ldflags.diff b/debian/patches/ada-tools-move-ldflags.diff
index 336a315..3d849ac 100644
--- a/debian/patches/ada-tools-move-ldflags.diff
+++ b/debian/patches/ada-tools-move-ldflags.diff
@@ -9,9 +9,11 @@ Description: For Ada tools, move LDFLAGS from GCC_LINK to TOOLS_LIBS.
 Author: Nicolas Boulenguez <nicolas at debian.org>
 Forwarded: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81104
 
+Index: b/src/gcc/ada/gcc-interface/Makefile.in
+===================================================================
 --- a/src/gcc/ada/gcc-interface/Makefile.in
 +++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -247,7 +247,7 @@
+@@ -247,7 +247,7 @@ LIBS = $(LIBINTL) $(LIBICONV) $(LIBBACKT
  LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBBACKTRACE) $(LIBIBERTY)
  # Default is no TGT_LIB; one might be passed down or something
  TGT_LIB =
@@ -20,7 +22,7 @@ Forwarded: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81104
    ../../libcommon.a ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \
    ../$(LIBBACKTRACE) ../$(LIBIBERTY) $(SYSLIBS) $(TGT_LIB)
  
-@@ -2532,7 +2532,7 @@
+@@ -2531,7 +2531,7 @@ TOOLS_FLAGS_TO_PASS=		\
  	"GNATLINK=$(GNATLINK)"	\
  	"GNATBIND=$(GNATBIND)"
  
@@ -29,7 +31,7 @@ Forwarded: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81104
  
  # Build directory for the tools. Let's copy the target-dependent
  # sources using the same mechanism as for gnatlib. The other sources are
-@@ -2630,7 +2630,7 @@
+@@ -2629,7 +2629,7 @@ common-tools: ../stamp-tools
  ../../vxaddr2line$(exeext): ../stamp-tools
  	$(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
  	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line
diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff
index a4ae6e2..b8468cd 100644
--- a/debian/patches/arm-multilib-defaults.diff
+++ b/debian/patches/arm-multilib-defaults.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc
 ===================================================================
 --- a/src/gcc/config.gcc
 +++ b/src/gcc/config.gcc
-@@ -3723,10 +3723,18 @@ case "${target}" in
+@@ -3728,10 +3728,18 @@ case "${target}" in
  		done
  
  		case "$with_float" in
@@ -25,7 +25,7 @@ Index: b/src/gcc/config.gcc
  		*)
  			echo "Unknown floating point type used in --with-float=$with_float" 1>&2
  			exit 1
-@@ -3760,6 +3768,9 @@ case "${target}" in
+@@ -3765,6 +3773,9 @@ case "${target}" in
  		"" \
  		| arm | thumb )
  			#OK
diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index 5f463fa..70a2771 100644
--- a/debian/patches/g++-multiarch-incdir.diff
+++ b/debian/patches/g++-multiarch-incdir.diff
@@ -5,7 +5,7 @@ Index: b/src/libstdc++-v3/include/Makefile.am
 ===================================================================
 --- a/src/libstdc++-v3/include/Makefile.am
 +++ b/src/libstdc++-v3/include/Makefile.am
-@@ -924,7 +924,7 @@ endif
+@@ -925,7 +925,7 @@ endif
  
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  host_builddir = ./${host_alias}/bits
@@ -18,7 +18,7 @@ Index: b/src/libstdc++-v3/include/Makefile.in
 ===================================================================
 --- a/src/libstdc++-v3/include/Makefile.in
 +++ b/src/libstdc++-v3/include/Makefile.in
-@@ -1209,7 +1209,7 @@ profile_impl_headers = \
+@@ -1210,7 +1210,7 @@ profile_impl_headers = \
  @GLIBCXX_C_HEADERS_COMPATIBILITY_TRUE at c_compatibility_headers_extra = ${c_compatibility_headers}
  host_srcdir = ${glibcxx_srcdir}/$(OS_INC_SRCDIR)
  host_builddir = ./${host_alias}/bits
@@ -54,7 +54,7 @@ Index: b/src/gcc/Makefile.in
  # all-tree.def includes all the tree.def files.
  all-tree.def: s-alltree; @true
  s-alltree: Makefile
-@@ -2768,7 +2777,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2769,7 +2778,7 @@ PREPROCESSOR_DEFINES = \
    -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
    -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
    -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
diff --git a/debian/patches/gcc-foffload-default.diff b/debian/patches/gcc-foffload-default.diff
index 599cb4a..9658db0 100644
--- a/debian/patches/gcc-foffload-default.diff
+++ b/debian/patches/gcc-foffload-default.diff
@@ -17,8 +17,10 @@ libgomp/
 	* target.c (gomp_load_plugin_for_device): If a plugin can't be
 	dlopened, assume it has no devices silently.
 
---- a/src/gcc/gcc.c.jj	2017-01-17 10:28:40.000000000 +0100
-+++ b/src/gcc/gcc.c	2017-01-20 16:26:29.649962902 +0100
+Index: b/src/gcc/gcc.c
+===================================================================
+--- a/src/gcc/gcc.c
++++ b/src/gcc/gcc.c
 @@ -290,6 +290,10 @@ static const char *spec_host_machine = D
  
  static char *offload_targets = NULL;
@@ -42,7 +44,7 @@ libgomp/
  
    if (output_file
        && strcmp (output_file, "-") != 0
-@@ -7693,6 +7700,12 @@ driver::maybe_putenv_OFFLOAD_TARGETS ()
+@@ -7696,6 +7703,12 @@ driver::maybe_putenv_OFFLOAD_TARGETS ()
        obstack_grow (&collect_obstack, offload_targets,
  		    strlen (offload_targets) + 1);
        xputenv (XOBFINISH (&collect_obstack, char *));
@@ -55,8 +57,10 @@ libgomp/
      }
  
    free (offload_targets);
---- a/src/gcc/lto-wrapper.c.jj	2017-01-01 12:45:34.000000000 +0100
-+++ b/src/gcc/lto-wrapper.c	2017-01-20 16:34:18.294016997 +0100
+Index: b/src/gcc/lto-wrapper.c
+===================================================================
+--- a/src/gcc/lto-wrapper.c
++++ b/src/gcc/lto-wrapper.c
 @@ -52,6 +52,7 @@ along with GCC; see the file COPYING3.
  /* Environment variable, used for passing the names of offload targets from GCC
     driver to lto-wrapper.  */
@@ -112,8 +116,10 @@ libgomp/
   out:
    free_array_of_ptrs ((void **) names, num_targets);
  }
---- a/src/libgomp/target.c.jj	2017-01-01 12:45:52.000000000 +0100
-+++ b/src/libgomp/target.c	2017-01-20 20:12:13.756710875 +0100
+Index: b/src/libgomp/target.c
+===================================================================
+--- a/src/libgomp/target.c
++++ b/src/libgomp/target.c
 @@ -2356,7 +2356,7 @@ gomp_load_plugin_for_device (struct gomp
  
    void *plugin_handle = dlopen (plugin_name, RTLD_LAZY);
diff --git a/debian/patches/gcc-fuse-ld-lld.diff b/debian/patches/gcc-fuse-ld-lld.diff
index 18a52cc..ecf0b14 100644
--- a/debian/patches/gcc-fuse-ld-lld.diff
+++ b/debian/patches/gcc-fuse-ld-lld.diff
@@ -73,7 +73,7 @@ Index: b/src/gcc/opts.c
 ===================================================================
 --- a/src/gcc/opts.c
 +++ b/src/gcc/opts.c
-@@ -2315,6 +2315,7 @@ common_handle_option (struct gcc_options
+@@ -2322,6 +2322,7 @@ common_handle_option (struct gcc_options
  
      case OPT_fuse_ld_bfd:
      case OPT_fuse_ld_gold:
diff --git a/debian/patches/gcc-gfdl-build.diff b/debian/patches/gcc-gfdl-build.diff
index 0d57fcb..6152010 100644
--- a/debian/patches/gcc-gfdl-build.diff
+++ b/debian/patches/gcc-gfdl-build.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -2405,30 +2405,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
+@@ -2406,30 +2406,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
  # \r is not portable to Solaris tr, therefore we have a special
  # case for ASCII.  We use \r for other encodings like EBCDIC.
  s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
diff --git a/debian/patches/gcc-hash-style-gnu.diff b/debian/patches/gcc-hash-style-gnu.diff
index a8b13d4..804019e 100644
--- a/debian/patches/gcc-hash-style-gnu.diff
+++ b/debian/patches/gcc-hash-style-gnu.diff
@@ -83,7 +83,7 @@ Index: b/src/gcc/config/rs6000/sysv4.h
 ===================================================================
 --- a/src/gcc/config/rs6000/sysv4.h
 +++ b/src/gcc/config/rs6000/sysv4.h
-@@ -800,7 +800,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
+@@ -810,7 +810,7 @@ ENDIAN_SELECT(" -mbig", " -mlittle", DEF
    CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \
  			 MUSL_DYNAMIC_LINKER)
  
diff --git a/debian/patches/gcc-ice-apport.diff b/debian/patches/gcc-ice-apport.diff
index 480b442..e9fa64f 100644
--- a/debian/patches/gcc-ice-apport.diff
+++ b/debian/patches/gcc-ice-apport.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -6899,6 +6899,16 @@ do_report_bug (const char **new_argv, co
+@@ -6902,6 +6902,16 @@ do_report_bug (const char **new_argv, co
  	  fflush(stderr);
  	  free(cmd);
  	}
diff --git a/debian/patches/gcc-ice-dump.diff b/debian/patches/gcc-ice-dump.diff
index 29fc388..4ecd3d0 100644
--- a/debian/patches/gcc-ice-dump.diff
+++ b/debian/patches/gcc-ice-dump.diff
@@ -15,7 +15,7 @@ Index: b/src/gcc/gcc.c
  		&& WEXITSTATUS (status) == ICE_EXIT_CODE
  		&& i == 0
  		&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-@@ -6881,8 +6882,23 @@ do_report_bug (const char **new_argv, co
+@@ -6884,8 +6885,23 @@ do_report_bug (const char **new_argv, co
  
    if (status == ATTEMPT_STATUS_SUCCESS)
      {
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 472f080..bb13c62 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -127,7 +127,7 @@ Index: b/src/gcc/config.gcc
 ===================================================================
 --- a/src/gcc/config.gcc
 +++ b/src/gcc/config.gcc
-@@ -2095,6 +2095,11 @@ mips*-*-linux*)				# Linux MIPS, either
+@@ -2100,6 +2100,11 @@ mips*-*-linux*)				# Linux MIPS, either
  			target_cpu_default=MASK_SOFT_FLOAT_ABI
  			enable_mips_multilibs="yes"
  			;;
@@ -139,7 +139,7 @@ Index: b/src/gcc/config.gcc
  		mipsisa64r6*-*-linux*)
  			default_mips_abi=n32
  			default_mips_arch=mips64r6
-@@ -2105,6 +2110,10 @@ mips*-*-linux*)				# Linux MIPS, either
+@@ -2110,6 +2115,10 @@ mips*-*-linux*)				# Linux MIPS, either
  			default_mips_arch=mips64r2
  			enable_mips_multilibs="yes"
  			;;
@@ -150,7 +150,7 @@ Index: b/src/gcc/config.gcc
  		mips64*-*-linux* | mipsisa64*-*-linux*)
  			default_mips_abi=n32
  			enable_mips_multilibs="yes"
-@@ -3060,6 +3069,16 @@ powerpc*-*-* | rs6000-*-*)
+@@ -3065,6 +3074,16 @@ powerpc*-*-* | rs6000-*-*)
  	tm_file="${tm_file} rs6000/option-defaults.h"
  esac
  
@@ -167,7 +167,7 @@ Index: b/src/gcc/config.gcc
  # Build mkoffload tool
  case ${target} in
  *-intelmic-* | *-intelmicemul-*)
-@@ -4507,7 +4526,7 @@ case ${target} in
+@@ -4512,7 +4531,7 @@ case ${target} in
  	i[34567]86-*-darwin* | x86_64-*-darwin*)
  		;;
  	i[34567]86-*-linux* | x86_64-*-linux*)
diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff
index a056ab3..c33b4ec 100644
--- a/debian/patches/gcc-textdomain.diff
+++ b/debian/patches/gcc-textdomain.diff
@@ -19,7 +19,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -4116,8 +4116,8 @@ install-po:
+@@ -4117,8 +4117,8 @@ install-po:
  	  dir=$(localedir)/$$lang/LC_MESSAGES; \
  	  echo $(mkinstalldirs) $(DESTDIR)$$dir; \
  	  $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
diff --git a/debian/patches/gdc-7.diff b/debian/patches/gdc-7.diff
index 76c2efd..20c6c42 100644
--- a/debian/patches/gdc-7.diff
+++ b/debian/patches/gdc-7.diff
@@ -49,7 +49,7 @@ Index: b/src/gcc/config/rs6000/rs6000.c
 ===================================================================
 --- a/src/gcc/config/rs6000/rs6000.c
 +++ b/src/gcc/config/rs6000/rs6000.c
-@@ -31548,7 +31548,8 @@ rs6000_output_function_epilogue (FILE *f
+@@ -31597,7 +31597,8 @@ rs6000_output_function_epilogue (FILE *f
        if (lang_GNU_C ()
  	  || ! strcmp (language_string, "GNU GIMPLE")
  	  || ! strcmp (language_string, "GNU Go")
@@ -63,7 +63,7 @@ Index: b/src/gcc/dwarf2out.c
 ===================================================================
 --- a/src/gcc/dwarf2out.c
 +++ b/src/gcc/dwarf2out.c
-@@ -5079,6 +5079,16 @@ is_ada (void)
+@@ -5083,6 +5083,16 @@ is_ada (void)
    return lang == DW_LANG_Ada95 || lang == DW_LANG_Ada83;
  }
  
@@ -80,7 +80,7 @@ Index: b/src/gcc/dwarf2out.c
  /* Remove the specified attribute if present.  Return TRUE if removal
     was successful.  */
  
-@@ -23594,6 +23604,8 @@ gen_compile_unit_die (const char *filena
+@@ -23598,6 +23608,8 @@ gen_compile_unit_die (const char *filena
  	language = DW_LANG_ObjC;
        else if (strcmp (language_string, "GNU Objective-C++") == 0)
  	language = DW_LANG_ObjC_plus_plus;
@@ -89,7 +89,7 @@ Index: b/src/gcc/dwarf2out.c
        else if (dwarf_version >= 5 || !dwarf_strict)
  	{
  	  if (strcmp (language_string, "GNU Go") == 0)
-@@ -25158,7 +25170,7 @@ declare_in_namespace (tree thing, dw_die
+@@ -25162,7 +25174,7 @@ declare_in_namespace (tree thing, dw_die
  
    if (ns_context != context_die)
      {
@@ -98,7 +98,7 @@ Index: b/src/gcc/dwarf2out.c
  	return ns_context;
        if (DECL_P (thing))
  	gen_decl_die (thing, NULL, NULL, ns_context);
-@@ -25181,7 +25193,7 @@ gen_namespace_die (tree decl, dw_die_ref
+@@ -25185,7 +25197,7 @@ gen_namespace_die (tree decl, dw_die_ref
      {
        /* Output a real namespace or module.  */
        context_die = setup_namespace_context (decl, comp_unit_die ());
@@ -107,7 +107,7 @@ Index: b/src/gcc/dwarf2out.c
  			       ? DW_TAG_module : DW_TAG_namespace,
  			       context_die, decl);
        /* For Fortran modules defined in different CU don't add src coords.  */
-@@ -25248,7 +25260,7 @@ gen_decl_die (tree decl, tree origin, st
+@@ -25252,7 +25264,7 @@ gen_decl_die (tree decl, tree origin, st
        break;
  
      case CONST_DECL:
@@ -116,7 +116,7 @@ Index: b/src/gcc/dwarf2out.c
  	{
  	  /* The individual enumerators of an enum type get output when we output
  	     the Dwarf representation of the relevant enum type itself.  */
-@@ -25795,7 +25807,7 @@ dwarf2out_decl (tree decl)
+@@ -25799,7 +25811,7 @@ dwarf2out_decl (tree decl)
      case CONST_DECL:
        if (debug_info_level <= DINFO_LEVEL_TERSE)
  	return;
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 2b6c907..199de5f 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -22,7 +22,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 ; };
-@@ -583,6 +585,8 @@ dependencies = { module=configure-target
+@@ -585,6 +587,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; };
@@ -31,7 +31,7 @@ Index: b/src/Makefile.def
  dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
  dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; };
  dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
-@@ -637,6 +641,8 @@ languages = { language=go;	gcc-check-tar
+@@ -639,6 +643,8 @@ languages = { language=go;	gcc-check-tar
  				lib-check-target=check-target-libgo; };
  languages = { language=brig;	gcc-check-target=check-brig;
  				lib-check-target=check-target-libhsail-rt; };
diff --git a/debian/patches/sys-auxv-header.diff b/debian/patches/sys-auxv-header.diff
index cc867a2..1349a1d 100644
--- a/debian/patches/sys-auxv-header.diff
+++ b/debian/patches/sys-auxv-header.diff
@@ -16,7 +16,7 @@ Index: b/src/gcc/config.in
 ===================================================================
 --- a/src/gcc/config.in
 +++ b/src/gcc/config.in
-@@ -1762,6 +1762,12 @@
+@@ -1766,6 +1766,12 @@
  #endif
  
  

-- 
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