[gcc-7] 310/354: * Update to SVN 20171001 (r253234) from the gcc-7-branch.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:51:29 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 8642b8cdaeff6d467e9262ecf6a402a4ef0e3d50
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Sun Oct 1 15:15:22 2017 +0000
* Update to SVN 20171001 (r253234) from the gcc-7-branch.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9724 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 8 +-
debian/patches/gcc-linaro-revert-r253234.diff | 82 ++++++
debian/patches/svn-updates.diff | 378 +++++++++++++++++++++++++-
debian/rules.patch | 1 +
4 files changed, 458 insertions(+), 11 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d030dab..c152e04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,13 @@
gcc-7 (7.2.0-8) UNRELEASED; urgency=medium
- * Update to SVN 20170927 (r253234) from the gcc-7-branch.
+ * Update to SVN 20171001 (r253234) from the gcc-7-branch.
- Fix PR tree-optimization/82244, PR tree-optimization/82276,
- PR tree-optimization/82264, PR tree-optimization/82285,
- PR tree-optimization/82291.
+ PR tree-optimization/82264, PR tree-optimization/82285, PR c/82340,
+ PR tree-optimization/82291, PR c++/82159.
* Fix "privacy breeches" for NEWS.html file.
* Build lsan and tsan packages on arm64, ppc64 and ppc64el.
- -- Matthias Klose <doko at debian.org> Wed, 27 Sep 2017 18:11:26 +0200
+ -- Matthias Klose <doko at debian.org> Sun, 01 Oct 2017 17:08:37 +0200
gcc-7 (7.2.0-7) unstable; urgency=medium
diff --git a/debian/patches/gcc-linaro-revert-r253234.diff b/debian/patches/gcc-linaro-revert-r253234.diff
new file mode 100644
index 0000000..50eac74
--- /dev/null
+++ b/debian/patches/gcc-linaro-revert-r253234.diff
@@ -0,0 +1,82 @@
+# DP: Revert r253234, already in the Linaro branch.
+
+Index: b/src/gcc/testsuite/gcc.target/arm/lto/pr65837-attr_0.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/arm/lto/pr65837-attr_0.c
++++ b/src/gcc/testsuite/gcc.target/arm/lto/pr65837-attr_0.c
+@@ -1,7 +1,6 @@
+ /* { dg-lto-do run } */
+ /* { dg-require-effective-target arm_neon_hw } */
+-/* { dg-require-effective-target arm_neon_ok_no_float_abi } */
+-/* { dg-lto-options {{-flto -mfpu=neon}} } */
++/* { dg-lto-options {{-flto}} } */
+
+ #include "arm_neon.h"
+
+Index: b/src/gcc/testsuite/gcc.target/arm/lto/pr65837_0.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/arm/lto/pr65837_0.c
++++ b/src/gcc/testsuite/gcc.target/arm/lto/pr65837_0.c
+@@ -1,7 +1,7 @@
+ /* { dg-lto-do run } */
+ /* { dg-require-effective-target arm_neon_hw } */
+-/* { dg-require-effective-target arm_neon_ok_no_float_abi } */
+ /* { dg-lto-options {{-flto -mfpu=neon}} } */
++/* { dg-suppress-ld-options {-mfpu=neon} } */
+
+ #include "arm_neon.h"
+
+Index: b/src/gcc/testsuite/lib/target-supports.exp
+===================================================================
+--- a/src/gcc/testsuite/lib/target-supports.exp
++++ b/src/gcc/testsuite/lib/target-supports.exp
+@@ -3428,9 +3428,8 @@ proc check_effective_target_arm_neon_ok_
+ global et_arm_neon_flags
+ set et_arm_neon_flags ""
+ if { [check_effective_target_arm32] } {
+- foreach flags {"" "-mfloat-abi=softfp" "-mfpu=neon" "-mfpu=neon -mfloat-abi=softfp" "-mfpu=neon -mfloat-abi=softfp -march=armv7-a" "-mfloat-abi=hard" "-mfpu=neon -mfloat-abi=hard" "-mfpu=neon -mfloat-abi=hard -march=armv7-a"} {
++ foreach flags {"" "-mfloat-abi=softfp" "-mfpu=neon" "-mfpu=neon -mfloat-abi=softfp" "-mfpu=neon -mfloat-abi=softfp -march=armv7-a"} {
+ if { [check_no_compiler_messages_nocache arm_neon_ok object {
+- #include <arm_neon.h>
+ int dummy;
+ #ifndef __ARM_NEON__
+ #error not NEON
+@@ -3455,38 +3454,6 @@ proc check_effective_target_arm_neon_ok
+ check_effective_target_arm_neon_ok_nocache]
+ }
+
+-# Return 1 if this is an ARM target supporting -mfpu=neon without any
+-# -mfloat-abi= option. Useful in tests where add_options is not
+-# supported (such as lto tests).
+-
+-proc check_effective_target_arm_neon_ok_no_float_abi_nocache { } {
+- if { [check_effective_target_arm32] } {
+- foreach flags {"-mfpu=neon"} {
+- if { [check_no_compiler_messages_nocache arm_neon_ok_no_float_abi object {
+- #include <arm_neon.h>
+- int dummy;
+- #ifndef __ARM_NEON__
+- #error not NEON
+- #endif
+- /* Avoid the case where a test adds -mfpu=neon, but the toolchain is
+- configured for -mcpu=arm926ej-s, for example. */
+- #if __ARM_ARCH < 7 || __ARM_ARCH_PROFILE == 'M'
+- #error Architecture does not support NEON.
+- #endif
+- } "$flags"] } {
+- return 1
+- }
+- }
+- }
+-
+- return 0
+-}
+-
+-proc check_effective_target_arm_neon_ok_no_float_abi { } {
+- return [check_cached_effective_target arm_neon_ok_no_float_abi \
+- check_effective_target_arm_neon_ok_no_float_abi_nocache]
+-}
+-
+ proc check_effective_target_arm_crc_ok_nocache { } {
+ global et_arm_crc_flags
+ set et_arm_crc_flags "-march=armv8-a+crc"
diff --git a/debian/patches/svn-updates.diff b/debian/patches/svn-updates.diff
index 2bddd3a..b1765d2 100644
--- a/debian/patches/svn-updates.diff
+++ b/debian/patches/svn-updates.diff
@@ -1,10 +1,10 @@
-# DP: updates from the 7 branch upto 20170927 (r253234).
+# DP: updates from the 7 branch upto 20171001 (r253328).
last_update()
{
cat > ${dir}LAST_UPDATED <EOF
-Wed Sep 27 18:06:00 CEST 2017
-Wed Sep 27 16:06:00 UTC 2017 (revision 253234)
+Sun Oct 1 16:50:35 CEST 2017
+Sun Oct 1 14:50:35 UTC 2017 (revision 253328)
EOF
}
@@ -6235,6 +6235,34 @@ Index: libstdc++-v3/config/io/basic_file_stdio.cc
if (!__err)
{
_M_cfile = __file;
+Index: libgcc/config.host
+===================================================================
+--- a/src/libgcc/config.host (.../tags/gcc_7_2_0_release)
++++ b/src/libgcc/config.host (.../branches/gcc-7-branch)
+@@ -245,6 +245,7 @@
+ *-*-netbsd*)
+ tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
+ tmake_file="$tmake_file t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver"
++ tmake_file="$tmake_file t-slibgcc-libgcc"
+ # NetBSD 1.7 and later are set up to use GCC's crtstuff for
+ # ELF configurations. We will clear extra_parts in the
+ # a.out configurations.
+Index: libgcc/ChangeLog
+===================================================================
+--- a/src/libgcc/ChangeLog (.../tags/gcc_7_2_0_release)
++++ b/src/libgcc/ChangeLog (.../branches/gcc-7-branch)
+@@ -1,3 +1,11 @@
++2017-09-28 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ Backport from mainline
++ 2017-05-14 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ PR target/80600
++ * config.host (*-*-netbsd*): Add t-slibgcc-libgcc to tmake_file.
++
+ 2017-08-14 Release Manager
+
+ * GCC 7.2.0 released.
Index: gcc/is-a.h
===================================================================
--- a/src/gcc/is-a.h (.../tags/gcc_7_2_0_release)
@@ -6601,13 +6629,45 @@ Index: gcc/c-family/c-attribs.c
}
else
{
+Index: gcc/c/ChangeLog
+===================================================================
+--- a/src/gcc/c/ChangeLog (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/c/ChangeLog (.../branches/gcc-7-branch)
+@@ -1,3 +1,12 @@
++2017-09-30 Jakub Jelinek <jakub at redhat.com>
++
++ Backported from mainline
++ 2017-09-29 Jakub Jelinek <jakub at redhat.com>
++
++ PR c/82340
++ * c-decl.c (build_compound_literal): Use c_apply_type_quals_to_decl
++ instead of trying to set just TREE_READONLY manually.
++
+ 2017-08-14 Release Manager
+
+ * GCC 7.2.0 released.
+Index: gcc/c/c-decl.c
+===================================================================
+--- a/src/gcc/c/c-decl.c (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/c/c-decl.c (.../branches/gcc-7-branch)
+@@ -5264,9 +5264,7 @@
+ DECL_ARTIFICIAL (decl) = 1;
+ DECL_IGNORED_P (decl) = 1;
+ TREE_TYPE (decl) = type;
+- TREE_READONLY (decl) = (TYPE_READONLY (type)
+- || (TREE_CODE (type) == ARRAY_TYPE
+- && TYPE_READONLY (TREE_TYPE (type))));
++ c_apply_type_quals_to_decl (TYPE_QUALS (strip_array_types (type)), decl);
+ store_init_value (loc, decl, init, NULL_TREE);
+
+ if (TREE_CODE (type) == ARRAY_TYPE && !COMPLETE_TYPE_P (type))
Index: gcc/DATESTAMP
===================================================================
--- a/src/gcc/DATESTAMP (.../tags/gcc_7_2_0_release)
+++ b/src/gcc/DATESTAMP (.../branches/gcc-7-branch)
@@ -1 +1 @@
-20170814
-+20170927
++20171001
Index: gcc/tree.c
===================================================================
--- a/src/gcc/tree.c (.../tags/gcc_7_2_0_release)
@@ -7024,7 +7084,50 @@ Index: gcc/ChangeLog
===================================================================
--- a/src/gcc/ChangeLog (.../tags/gcc_7_2_0_release)
+++ b/src/gcc/ChangeLog (.../branches/gcc-7-branch)
-@@ -1,3 +1,543 @@
+@@ -1,3 +1,586 @@
++2017-09-30 Jakub Jelinek <jakub at redhat.com>
++
++ * config/i386/i386.c (ix86_split_idivmod): Use mode instead of
++ always SImode for DIV and MOD in REG_EQUAL notes.
++
++ Backported from mainline
++ 2017-09-27 Jakub Jelinek <jakub at redhat.com>
++
++ PR c++/82159
++ * gimplify.c (gimplify_modify_expr): Don't optimize away zero sized
++ lhs from calls if the lhs has addressable type.
++
++2017-09-29 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ Backport from mainline
++ 2017-06-29 Maya Rashish <coypu at sdf.org>
++
++ PR target/77480
++ * config/netbsd.h (NETBSD_LIB_SPEC): Add -lc when creating shared
++ objects.
++
++2017-09-29 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ Backport from mainline
++ 2017-09-26 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ PR target/39570
++ * gcc/config/netbsd-protos.h: New file.
++ * gcc/config/netbsd.c: New file.
++ * gcc/config/netbsd.h (SUBTARGET_INIT_BUILTINS): Define.
++ * gcc/config/t-netbsd: New file.
++ * gcc/config.gcc (tm_p_file): Add netbsd-protos.h.
++ (tmake_file) Add t-netbsd.
++ (extra_objs) Add netbsd.o.
++
++2017-09-28 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ Backport from mainline
++ 2017-05-14 Krister Walfridsson <krister.walfridsson at gmail.com>
++
++ PR target/80600
++ * config/netbsd.h (NETBSD_LIBGCC_SPEC): Always add -lgcc.
++
+2017-09-27 Christophe Lyon <christophe.lyon at linaro.org>
+
+ Backport from trunk r249639.
@@ -9696,6 +9799,25 @@ Index: gcc/testsuite/gcc.dg/tree-ssa/pr81588.c
/* { dg-options "-O2 -fdump-tree-reassoc1-details" } */
/* { dg-additional-options "-mbranch-cost=2" { target mips*-*-* avr-*-* s390*-*-* i?86-*-* x86_64-*-* } } */
+Index: gcc/testsuite/gcc.dg/tree-ssa/pr82340.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.dg/tree-ssa/pr82340.c (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/testsuite/gcc.dg/tree-ssa/pr82340.c (.../branches/gcc-7-branch)
+@@ -0,0 +1,14 @@
++/* PR c/82340 */
++/* { dg-do compile } */
++/* { dg-options "-O2 -fdump-tree-ssa" } */
++/* { dg-final { scan-tree-dump "D.\[0-9]*\\\[0\\\] ={v} 77;" "ssa" } } */
++
++int
++foo (void)
++{
++ int i;
++ volatile char *p = (volatile char[1]) { 77 };
++ for (i = 1; i < 10; i++)
++ *p = 4;
++ return *p;
++}
Index: gcc/testsuite/gcc.dg/pr81988.c
===================================================================
--- a/src/gcc/testsuite/gcc.dg/pr81988.c (.../tags/gcc_7_2_0_release)
@@ -9846,7 +9968,20 @@ Index: gcc/testsuite/ChangeLog
===================================================================
--- a/src/gcc/testsuite/ChangeLog (.../tags/gcc_7_2_0_release)
+++ b/src/gcc/testsuite/ChangeLog (.../branches/gcc-7-branch)
-@@ -1,3 +1,414 @@
+@@ -1,3 +1,427 @@
++2017-09-30 Jakub Jelinek <jakub at redhat.com>
++
++ Backported from mainline
++ 2017-09-29 Jakub Jelinek <jakub at redhat.com>
++
++ PR c/82340
++ * gcc.dg/tree-ssa/pr82340.c: New test.
++
++ 2017-09-27 Jakub Jelinek <jakub at redhat.com>
++
++ PR c++/82159
++ * g++.dg/opt/pr82159.C: New test.
++
+2017-09-27 Christophe Lyon <christophe.lyon at linaro.org>
+
+ Backport from trunk r249639.
@@ -10261,6 +10396,29 @@ Index: gcc/testsuite/ChangeLog
2017-08-14 Release Manager
* GCC 7.2.0 released.
+Index: gcc/testsuite/g++.dg/opt/pr82159.C
+===================================================================
+--- a/src/gcc/testsuite/g++.dg/opt/pr82159.C (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/testsuite/g++.dg/opt/pr82159.C (.../branches/gcc-7-branch)
+@@ -0,0 +1,18 @@
++// PR c++/82159
++// { dg-do compile }
++// { dg-options "" }
++
++template<int N>
++struct S
++{
++ ~S () {}
++ template<int M> S<M> foo () { return S<M> (); }
++ unsigned char data[N];
++};
++
++int
++main ()
++{
++ S<16> d;
++ S<0> t = d.foo<0> ();
++}
Index: gcc/testsuite/g++.dg/ubsan/pr81929.C
===================================================================
--- a/src/gcc/testsuite/g++.dg/ubsan/pr81929.C (.../tags/gcc_7_2_0_release)
@@ -13087,6 +13245,24 @@ Index: gcc/tree-if-conv.c
}
}
+Index: gcc/gimplify.c
+===================================================================
+--- a/src/gcc/gimplify.c (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/gimplify.c (.../branches/gcc-7-branch)
+@@ -5434,7 +5434,12 @@
+ side as statements and throw away the assignment. Do this after
+ gimplify_modify_expr_rhs so we handle TARGET_EXPRs of addressable
+ types properly. */
+- if (zero_sized_type (TREE_TYPE (*from_p)) && !want_value)
++ if (zero_sized_type (TREE_TYPE (*from_p))
++ && !want_value
++ /* Don't do this for calls that return addressable types, expand_call
++ relies on those having a lhs. */
++ && !(TREE_ADDRESSABLE (TREE_TYPE (*from_p))
++ && TREE_CODE (*from_p) == CALL_EXPR))
+ {
+ gimplify_stmt (from_p, pre_p);
+ gimplify_stmt (to_p, pre_p);
Index: gcc/calls.c
===================================================================
--- a/src/gcc/calls.c (.../tags/gcc_7_2_0_release)
@@ -315356,7 +315532,18 @@ Index: gcc/config.gcc
===================================================================
--- a/src/gcc/config.gcc (.../tags/gcc_7_2_0_release)
+++ b/src/gcc/config.gcc (.../branches/gcc-7-branch)
-@@ -2416,7 +2416,7 @@
+@@ -775,7 +775,9 @@
+ target_has_targetcm=yes
+ ;;
+ *-*-netbsd*)
+- tmake_file="t-slibgcc"
++ tm_p_file="${tm_p_file} netbsd-protos.h"
++ tmake_file="t-netbsd t-slibgcc"
++ extra_objs="${extra_objs} netbsd.o"
+ gas=yes
+ gnu_ld=yes
+ use_gcc_stdint=wrap
+@@ -2416,7 +2418,7 @@
;;
powerpc-*-rtems*)
tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h rs6000/sysv4.h rs6000/e500.h rs6000/rtems.h rtems.h"
@@ -315455,6 +315642,32 @@ Index: gcc/tree-cfg.c
default:
if (is_gimple_omp (stmt))
{
+Index: gcc/config/t-netbsd
+===================================================================
+--- a/src/gcc/config/t-netbsd (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/config/t-netbsd (.../branches/gcc-7-branch)
+@@ -0,0 +1,21 @@
++# Copyright (C) 2017 Free Software Foundation, Inc.
++#
++# This file is part of GCC.
++#
++# GCC is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++#
++# GCC is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GCC; see the file COPYING3. If not see
++# <http://www.gnu.org/licenses/>.
++
++netbsd.o: $(srcdir)/config/netbsd.c
++ $(COMPILE) $<
++ $(POSTCOMPILE)
Index: gcc/config/sparc/sparc.md
===================================================================
--- a/src/gcc/config/sparc/sparc.md (.../tags/gcc_7_2_0_release)
@@ -315546,6 +315759,24 @@ Index: gcc/config/i386/i386.c
ret = false;
else if (caller_opts->branch_cost != callee_opts->branch_cost)
+@@ -20704,13 +20714,13 @@
+
+ if (signed_p)
+ {
+- div = gen_rtx_DIV (SImode, operands[2], operands[3]);
+- mod = gen_rtx_MOD (SImode, operands[2], operands[3]);
++ div = gen_rtx_DIV (mode, operands[2], operands[3]);
++ mod = gen_rtx_MOD (mode, operands[2], operands[3]);
+ }
+ else
+ {
+- div = gen_rtx_UDIV (SImode, operands[2], operands[3]);
+- mod = gen_rtx_UMOD (SImode, operands[2], operands[3]);
++ div = gen_rtx_UDIV (mode, operands[2], operands[3]);
++ mod = gen_rtx_UMOD (mode, operands[2], operands[3]);
+ }
+
+ /* Extract remainder from AH. */
@@ -32826,6 +32836,9 @@
{
const char *str = TREE_STRING_POINTER (TREE_VALUE (arg));
@@ -315751,6 +315982,139 @@ Index: gcc/config/xtensa/xtensa.c
case DFmode:
return (xtensa_uimm8x4 (v) && xtensa_uimm8x4 (v + 4));
+Index: gcc/config/netbsd.c
+===================================================================
+--- a/src/gcc/config/netbsd.c (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/config/netbsd.c (.../branches/gcc-7-branch)
+@@ -0,0 +1,54 @@
++/* Functions for generic NetBSD as target machine for GNU C compiler.
++ Copyright (C) 2017 Free Software Foundation, Inc.
++
++This file is part of GCC.
++
++GCC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 3, or (at your option)
++any later version.
++
++GCC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GCC; see the file COPYING3. If not see
++<http://www.gnu.org/licenses/>. */
++
++#include "config.h"
++#include "system.h"
++#include "coretypes.h"
++#include "tm.h"
++#include "tree.h"
++#include "varasm.h"
++#include "netbsd-protos.h"
++
++static void
++netbsd_patch_builtin (enum built_in_function fncode)
++{
++ tree fn = builtin_decl_explicit (fncode);
++ tree sym;
++ char *newname;
++
++ if (!fn)
++ return;
++
++ sym = DECL_ASSEMBLER_NAME (fn);
++ newname = ACONCAT (("__c99_", IDENTIFIER_POINTER (sym), NULL));
++
++ set_user_assembler_name (fn, newname);
++
++ fn = builtin_decl_implicit (fncode);
++ if (fn)
++ set_user_assembler_name (fn, newname);
++}
++
++void
++netbsd_patch_builtins (void)
++{
++ netbsd_patch_builtin (BUILT_IN_CABSF);
++ netbsd_patch_builtin (BUILT_IN_CABS);
++ netbsd_patch_builtin (BUILT_IN_CABSL);
++}
+Index: gcc/config/netbsd.h
+===================================================================
+--- a/src/gcc/config/netbsd.h (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/config/netbsd.h (.../branches/gcc-7-branch)
+@@ -96,6 +96,7 @@
+ %{!pg:-lposix}} \
+ %{p:-lposix_p} \
+ %{pg:-lposix_p}} \
++ %{shared:-lc} \
+ %{!shared: \
+ %{!symbolic: \
+ %{!p: \
+@@ -109,6 +110,7 @@
+ %{!pg:-lposix}} \
+ %{p:-lposix_p} \
+ %{pg:-lposix_p}} \
++ %{shared:-lc} \
+ %{!shared: \
+ %{!symbolic: \
+ %{!p: \
+@@ -120,8 +122,7 @@
+ #undef LIB_SPEC
+ #define LIB_SPEC NETBSD_LIB_SPEC
+
+-/* Provide a LIBGCC_SPEC appropriate for NetBSD. We also want to exclude
+- libgcc with -symbolic. */
++/* Provide a LIBGCC_SPEC appropriate for NetBSD. */
+
+ #ifdef NETBSD_NATIVE
+ #define NETBSD_LIBGCC_SPEC \
+@@ -133,7 +134,7 @@
+ %{p: -lgcc_p} \
+ %{pg: -lgcc_p}}"
+ #else
+-#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}"
++#define NETBSD_LIBGCC_SPEC "-lgcc"
+ #endif
+
+ #undef LIBGCC_SPEC
+@@ -179,3 +180,9 @@
+
+ #undef WINT_TYPE
+ #define WINT_TYPE "int"
++
++#undef SUBTARGET_INIT_BUILTINS
++#define SUBTARGET_INIT_BUILTINS \
++ do { \
++ netbsd_patch_builtins (); \
++ } while(0)
+Index: gcc/config/netbsd-protos.h
+===================================================================
+--- a/src/gcc/config/netbsd-protos.h (.../tags/gcc_7_2_0_release)
++++ b/src/gcc/config/netbsd-protos.h (.../branches/gcc-7-branch)
+@@ -0,0 +1,20 @@
++/* Prototypes.
++ Copyright (C) 2017 Free Software Foundation, Inc.
++
++This file is part of GCC.
++
++GCC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 3, or (at your option)
++any later version.
++
++GCC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++GNU General Public License for more details.
++
++You should have received a copy of the GNU General Public License
++along with GCC; see the file COPYING3. If not see
++<http://www.gnu.org/licenses/>. */
++
++extern void netbsd_patch_builtins (void);
Index: gcc/config/gnu-user.h
===================================================================
--- a/src/gcc/config/gnu-user.h (.../tags/gcc_7_2_0_release)
diff --git a/debian/rules.patch b/debian/rules.patch
index ae6b02c..bc705db 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -14,6 +14,7 @@ series_file ?= $(patchdir)/series
debian_patches = \
svn-updates \
+ $(if $(with_linaro_branch),gcc-linaro-revert-r253234) \
$(if $(with_linaro_branch),gcc-linaro-revert-r249596) \
$(if $(with_linaro_branch),gcc-linaro) \
$(if $(with_linaro_branch),gcc-linaro-no-macros) \
--
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