summaryrefslogtreecommitdiff
path: root/lang/gcc7/patches
diff options
context:
space:
mode:
authormaya <maya@pkgsrc.org>2017-05-04 17:38:23 +0000
committermaya <maya@pkgsrc.org>2017-05-04 17:38:23 +0000
commitbc7f1924665263840528fa049eb71bb250665c87 (patch)
tree1f8e45b1083272ff059173f1a8bee53560717fd1 /lang/gcc7/patches
parent44d0dcff604f1ef2d33b260df3a195a9404acc20 (diff)
downloadpkgsrc-bc7f1924665263840528fa049eb71bb250665c87.tar.gz
gcc7: unbreak non-linux after GCC r243219.
GCC target/80600. Thanks joerg. Fix wip package reference, thanks Kai-Uwe Eckhardt. Bump PKGREVISION
Diffstat (limited to 'lang/gcc7/patches')
-rw-r--r--lang/gcc7/patches/patch-libcilkrts_configure4
-rw-r--r--lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h15
2 files changed, 17 insertions, 2 deletions
diff --git a/lang/gcc7/patches/patch-libcilkrts_configure b/lang/gcc7/patches/patch-libcilkrts_configure
index a2ec713742e..a48fcaa3b60 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.1 2017/05/03 00:21:03 maya Exp $
+$NetBSD: patch-libcilkrts_configure,v 1.2 2017/05/04 17:38:23 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.1 2017/05/03 00:21:03 maya Exp $
if test $enable_shared = yes; then
- link_cilkrts="-lcilkrts %{static: $LIBS}"
-+ link_cilkrts="-rpath ${PREFIX}/gcc6snapshot/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
new file mode 100644
index 00000000000..ca52db184a2
--- /dev/null
+++ b/lang/gcc7/patches/patch-libgcc_config_i386_cpuinfo.h
@@ -0,0 +1,15 @@
+$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;