gcc{6,7}snapshot: don't override previous extra_objs on netbsd. helps arm

[coypu <coypu%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Wed Sep 28 14:52:29 2016 +0000
Changeset:	bcec81d78e69c2a8f132690427759132608f2cf8

Modified Files:
	gcc6snapshot/distinfo
	gcc6snapshot/patches/patch-gcc_config.gcc
	gcc7snapshot/distinfo
	gcc7snapshot/patches/patch-gcc_config.gcc

Log Message:
gcc{6,7}snapshot: don't override previous extra_objs on netbsd. helps arm

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bcec81d78e69c2a8f132690427759132608f2cf8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gcc6snapshot/distinfo                     | 2 +-
 gcc6snapshot/patches/patch-gcc_config.gcc | 4 ++--
 gcc7snapshot/distinfo                     | 2 +-
 gcc7snapshot/patches/patch-gcc_config.gcc | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diffs:
diff --git a/gcc6snapshot/distinfo b/gcc6snapshot/distinfo
index d823a25..be62056 100644
--- a/gcc6snapshot/distinfo
+++ b/gcc6snapshot/distinfo
@@ -9,7 +9,7 @@ RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
 Size (isl-0.14.tar.bz2) = 1399896 bytes
 SHA1 (patch-gcc_Makefile.in) = ce366a091960d335ecb022918e2f7bfc4e3fcccf
-SHA1 (patch-gcc_config.gcc) = bfa3897de6afa573ee44a60973611c4e9024f497
+SHA1 (patch-gcc_config.gcc) = 84fedf863c853c40bf81884f5db3617200f0d31d
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b
diff --git a/gcc6snapshot/patches/patch-gcc_config.gcc b/gcc6snapshot/patches/patch-gcc_config.gcc
index 4f83906..babfdea 100644
--- a/gcc6snapshot/patches/patch-gcc_config.gcc
+++ b/gcc6snapshot/patches/patch-gcc_config.gcc
@@ -14,8 +14,8 @@ $NetBSD: patch-gcc_config.gcc,v 1.2 2014/12/17 21:51:02 keckhardt Exp $
  
 +  # cabs/cabsf are renamed to __c99_cabs/cabsf
 +  tm_p_file="${tm_p_file} netbsd-protos.h"
-+  target_gtfiles="\$(srcdir)/config/netbsd.c"
-+  extra_objs="netbsd.o"
++  target_gtfiles="${target_gtfiles} \$(srcdir)/config/netbsd.c"
++  extra_objs="${extra_objs} netbsd.o"
 +
    # NetBSD 2.0 and later get POSIX threads enabled by default.
    # Allow them to be explicitly enabled on any other version.
diff --git a/gcc7snapshot/distinfo b/gcc7snapshot/distinfo
index 3d1ce96..d6aaa59 100644
--- a/gcc7snapshot/distinfo
+++ b/gcc7snapshot/distinfo
@@ -9,7 +9,7 @@ RMD160 (isl-0.14.tar.bz2) = 4c69d026b51561bc1948cb7db79331b78a9d2c39
 SHA512 (isl-0.14.tar.bz2) = 117c0c6f31d91a9284a8f54a748df6494ca2ac21507a45611e911403e9610579b9323ce624aea1de0b8089b3194e59d4364f01bdb71ddcf8f6c24c749d11c4b7
 Size (isl-0.14.tar.bz2) = 1399896 bytes
 SHA1 (patch-gcc_Makefile.in) = ce366a091960d335ecb022918e2f7bfc4e3fcccf
-SHA1 (patch-gcc_config.gcc) = baad2e92fcda854d8b1828990a2c515f5e2112c7
+SHA1 (patch-gcc_config.gcc) = 340681636c17b4923a2332297d7e5f37b9414866
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b
diff --git a/gcc7snapshot/patches/patch-gcc_config.gcc b/gcc7snapshot/patches/patch-gcc_config.gcc
index 8da074c..73073b4 100644
--- a/gcc7snapshot/patches/patch-gcc_config.gcc
+++ b/gcc7snapshot/patches/patch-gcc_config.gcc
@@ -14,8 +14,8 @@ $NetBSD: patch-gcc_config.gcc,v 1.2 2014/12/17 21:51:02 keckhardt Exp $
  
 +  # cabs/cabsf are renamed to __c99_cabs/cabsf
 +  tm_p_file="${tm_p_file} netbsd-protos.h"
-+  target_gtfiles="\$(srcdir)/config/netbsd.c"
-+  extra_objs="netbsd.o"
++  target_gtfiles="${tm_p_file} \$(srcdir)/config/netbsd.c"
++  extra_objs="${extra_objs} netbsd.o"
 +
    # NetBSD 2.0 and later get POSIX threads enabled by default.
    # Allow them to be explicitly enabled on any other version.