CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Jul 18 22:35:44 UTC 2018

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

Log Message:
gcc6: 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.13 -r1.14 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc6/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/gcc6-libs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc6/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/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.13 pkgsrc/lang/gcc6/Makefile:1.14
--- pkgsrc/lang/gcc6/Makefile:1.13      Sun Jan 28 16:24:14 2018
+++ pkgsrc/lang/gcc6/Makefile   Wed Jul 18 22:35:44 2018
@@ -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_VERS
 ## 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

Index: pkgsrc/lang/gcc6/distinfo
diff -u pkgsrc/lang/gcc6/distinfo:1.10 pkgsrc/lang/gcc6/distinfo:1.11
--- pkgsrc/lang/gcc6/distinfo:1.10      Sat Feb  3 19:30:46 2018
+++ pkgsrc/lang/gcc6/distinfo   Wed Jul 18 22:35:44 2018
@@ -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) = 15fb7af267b
 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

Index: pkgsrc/lang/gcc6-libs/Makefile
diff -u pkgsrc/lang/gcc6-libs/Makefile:1.6 pkgsrc/lang/gcc6-libs/Makefile:1.7
--- pkgsrc/lang/gcc6-libs/Makefile:1.6  Sat Jul 14 17:28:19 2018
+++ pkgsrc/lang/gcc6-libs/Makefile      Wed Jul 18 22:35:44 2018
@@ -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
 ## 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

Added files:

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