[gcc-7] 07/354: - more patch updates

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:21 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 81921ea203cbe4bc8301fec285fcf535973593fe
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Nov 11 14:31:31 2016 +0000

     - more patch updates
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9047 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/patches/gcc-default-ssp.diff             |  20 ++--
 debian/patches/rename-info-files.diff           | 138 ++++--------------------
 debian/patches/testsuite-hardening-updates.diff |  11 +-
 3 files changed, 39 insertions(+), 130 deletions(-)

diff --git a/debian/patches/gcc-default-ssp.diff b/debian/patches/gcc-default-ssp.diff
index 917ab8e..75da2e1 100644
--- a/debian/patches/gcc-default-ssp.diff
+++ b/debian/patches/gcc-default-ssp.diff
@@ -14,7 +14,7 @@ Index: b/src/gcc/gcc.c
 ===================================================================
 --- a/src/gcc/gcc.c
 +++ b/src/gcc/gcc.c
-@@ -858,6 +858,14 @@ proper position among the other output f
+@@ -861,6 +861,14 @@ proper position among the other output f
  #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G"
  #endif
  
@@ -29,7 +29,7 @@ Index: b/src/gcc/gcc.c
  #ifndef LINK_SSP_SPEC
  #ifdef TARGET_LIBC_PROVIDES_SSP
  #define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
-@@ -1057,6 +1065,7 @@ static const char *cc1_spec = CC1_SPEC;
+@@ -1069,6 +1077,7 @@ static const char *cc1_spec = CC1_SPEC;
  static const char *cc1plus_spec = CC1PLUS_SPEC;
  static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
  static const char *link_ssp_spec = LINK_SSP_SPEC;
@@ -37,7 +37,7 @@ Index: b/src/gcc/gcc.c
  static const char *asm_spec = ASM_SPEC;
  static const char *asm_final_spec = ASM_FINAL_SPEC;
  static const char *link_spec = LINK_SPEC;
-@@ -1112,7 +1121,7 @@ static const char *cpp_unique_options =
+@@ -1124,7 +1133,7 @@ static const char *cpp_unique_options =
  static const char *cpp_options =
  "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\
   %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\
@@ -46,7 +46,7 @@ Index: b/src/gcc/gcc.c
  
  /* This contains cpp options which are not passed when the preprocessor
     output will be used by another program.  */
-@@ -1301,9 +1310,9 @@ static const struct compiler default_com
+@@ -1319,9 +1328,9 @@ static const struct compiler default_com
        %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
  	  %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\
  	    cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \
@@ -58,7 +58,7 @@ Index: b/src/gcc/gcc.c
        %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1},
    {"-",
     "%{!E:%e-E or -x required when input is from standard input}\
-@@ -1328,7 +1337,7 @@ static const struct compiler default_com
+@@ -1346,7 +1355,7 @@ static const struct compiler default_com
  					   %W{o*:--output-pch=%*}}%V}}}}}}}", 0, 0, 0},
    {".i", "@cpp-output", 0, 0, 0},
    {"@cpp-output",
@@ -67,7 +67,7 @@ Index: b/src/gcc/gcc.c
    {".s", "@assembler", 0, 0, 0},
    {"@assembler",
     "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-@@ -1560,6 +1569,7 @@ static struct spec_list static_specs[] =
+@@ -1578,6 +1587,7 @@ static struct spec_list static_specs[] =
    INIT_STATIC_SPEC ("cc1plus",			&cc1plus_spec),
    INIT_STATIC_SPEC ("link_gcc_c_sequence",	&link_gcc_c_sequence_spec),
    INIT_STATIC_SPEC ("link_ssp",			&link_ssp_spec),
@@ -85,7 +85,7 @@ Index: b/src/gcc/cp/lang-specs.h
  	      %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\
 -	%(cc1_options) %2\
 +	%(cc1_options) %(ssp_default) %2\
- 	%{!fsyntax-only:-o %g.s \
+ 	%{!fsyntax-only:%{!S:-o %g.s} \
  	    %{!fdump-ada-spec*:%{!o*:--output-pch=%i.gch}\
  			       %W{o*:--output-pch=%*}}%V}}}}",
 @@ -58,11 +58,11 @@ along with GCC; see the file COPYING3.
