Thu May 4 17:38:23 2017 UTC ()
gcc7: unbreak non-linux after GCC r243219.
GCC target/80600. Thanks joerg.
Fix wip package reference, thanks Kai-Uwe Eckhardt.

Bump PKGREVISION


(maya)
diff -r1.1 -r1.2 pkgsrc/lang/gcc7/Makefile
diff -r1.1 -r1.2 pkgsrc/lang/gcc7/distinfo
diff -r1.1 -r1.2 pkgsrc/lang/gcc7/patches/patch-libcilkrts_configure
diff -r0 -r1.1 pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc7/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/Makefile 2017/05/03 00:21:03 1.1
+++ pkgsrc/lang/gcc7/Makefile 2017/05/04 17:38:23 1.2
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile,v 1.1 2017/05/03 00:21:03 maya Exp $ 1# $NetBSD: Makefile,v 1.2 2017/05/04 17:38:23 maya Exp $
2 2
3GCC_PKGNAME= gcc7 3GCC_PKGNAME= gcc7
4.include "version.mk" 4.include "version.mk"
5 5
6DISTNAME= gcc-${GCC7S_DIST_VERSION} 6DISTNAME= gcc-${GCC7S_DIST_VERSION}
7PKGNAME= ${GCC_PKGNAME}-${GCC7S_DIST_VERSION} 7PKGNAME= ${GCC_PKGNAME}-${GCC7S_DIST_VERSION}
8## When bumping the PKGREVISION of this package the PKGREVISION of 8## When bumping the PKGREVISION of this package the PKGREVISION of
9## lang/gcc7-libs needs to be bump to be at least 1 more than the 9## lang/gcc7-libs needs to be bump to be at least 1 more than the
10## PKGREVISION of this package! 10## PKGREVISION of this package!
 11PKGREVISION= 1
11CATEGORIES= lang 12CATEGORIES= lang
12MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/} 13MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7S_DIST_VERSION}/}
13EXTRACT_SUFX= .tar.bz2 14EXTRACT_SUFX= .tar.bz2
14 15
15MAINTAINER= pkgsrc-users@NetBSD.org 16MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= http://gcc.gnu.org/ 17HOMEPAGE= http://gcc.gnu.org/
17COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series 18COMMENT= The GNU Compiler Collection (GCC) - 7.0 Release Series
18LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3 19LICENSE= gnu-gpl-v2 AND gnu-gpl-v3 AND gnu-lgpl-v2 AND gnu-lgpl-v3
19 20
20DISTFILES= ${DEFAULT_DISTFILES} 21DISTFILES= ${DEFAULT_DISTFILES}
21EXTRACT_ONLY= ${DEFAULT_DISTFILES} 22EXTRACT_ONLY= ${DEFAULT_DISTFILES}
22 23
23NOT_FOR_PLATFORM= Interix-*-* 24NOT_FOR_PLATFORM= Interix-*-*
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc7/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/distinfo 2017/05/03 00:21:03 1.1
+++ pkgsrc/lang/gcc7/distinfo 2017/05/04 17:38:23 1.2
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1$NetBSD: distinfo,v 1.1 2017/05/03 00:21:03 maya Exp $ 1$NetBSD: distinfo,v 1.2 2017/05/04 17:38:23 maya Exp $
2 2
3SHA1 (gcc-7.1.0.tar.bz2) = 9f1e907f27eadefe7d5f7567c09e17805d9c8837 3SHA1 (gcc-7.1.0.tar.bz2) = 9f1e907f27eadefe7d5f7567c09e17805d9c8837
4RMD160 (gcc-7.1.0.tar.bz2) = a228dc45a09eda91b1a201d234f9013b3009b461 4RMD160 (gcc-7.1.0.tar.bz2) = a228dc45a09eda91b1a201d234f9013b3009b461
5SHA512 (gcc-7.1.0.tar.bz2) = b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec 5SHA512 (gcc-7.1.0.tar.bz2) = b5d952be9a10f0e0926bb2868877d10544039d6d2f35ba0a08f51231dd622a007650764a03e173194701467547789ad7d2d9cbc10adcdf118d619cdedbd14aec
6Size (gcc-7.1.0.tar.bz2) = 84303533 bytes 6Size (gcc-7.1.0.tar.bz2) = 84303533 bytes
7SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f 7SHA1 (isl-0.16.1.tar.bz2) = c5a2b201bf05229647e73203c0bf2d9679d4d21f
8RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2 8RMD160 (isl-0.16.1.tar.bz2) = 5a99db3fe0d0a1f6bbac1ed4448f2403495c55b2
9SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b 9SHA512 (isl-0.16.1.tar.bz2) = c188667a84dc5bdddb4ab7c35f89c91bf15a8171f4fcaf41301cf285fb7328846d9a367c096012fec4cc69d244f0bc9e95d84c09ec097394cd4093076f2a041b
10Size (isl-0.16.1.tar.bz2) = 1626446 bytes 10Size (isl-0.16.1.tar.bz2) = 1626446 bytes
11SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca 11SHA1 (patch-contrib_download__prerequisites) = 86c6c16e0e3e3a0bcb38579a8b4004f603fac1ca
12SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651 12SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
13SHA1 (patch-gcc_config.gcc) = fea8288c22bb2c4dd44a5e77c8f92dee8f8f6b18 13SHA1 (patch-gcc_config.gcc) = fea8288c22bb2c4dd44a5e77c8f92dee8f8f6b18
14SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6 14SHA1 (patch-gcc_config_arm_arm.h) = 92c8bff1063e153fec4454e6dea5334a42b0dad6
15SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633 15SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
16SHA1 (patch-gcc_config_netbsd.c) = 85f786bce881ef2fc348f98ef81fdbc001076183 16SHA1 (patch-gcc_config_netbsd.c) = 85f786bce881ef2fc348f98ef81fdbc001076183
17SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695 17SHA1 (patch-gcc_config_netbsd.h) = 81891a83bb17b99fdb2c9381b8e8a1767391c695
18SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846 18SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
19SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3 19SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
20SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d 20SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
21SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b 21SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
22SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b 22SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b
23SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 23SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
24SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d 24SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d
25SHA1 (patch-libcilkrts_configure) = 0d88069173cba34158f5b6b91d2d12ca81b0300c 25SHA1 (patch-libcilkrts_configure) = 6c2d0f897c4a451d5b4b4fb5b3415d04704c0b0d
26SHA1 (patch-libcilkrts_runtime_os-unix.c) = b25632587d9fbe8ff38377fe34cb16225355b521 26SHA1 (patch-libcilkrts_runtime_os-unix.c) = b25632587d9fbe8ff38377fe34cb16225355b521
27SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762 27SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
28SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292 28SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
29SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f 29SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
 30SHA1 (patch-libgcc_config_i386_cpuinfo.h) = 2c55385a9440d4991eb265f24e98ba68eef266e1
30SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe 31SHA1 (patch-libgcc_crtstuff.c) = e3a3b02a26229992851f195b5701cb1b86c29efe
31SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394 32SHA1 (patch-libgfortran_configure) = 869a60fd08edecf18a42732dcbf226bad1309394
32SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3 33SHA1 (patch-libgo_Makefile.in) = 612987541f745c7be6835ce7fb7119884db294c3
33SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0 34SHA1 (patch-libsanitizer_configure.tgt) = 0aff54104734b2cb21090e33f9304738946ea5a0
34SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d 35SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__base.h) = 014d442c885b9c51d1a4af05205279c274a9559d
35SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e 36SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__configure__char.cc) = 06bba6da02344f76c26eed765a7cb022c035994e
36SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf 37SHA1 (patch-libstdc++-v3_config_os_bsd_netbsd_ctype__inline.h) = 626fc1f9c035ac5cef30a92d525af4e778835ebf
37SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1 38SHA1 (patch-libstdc++-v3_libsupc++_unwind-cxx.h) = 9784bfa4323f8498b36565d0fea28fce69ffdbb1
cvs diff -r1.1 -r1.2 pkgsrc/lang/gcc7/patches/patch-libcilkrts_configure (expand / switch to unified diff)

--- pkgsrc/lang/gcc7/patches/patch-libcilkrts_configure 2017/05/03 00:21:03 1.1
+++ pkgsrc/lang/gcc7/patches/patch-libcilkrts_configure 2017/05/04 17:38:23 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-libcilkrts_configure,v 1.1 2017/05/03 00:21:03 maya Exp $ 1$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/04 17:38:23 maya Exp $
2 2
3--- libcilkrts/configure.orig 2014-08-12 11:06:44.000000000 +0000 3--- libcilkrts/configure.orig 2014-08-12 11:06:44.000000000 +0000
4+++ libcilkrts/configure 4+++ libcilkrts/configure
5@@ -14519,7 +14519,7 @@ esac 5@@ -14519,7 +14519,7 @@ esac
6 CFLAGS="$save_CFLAGS" 6 CFLAGS="$save_CFLAGS"
7  7
8 if test $enable_shared = yes; then 8 if test $enable_shared = yes; then
9- link_cilkrts="-lcilkrts %{static: $LIBS}" 9- link_cilkrts="-lcilkrts %{static: $LIBS}"
10+ link_cilkrts="-rpath ${PREFIX}/gcc6snapshot/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}" 10+ link_cilkrts="-rpath ${PREFIX}/gcc7/lib --as-needed -lgcc_s -lcilkrts %{static $LIBS}"
11 else 11 else
12 link_cilkrts="-lcilkrts $LIBS" 12 link_cilkrts="-lcilkrts $LIBS"
13 fi 13 fi
File Added: pkgsrc/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
$NetBSD: patch-libgcc_config_i386_cpuinfo.h,v 1.1 2017/05/04 17:38:23 maya Exp $

Fix GCC bug #80600

--- 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
   FEATURE_AVX512VPOPCNTDQ
 };
 
-extern struct __processor_model
+struct __processor_model
 {
   unsigned int __cpu_vendor;
   unsigned int __cpu_type;