diff options
| -rw-r--r-- | lang/gcc6-libs/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc6/Makefile | 4 | ||||
| -rw-r--r-- | lang/gcc6/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc6/patches/patch-gcc_targhooks.c | 17 |
4 files changed, 23 insertions, 5 deletions
diff --git a/lang/gcc6-libs/Makefile b/lang/gcc6-libs/Makefile index 493227da63e..a124250a7f8 100644 --- a/lang/gcc6-libs/Makefile +++ b/lang/gcc6-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/07/14 17:28:19 tsutsui Exp $ +# $NetBSD: Makefile,v 1.7 2018/07/18 22:35:44 maya Exp $ GCC_PKGNAME= gcc6 .include "../../lang/${GCC_PKGNAME}/version.mk" @@ -9,7 +9,7 @@ PKGNAME= ${GCC_PKGNAME}-libs-${GCC6_DIST_VERSION} ## The PKGREVISION of this package needs to be at least 1 more than the ## PKGREVISION of the lang/gcc6 package so that with the dependence pattern ## '{gcc6,gcc6-libs}>=6.1.*' pkg_add will choose gcc6-libs over gcc6. -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= lang MASTER_SITES= # empty diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile index e9054ae88ac..a594bd0a9d7 100644 --- a/lang/gcc6/Makefile +++ b/lang/gcc6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2018/01/28 16:24:14 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2018/07/18 22:35:44 maya Exp $ GCC_PKGNAME= gcc6 .include "version.mk" @@ -8,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC6_DIST_VERSION} ## When bumping the PKGREVISION of this package the PKGREVISION of ## lang/gcc6-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-${GCC6_DIST_VERSION}/} EXTRACT_SUFX= .tar.xz diff --git a/lang/gcc6/distinfo b/lang/gcc6/distinfo index 3285a590849..6463c3d8dec 100644 --- a/lang/gcc6/distinfo +++ b/lang/gcc6/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2018/02/03 19:30:46 adam Exp $ +$NetBSD: distinfo,v 1.11 2018/07/18 22:35:44 maya Exp $ SHA1 (gcc-6.4.0.tar.xz) = f237974b2d3af0f60936ce6a2f35b912a91e0239 RMD160 (gcc-6.4.0.tar.xz) = 63c16a8f5df0c2c2db3355ff1e984ad6b3653ab3 @@ -21,6 +21,7 @@ SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 +SHA1 (patch-gcc_targhooks.c) = f8ec71006cf35947e93fa229bc2f52f46cf5597b SHA1 (patch-libcilkrts_configure) = d8f3065bb9934c3278e5e7dc6f1c56cdf31de6b1 SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762 diff --git a/lang/gcc6/patches/patch-gcc_targhooks.c b/lang/gcc6/patches/patch-gcc_targhooks.c new file mode 100644 index 00000000000..0f75a1c1453 --- /dev/null +++ b/lang/gcc6/patches/patch-gcc_targhooks.c @@ -0,0 +1,17 @@ +$NetBSD: patch-gcc_targhooks.c,v 1.1 2018/07/18 22:35:44 maya Exp $ + +PR pkg/53436 +netbsd can't handle hidden reference to stack_chk_fail_local. +(note: this code is only happening if targeting i386) + +--- gcc/targhooks.c.orig 2017-06-22 07:22:13.000000000 +0000 ++++ gcc/targhooks.c +@@ -755,7 +755,7 @@ default_external_stack_protect_fail (voi + tree + default_hidden_stack_protect_fail (void) + { +-#ifndef HAVE_GAS_HIDDEN ++#if !defined(HAVE_GAS_HIDDEN) || defined(__NetBSD__) || defined(__sun) + return default_external_stack_protect_fail (); + #else + tree t = stack_chk_fail_decl; |