@@ -106,7 +106,7 @@ Index: b/src/gcc/params.def
 ===================================================================
 --- a/src/gcc/params.def
 +++ b/src/gcc/params.def
-@@ -673,7 +673,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
+@@ -691,7 +691,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT,
  DEFPARAM (PARAM_SSP_BUFFER_SIZE,
  	  "ssp-buffer-size",
  	  "The lower bound for a buffer to be considered for stack smashing protection.",
@@ -191,7 +191,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -10350,6 +10350,9 @@ protection when @option{-fstack-protecti
+@@ -9953,6 +9953,9 @@ protection when @option{-fstack-protecti
  The minimum size of variables taking part in stack slot sharing when not
  optimizing. The default value is 32.
  
@@ -201,7 +201,7 @@ Index: b/src/gcc/doc/invoke.texi
  @item max-jump-thread-duplication-stmts
  Maximum number of statements allowed in a block that needs to be
  duplicated when threading jumps.
-@@ -11268,6 +11271,10 @@ functions with buffers larger than 8 byt
+@@ -10944,6 +10947,10 @@ functions with buffers larger than 8 byt
  when a function is entered and then checked when the function exits.
  If a guard check fails, an error message is printed and the program exits.
  
diff --git a/debian/patches/rename-info-files.diff b/debian/patches/rename-info-files.diff
index d9e1bda..9d6143b 100644
--- a/debian/patches/rename-info-files.diff
+++ b/debian/patches/rename-info-files.diff
@@ -27,10 +27,6 @@ gcc/fortran/ChangeLog:
 	names to makeinfo.
 	* gfortran.texi: Use macros defined in MAKEINFODEFS for references.
 
-gcc/java/ChangeLog:
-	* Make-lang.in: Allow transformations on info file names.
-	Pass macros of transformated info file defined in MAKEINFODEFS
-
 Index: b/src/gcc/fortran/gfortran.texi
 ===================================================================
 --- a/src/gcc/fortran/gfortran.texi
@@ -93,7 +89,7 @@ Index: b/src/gcc/Makefile.in
 ===================================================================
 --- a/src/gcc/Makefile.in
 +++ b/src/gcc/Makefile.in
-@@ -2880,8 +2880,32 @@ install-no-fixedincludes:
+@@ -3038,8 +3038,32 @@ install-no-fixedincludes:
  
  doc: $(BUILD_INFO) $(GENERATED_MANPAGES)
  
@@ -128,7 +124,7 @@ Index: b/src/gcc/Makefile.in
  
  info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
  
-@@ -2928,7 +2952,19 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
+@@ -3086,7 +3110,19 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
  	if [ -n "$(PKGVERSION)" ]; then \
  	  echo "@set VERSION_PACKAGE $(PKGVERSION)" >> $@T; \
  	fi
@@ -149,7 +145,7 @@ Index: b/src/gcc/Makefile.in
  	mv -f $@T $@
  
  
-@@ -2936,21 +2972,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
+@@ -3094,21 +3130,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE)
  # patterns.  To use them, put each of the specific targets with its
  # specific dependencies but no build commands.
  
@@ -198,7 +194,7 @@ Index: b/src/gcc/Makefile.in
  			-I $(gcc_docdir)/include -o $@ $<; \
  	fi
  
-@@ -3346,11 +3402,11 @@ install-driver: installdirs xgcc$(exeext
+@@ -3518,11 +3574,11 @@ install-driver: installdirs xgcc$(exeext
  # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
  # to do the install.
  install-info:: doc installdirs \
@@ -215,7 +211,7 @@ Index: b/src/gcc/Makefile.in
  	lang.install-info
  
  $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
-@@ -3404,6 +3460,7 @@ install-man: lang.install-man \
+@@ -3576,6 +3632,7 @@ install-man: lang.install-man \
  	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
  	$(DESTDIR)$(man1dir)/$(CPP_INSTALL_NAME)$(man1ext) \
  	$(DESTDIR)$(man1dir)/$(GCOV_INSTALL_NAME)$(man1ext) \
@@ -223,7 +219,7 @@ Index: b/src/gcc/Makefile.in
  	$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
  	$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
  	$(DESTDIR)$(man7dir)/gpl$(man7ext)
-@@ -3564,8 +3621,11 @@ uninstall: lang.uninstall
+@@ -3736,8 +3793,11 @@ uninstall: lang.uninstall
  	-rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext)
  	-rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
  	-rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
@@ -237,94 +233,6 @@ Index: b/src/gcc/Makefile.in
  	for i in ar nm ranlib ; do \
  	  install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\
  	  target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \
-Index: b/src/gcc/java/gcj.texi
-===================================================================
---- a/src/gcc/java/gcj.texi
-+++ b/src/gcc/java/gcj.texi
-@@ -55,25 +55,25 @@ man page gfdl(7).
- @format
- @dircategory Software development
- @direntry
--* Gcj: (gcj).               Ahead-of-time compiler for the Java language
-+* @value{fngcj}: (@value{fngcj}).               Ahead-of-time compiler for the Java language
- @end direntry
- 
- @dircategory Individual utilities
- @direntry
--* jcf-dump: (gcj)Invoking jcf-dump.
-+* jcf-dump: (@value{fngcj}) Invoking jcf-dump.
-                             Print information about Java class files
--* gij: (gcj)Invoking gij.   GNU interpreter for Java bytecode
--* gcj-dbtool: (gcj)Invoking gcj-dbtool.
-+* gij: (@value{fngcj}) Invoking gij.   GNU interpreter for Java bytecode
-+* gcj-dbtool: (@value{fngcj}) Invoking gcj-dbtool.
-                             Tool for manipulating class file databases.
--* jv-convert: (gcj)Invoking jv-convert.
-+* jv-convert: (@value{fngcj}) Invoking jv-convert.
-                             Convert file from one encoding to another
--* grmic: (gcj)Invoking grmic.
-+* grmic: (@value{fngcj}) Invoking grmic.
-                             Generate stubs for Remote Method Invocation.
--* gc-analyze: (gcj)Invoking gc-analyze.
-+* gc-analyze: (@value{fngcj}) Invoking gc-analyze.
-                             Analyze Garbage Collector (GC) memory dumps.
--* aot-compile: (gcj)Invoking aot-compile.
-+* aot-compile: (@value{fngcj})Invoking aot-compile.
-                             Compile bytecode to native and generate databases.
--* rebuild-gcj-db: (gcj)Invoking rebuild-gcj-db.
-+* rebuild-gcj-db: (@value{fngcj})Invoking rebuild-gcj-db.
-                             Merge the per-solib databases made by aot-compile
-                             into one system-wide database.
- @end direntry
-@@ -159,7 +159,7 @@ and the Info entries for @file{gcj} and
- 
- As @command{gcj} is just another front end to @command{gcc}, it supports many
- of the same options as gcc.  @xref{Option Summary, , Option Summary,
--gcc, Using the GNU Compiler Collection (GCC)}.  This manual only documents the
-+ at value{fngcc}, Using the GNU Compiler Collection (GCC)}.  This manual only documents the
- options specific to @command{gcj}.
- 
- @c man end
-Index: b/src/gcc/java/Make-lang.in
-===================================================================
---- a/src/gcc/java/Make-lang.in
-+++ b/src/gcc/java/Make-lang.in
-@@ -122,9 +122,10 @@ java.tags: force
- 	etags --include TAGS.sub --include ../TAGS.sub
- 
- 
--java.info: doc/gcj.info
-+INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)')
-+java.info: doc/$(INFO_GCJ_NAME).info
- 
--java.srcinfo: doc/gcj.info
-+java.srcinfo: doc/$(INFO_GCJ_NAME).info
- 	-cp -p $^ $(srcdir)/doc
- 
- java.dvi: doc/gcj.dvi
-@@ -190,7 +191,7 @@ java.uninstall:
- 	-rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext)
- 	-rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext)
- 
--java.install-info: $(DESTDIR)$(infodir)/gcj.info
-+java.install-info: $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info
- 
- java.install-pdf: $(JAVA_PDFFILES)
- 	@$(NORMAL_INSTALL)
-@@ -273,10 +274,10 @@ TEXI_JAVA_FILES = java/gcj.texi $(gcc_do
- 	 gcc-vers.texi
- 
- # Documentation
--doc/gcj.info: $(TEXI_JAVA_FILES)
-+doc/$(INFO_GCJ_NAME).info: $(TEXI_JAVA_FILES)
- 	if test "x$(BUILD_INFO)" = xinfo; then \
--	  rm -f doc/gcj.info*; \
--	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
-+	  rm -f doc/$(INFO_GCJ_NAME).info*; \
-+	  $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \
- 		-I $(gcc_docdir)/include -o $@ $<; \
- 	else true; fi
- 
 Index: b/src/gcc/ada/gnat-style.texi
 ===================================================================
 --- a/src/gcc/ada/gnat-style.texi
@@ -355,7 +263,7 @@ Index: b/src/gcc/doc/invoke.texi
 ===================================================================
 --- a/src/gcc/doc/invoke.texi
 +++ b/src/gcc/doc/invoke.texi
-@@ -11188,7 +11188,7 @@ One of the standard libraries bypassed b
+@@ -11363,7 +11363,7 @@ One of the standard libraries bypassed b
  @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
  which GCC uses to overcome shortcomings of particular machines, or special
  needs for some languages.
@@ -364,7 +272,7 @@ Index: b/src/gcc/doc/invoke.texi
  Collection (GCC) Internals},
  for more discussion of @file{libgcc.a}.)
  In most cases, you need @file{libgcc.a} even when you want to avoid
