diff options
| author | maya <maya@pkgsrc.org> | 2018-07-18 22:55:07 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-07-18 22:55:07 +0000 |
| commit | 1b125ef34e01a865735c7e44091ac99c56130444 (patch) | |
| tree | d9e7e17d3297caf84f190e55b5f984beff3a099c /lang/gcc7 | |
| parent | 422f3ef4d860e5dd3aaaf046adf83c87e0aa8c4b (diff) | |
| download | pkgsrc-1b125ef34e01a865735c7e44091ac99c56130444.tar.gz | |
gcc7: don't try to make references to stack_chk_fail_local on netbsd/sun
sun was added as joyent is patching for the same.
this code is only reached if compiling for i386 (or some variation of ppc)
netbsd's stack_chk_fail_local won't work for this.
PR pkg/53436.
Diffstat (limited to 'lang/gcc7')
| -rw-r--r-- | lang/gcc7/Makefile | 5 | ||||
| -rw-r--r-- | lang/gcc7/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc7/patches/patch-gcc_targhooks.c | 17 |
3 files changed, 21 insertions, 4 deletions
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile index d8fbd36a8d1..67b7390e636 100644 --- a/lang/gcc7/Makefile +++ b/lang/gcc7/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.18 2018/06/17 19:50:52 maya Exp $ +# $NetBSD: Makefile,v 1.19 2018/07/18 22:55:07 maya Exp $ GCC_PKGNAME= gcc7 -PKGREVISION= 2 .include "version.mk" DISTNAME= gcc-${GCC7_DIST_VERSION} @@ -9,7 +8,7 @@ PKGNAME= ${GCC_PKGNAME}-${GCC7_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= 1 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-${GCC7_DIST_VERSION}/} EXTRACT_SUFX= .tar.xz diff --git a/lang/gcc7/distinfo b/lang/gcc7/distinfo index 8860dd8876e..402665cf671 100644 --- a/lang/gcc7/distinfo +++ b/lang/gcc7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2018/06/17 19:50:52 maya Exp $ +$NetBSD: distinfo,v 1.11 2018/07/18 22:55:07 maya Exp $ SHA1 (gcc-7.3.0.tar.xz) = 9689b9cae7b2886fdaa08449a26701f095c04e48 RMD160 (gcc-7.3.0.tar.xz) = 31f6934a0e0c0ca84b6668110f9afdb91c1f9023 @@ -27,6 +27,7 @@ SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b SHA1 (patch-gcc_ginclude_stddef.h) = 583b7931aad14058be75569b0138efad8ac74113 SHA1 (patch-gcc_lto_lto.c) = 825b632e2a7ff5777d4fbfdcf6f0ea3f64c4742b SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783 +SHA1 (patch-gcc_targhooks.c) = 6268d548058b6325ead1115f78c2c17c6d786296 SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d SHA1 (patch-libcilkrts_configure) = ec76313d8103e0c525ebd26e9013ee3ca9e93391 SHA1 (patch-libcilkrts_runtime_os-unix.c) = b25632587d9fbe8ff38377fe34cb16225355b521 diff --git a/lang/gcc7/patches/patch-gcc_targhooks.c b/lang/gcc7/patches/patch-gcc_targhooks.c new file mode 100644 index 00000000000..d896cf6d2ae --- /dev/null +++ b/lang/gcc7/patches/patch-gcc_targhooks.c @@ -0,0 +1,17 @@ +$NetBSD: patch-gcc_targhooks.c,v 1.1 2018/07/18 22:55:08 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-02-07 11:29:06.644837000 +0000 ++++ gcc/targhooks.c +@@ -845,7 +845,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; |