pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/gcc8 gcc8: don't try to make references to stack_...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dee12e22e9aa
branches:  trunk
changeset: 382947:dee12e22e9aa
user:      maya <maya%pkgsrc.org@localhost>
date:      Wed Jul 18 22:56:22 2018 +0000

description:
gcc8: 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:

 lang/gcc8/Makefile                      |   4 ++--
 lang/gcc8/distinfo                      |   3 ++-
 lang/gcc8/patches/patch-gcc_targhooks.c |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 6fe9ae4fb861 -r dee12e22e9aa lang/gcc8/Makefile
--- a/lang/gcc8/Makefile        Wed Jul 18 22:55:07 2018 +0000
+++ b/lang/gcc8/Makefile        Wed Jul 18 22:56:22 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/05/05 04:08:36 maya Exp $
+# $NetBSD: Makefile,v 1.2 2018/07/18 22:56:22 maya Exp $
 
 GCC_PKGNAME=           gcc8
 .include               "version.mk"
@@ -8,7 +8,7 @@
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc8-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC8_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
diff -r 6fe9ae4fb861 -r dee12e22e9aa lang/gcc8/distinfo
--- a/lang/gcc8/distinfo        Wed Jul 18 22:55:07 2018 +0000
+++ b/lang/gcc8/distinfo        Wed Jul 18 22:56:22 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2018/05/05 04:08:36 maya Exp $
+$NetBSD: distinfo,v 1.2 2018/07/18 22:56:22 maya Exp $
 
 SHA1 (gcc-8.1.0.tar.xz) = b34031ba9ff3e248b2c62de0825e49a1e0e01998
 RMD160 (gcc-8.1.0.tar.xz) = de00e96f3d70b6a08215930a6884672e56975d05
@@ -18,6 +18,7 @@
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
 SHA1 (patch-gcc_ggc-common.c) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f
+SHA1 (patch-gcc_targhooks.c) = b28d8a9696d07bbfb00b7d8c55193ba99447ff1d
 SHA1 (patch-isl_configure) = 36b37778ee13c0b364fb24d5864d6a9e65b29b7d
 SHA1 (patch-libffi_configure) = bcfbfe8abddc378e2de4a39ad0669583b37e0292
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 6321dde308579448c27c2b6e1e30633699dd145f
diff -r 6fe9ae4fb861 -r dee12e22e9aa lang/gcc8/patches/patch-gcc_targhooks.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc8/patches/patch-gcc_targhooks.c   Wed Jul 18 22:56:22 2018 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1 2018/07/18 22:56:22 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       2018-01-13 18:00:59.000000000 +0000
++++ gcc/targhooks.c
+@@ -919,7 +919,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;



Home | Main Index | Thread Index | Old Index