-@@ -11197,7 +11197,7 @@ or @option{-nodefaultlibs} you should us
+@@ -11372,7 +11372,7 @@ or @option{-nodefaultlibs} you should us
  This ensures that you have no unresolved references to internal GCC
  library subroutines.
  (An example of such an internal subroutine is @code{__main}, used to ensure C++
@@ -373,7 +281,7 @@ Index: b/src/gcc/doc/invoke.texi
  GNU Compiler Collection (GCC) Internals}.)
  
  @item -pie
-@@ -23994,7 +23994,7 @@ Note that you can also specify places to
+@@ -26183,7 +26183,7 @@ Note that you can also specify places to
  @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}).  These
  take precedence over places specified using environment variables, which
  in turn take precedence over those specified by the configuration of GCC at .
@@ -382,7 +290,7 @@ Index: b/src/gcc/doc/invoke.texi
  GNU Compiler Collection (GCC) Internals}.
  
  @table @env
-@@ -24154,7 +24154,7 @@ the headers it contains change.
+@@ -26343,7 +26343,7 @@ the headers it contains change.
  
  A precompiled header file is searched for when @code{#include} is
  seen in the compilation.  As it searches for the included file
@@ -395,7 +303,7 @@ Index: b/src/gcc/doc/extend.texi
 ===================================================================
 --- a/src/gcc/doc/extend.texi
 +++ b/src/gcc/doc/extend.texi
-@@ -18396,7 +18396,7 @@ want to write code that checks whether t
+@@ -21535,7 +21535,7 @@ want to write code that checks whether t
  test for the GNU compiler the same way as for C programs: check for a
  predefined macro @code{__GNUC__}.  You can also use @code{__GNUG__} to
  test specifically for GNU C++ (@pxref{Common Predefined Macros,,
@@ -408,7 +316,7 @@ Index: b/src/gcc/doc/standards.texi
 ===================================================================
 --- a/src/gcc/doc/standards.texi
 +++ b/src/gcc/doc/standards.texi
-@@ -286,8 +286,8 @@ described at @uref{http://golang.org/doc
+@@ -313,8 +313,8 @@ described at @uref{http://golang.org/doc
  GNAT Reference Manual}, for information on standard
  conformance and compatibility of the Ada compiler.
  
@@ -551,7 +459,7 @@ Index: b/src/libgomp/Makefile.in
 ===================================================================
 --- a/src/libgomp/Makefile.in
 +++ b/src/libgomp/Makefile.in
-@@ -445,7 +445,8 @@ info_TEXINFOS = libgomp.texi
+@@ -484,7 +484,8 @@ info_TEXINFOS = libgomp.texi
  
  # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
  @BUILD_INFO_TRUE at STAMP_BUILD_INFO = stamp-build-info
@@ -561,7 +469,7 @@ Index: b/src/libgomp/Makefile.in
  MAINTAINERCLEANFILES = $(srcdir)/libgomp.info
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -1235,15 +1236,16 @@ env.lo: libgomp_f.h
+@@ -1296,15 +1297,16 @@ env.lo: libgomp_f.h
  env.o: libgomp_f.h
  
  all-local: $(STAMP_GENINSRC)
@@ -655,7 +563,7 @@ Index: b/src/libitm/Makefile.in
 ===================================================================
 --- a/src/libitm/Makefile.in
 +++ b/src/libitm/Makefile.in
-@@ -1057,14 +1057,17 @@ vpath % $(strip $(search_path))
+@@ -1103,14 +1103,17 @@ vpath % $(strip $(search_path))
  
  all-local: $(STAMP_GENINSRC)
  
@@ -681,7 +589,7 @@ Index: b/src/gcc/go/Make-lang.in
 ===================================================================
 --- a/src/gcc/go/Make-lang.in
 +++ b/src/gcc/go/Make-lang.in
-@@ -85,10 +85,11 @@ GO_TEXI_FILES = \
+@@ -88,10 +88,11 @@ GO_TEXI_FILES = \
  	$(gcc_docdir)/include/gcc-common.texi \
  	gcc-vers.texi
  
@@ -696,7 +604,7 @@ Index: b/src/gcc/go/Make-lang.in
  		-I $(gcc_docdir)/include -o $@ $<; \
  	else true; fi
  
-@@ -114,7 +115,7 @@ gccgo.pod: go/gccgo.texi
+@@ -117,7 +118,7 @@ gccgo.pod: go/gccgo.texi
  go.all.cross: gccgo-cross$(exeext)
  go.start.encap: gccgo$(exeext)
  go.rest.encap:
@@ -705,7 +613,7 @@ Index: b/src/gcc/go/Make-lang.in
  go.dvi: doc/gccgo.dvi
  go.pdf: doc/gccgo.pdf
  go.html: $(build_htmldir)/go/index.html
-@@ -150,7 +151,7 @@ go.install-common: installdirs
+@@ -153,7 +154,7 @@ go.install-common: installdirs
  
  go.install-plugin:
  
@@ -714,7 +622,7 @@ Index: b/src/gcc/go/Make-lang.in
  
  go.install-pdf: doc/gccgo.pdf
  	@$(NORMAL_INSTALL)
-@@ -190,7 +191,7 @@ go.uninstall:
+@@ -193,7 +194,7 @@ go.uninstall:
  	rm -rf $(DESTDIR)$(bindir)/$(GCCGO_INSTALL_NAME)$(exeext)
  	rm -rf $(DESTDIR)$(man1dir)/$(GCCGO_INSTALL_NAME)$(man1ext)
  	rm -rf $(DESTDIR)$(bindir)/$(GCCGO_TARGET_INSTALL_NAME)$(exeext)
@@ -736,7 +644,7 @@ Index: b/src/gcc/go/gccgo.texi
  @end direntry
  @end format
  
-@@ -123,7 +123,7 @@ and the Info entries for @file{gccgo} an
+@@ -124,7 +124,7 @@ and the Info entries for @file{gccgo} an
  
  The @command{gccgo} command is a frontend to @command{gcc} and
  supports many of the same options.  @xref{Option Summary, , Option
@@ -797,7 +705,7 @@ Index: b/src/libquadmath/Makefile.in
 ===================================================================
 --- a/src/libquadmath/Makefile.in
 +++ b/src/libquadmath/Makefile.in
-@@ -169,7 +169,8 @@ MULTIDIRS =
+@@ -193,7 +193,8 @@ MULTIDIRS =
  MULTISUBDIR = 
  MULTIDO = true
  MULTICLEAN = true
@@ -807,7 +715,7 @@ Index: b/src/libquadmath/Makefile.in
  am__TEXINFO_TEX_DIR = $(srcdir)/../gcc/doc/include
  DVIS = libquadmath.dvi
  PDFS = libquadmath.pdf
-@@ -406,8 +407,8 @@ AUTOMAKE_OPTIONS = 1.8 foreign
+@@ -435,8 +436,8 @@ AUTOMAKE_OPTIONS = 1.8 foreign
  
  # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
  @BUILD_INFO_TRUE@@BUILD_LIBQUADMATH_TRUE at STAMP_BUILD_INFO = stamp-build-info
@@ -818,7 +726,7 @@ Index: b/src/libquadmath/Makefile.in
  
  # Automake Documentation:
  # If your package has Texinfo files in many directories, you can use the
-@@ -1466,17 +1467,17 @@ uninstall-am: uninstall-dvi-am uninstall
+@@ -1517,17 +1518,17 @@ uninstall-am: uninstall-dvi-am uninstall
  
  @BUILD_LIBQUADMATH_TRUE at all-local: $(STAMP_GENINSRC)
  
diff --git a/debian/patches/testsuite-hardening-updates.diff b/debian/patches/testsuite-hardening-updates.diff
index 0f3f7e7..b48180d 100644
--- a/debian/patches/testsuite-hardening-updates.diff
+++ b/debian/patches/testsuite-hardening-updates.diff
@@ -22,8 +22,8 @@ Index: b/src/gcc/testsuite/g++.dg/asan/asan_test.C
  // { dg-skip-if "" { *-*-* } { "*" } { "-O2" } }
  // { dg-skip-if "" { *-*-* } { "-flto" } { "" } }
  // { dg-additional-sources "asan_globals_test-wrapper.cc" }
--// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Wno-format -Werror -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" }
-+// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Wno-format -Wno-unused-result -Werror -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" }
+-// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Werror -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" }
++// { dg-options "-std=c++11 -fsanitize=address -fno-builtin -Wall -Werror -Wno-unused-result -g -DASAN_UAR=0 -DASAN_HAS_EXCEPTIONS=1 -DASAN_HAS_BLACKLIST=0 -DSANITIZER_USE_DEJAGNU_GTEST=1 -lasan -lpthread -ldl" }
  // { dg-additional-options "-DASAN_NEEDS_SEGV=1" { target { ! arm*-*-* } } }
  // { dg-additional-options "-DASAN_LOW_MEMORY=1 -DASAN_NEEDS_SEGV=0" { target arm*-*-* } }
  // { dg-additional-options "-DASAN_AVOID_EXPENSIVE_TESTS=1" { target { ! run_expensive_tests } } }
@@ -98,13 +98,14 @@ Index: b/src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c
 ===================================================================
 --- a/src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c
 +++ b/src/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c
-@@ -1,5 +1,5 @@
- /* { dg-do run  { target { i?86-*-* x86_64-*-* } } } */
+@@ -1,6 +1,6 @@
+ /* { dg-do run } */
+ /* { dg-require-effective-target cilkplus_runtime } */
 -/* { dg-options "-fcilkplus -w" } */
 +/* { dg-options "-fcilkplus -w -U_FORTIFY_SOURCE" } */
- /* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */
  
  #include <stdio.h>
+ #include <stdlib.h>
 Index: b/src/gcc/testsuite/gcc.dg/fstack-protector-strong.c
 ===================================================================
 --- a/src/gcc/testsuite/gcc.dg/fstack-protector-strong.c

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