gcc7: correct typo in patch, from Kai-Uwe Eckhardt

Reportedly fixes a bunch of tests.
make our cpuinfo patch possibly less harmful to glibc by using
the same macro as the symver logic

bump pkgrevision

4 files changed, 14 insertions, 10 deletions

diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile
index bdcac11e6cd..bf25552d89e 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/05/10 15:02:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2017/05/14 02:38:02 maya Exp $
 
 GCC_PKGNAME=		gcc7
 .include		"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC7S_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc7-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/gcc7/distinfo b/lang/gcc7/distinfo
index 49f4d36794b..66ff62d481e 100644
--- a/lang/gcc7/distinfo
+++ b/lang/gcc7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2017/05/12 18:10:56 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2017/05/14 02:38:02 maya Exp $
 
 SHA1 (gcc-7.1.0.tar.bz2) = 9f1e907f27eadefe7d5f7567c09e17805d9c8837
 RMD160 (gcc-7.1.0.tar.bz2) = a228dc45a09eda91b1a201d234f9013b3009b461
@@ -22,12 +22,12 @@ SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
 SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d
-SHA1 (patch-libcilkrts_configure) = 6c2d0f897c4a451d5b4b4fb5b3415d04704c0b0d
+SHA1 (patch-libcilkrts_configure) = ec76313d8103e0c525ebd26e9013ee3ca9e93391
 SHA1 (patch-libcilkrts_runtime_os-unix.c) = b25632587d9fbe8ff38377fe34cb16225355b521
 SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
-SHA1 (patch-libgcc_config_i386_cpuinfo.h) = 2c55385a9440d4991eb265f24e98ba68eef266e1
+SHA1 (patch-libgcc_config_i386_cpuinfo.h) = b0ff2ab74f57a1a7368da0805c1d1e06a4eeea6d
 SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
 SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
 SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
diff --git a/lang/gcc7/patches/patch-libcilkrts_configure b/lang/gcc7/patches/patch-libcilkrts_configure
index a48fcaa3b60..34f5974e1e4 100644
--- a/lang/gcc7/patches/patch-libcilkrts_configure
+++ b/lang/gcc7/patches/patch-libcilkrts_configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/04 17:38:23 maya Exp $
+$NetBSD: patch-libcilkrts_configure,v 1.3 2017/05/14 02:38:03 maya Exp $
 
 --- libcilkrts/configure.orig	2014-08-12 11:06:44.000000000 +0000
 +++ libcilkrts/configure
@@ -7,7 +7,7 @@ $NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/04 17:38:23 maya Exp $
  
  if test $enable_shared = yes; then
 -  link_cilkrts="-lcilkrts %{static: $LIBS}"
-+  link_cilkrts="-rpath ${PREFIX}/gcc7/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}"
++  link_cilkrts="-rpath ${PREFIX}/gcc7/lib --as-needed -lgcc_s -lcilkrts %{static: $LIBS}"
  else
    link_cilkrts="-lcilkrts $LIBS"
  fi
diff --git a/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h b/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
index ca52db184a2..cc0ef3624e0 100644
--- a/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
+++ b/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
@@ -1,14 +1,18 @@
-$NetBSD: patch-libgcc_config_i386_cpuinfo.h,v 1.1 2017/05/04 17:38:23 maya Exp $
+$NetBSD: patch-libgcc_config_i386_cpuinfo.h,v 1.2 2017/05/14 02:38:03 maya Exp $
 
-Fix GCC bug #80600
+ifdef out extern for GCC bug #80600, with the same condition as
+cpuinfo.c. removing triggers GCC bug #65612
 
 --- libgcc/config/i386/cpuinfo.h.orig	2017-01-10 12:55:41.000000000 +0000
 +++ libgcc/config/i386/cpuinfo.h
-@@ -108,7 +108,7 @@ enum processor_features
+@@ -108,7 +108,10 @@ enum processor_features
    FEATURE_AVX512VPOPCNTDQ
  };
  
 -extern struct __processor_model
++#if defined SHARED && defined USE_ELF_SYMVER
++extern
++#endif
 +struct __processor_model
  {
    unsigned int __cpu_vendor;