CVS commit: pkgsrc/lang/gcc8

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Jul 18 22:56:23 UTC 2018

Modified Files:
        pkgsrc/lang/gcc8: Makefile distinfo
Added Files:
        pkgsrc/lang/gcc8/patches: patch-gcc_targhooks.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc8/Makefile pkgsrc/lang/gcc8/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc8/patches/patch-gcc_targhooks.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.1 pkgsrc/lang/gcc8/Makefile:1.2
--- pkgsrc/lang/gcc8/Makefile:1.1       Sat May  5 04:08:36 2018
+++ pkgsrc/lang/gcc8/Makefile   Wed Jul 18 22:56:22 2018
@@ -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 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC8_DIST_VERS
 ## 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
Index: pkgsrc/lang/gcc8/distinfo
diff -u pkgsrc/lang/gcc8/distinfo:1.1 pkgsrc/lang/gcc8/distinfo:1.2
--- pkgsrc/lang/gcc8/distinfo:1.1       Sat May  5 04:08:36 2018
+++ pkgsrc/lang/gcc8/distinfo   Wed Jul 18 22:56:22 2018
@@ -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_config_x-netbsd) = 6dc3d
 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

Added files:

Index: pkgsrc/lang/gcc8/patches/patch-gcc_targhooks.c
diff -u /dev/null pkgsrc/lang/gcc8/patches/patch-gcc_targhooks.c:1.1
--- /dev/null   Wed Jul 18 22:56:23 2018
+++ pkgsrc/lang/gcc8/patches/patch-gcc_targhooks.c      Wed Jul 18 22:56:22 2018
@@ -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;