CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Jul 18 22:55:08 UTC 2018

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

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


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/gcc7/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc7-libs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc7/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/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.18 pkgsrc/lang/gcc7/Makefile:1.19
--- pkgsrc/lang/gcc7/Makefile:1.18      Sun Jun 17 19:50:52 2018
+++ pkgsrc/lang/gcc7/Makefile   Wed Jul 18 22:55:07 2018
@@ -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_VERS
 ## 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

Index: pkgsrc/lang/gcc7/distinfo
diff -u pkgsrc/lang/gcc7/distinfo:1.10 pkgsrc/lang/gcc7/distinfo:1.11
--- pkgsrc/lang/gcc7/distinfo:1.10      Sun Jun 17 19:50:52 2018
+++ pkgsrc/lang/gcc7/distinfo   Wed Jul 18 22:55:07 2018
@@ -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) = a5d2dba6
 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

Index: pkgsrc/lang/gcc7-libs/Makefile
diff -u pkgsrc/lang/gcc7-libs/Makefile:1.2 pkgsrc/lang/gcc7-libs/Makefile:1.3
--- pkgsrc/lang/gcc7-libs/Makefile:1.2  Sun Jun 17 19:50:52 2018
+++ pkgsrc/lang/gcc7-libs/Makefile      Wed Jul 18 22:55:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/06/17 19:50:52 maya Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/18 22:55:08 maya Exp $
 
 GCC_PKGNAME=   gcc7
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC7_DIST
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc7 package so that with the dependence pattern
 ## '{gcc7,gcc7-libs}>=7.3.*' pkg_add will choose gcc7-libs over gcc7.
-PKGREVISION=   3
+PKGREVISION=   4
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Added files:

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