CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Jul 18 23:15:42 UTC 2018

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

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

bump gcc48-libs PKGREVISION above gcc48

PR pkg/53436.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/lang/gcc48/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/lang/gcc48/distinfo
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/gcc48-libs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc48/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/gcc48/Makefile
diff -u pkgsrc/lang/gcc48/Makefile:1.40 pkgsrc/lang/gcc48/Makefile:1.41
--- pkgsrc/lang/gcc48/Makefile:1.40     Wed Jul 18 00:06:20 2018
+++ pkgsrc/lang/gcc48/Makefile  Wed Jul 18 23:15:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2018/07/18 00:06:20 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2018/07/18 23:15:42 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "version.mk"
@@ -8,7 +8,7 @@ PKGNAME=        ${GCC_PKGNAME}-${GCC48_DIST_VER
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc48-libs needs to be bump to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GNU:=gcc/gcc-${GCC48_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/lang/gcc48/distinfo
diff -u pkgsrc/lang/gcc48/distinfo:1.37 pkgsrc/lang/gcc48/distinfo:1.38
--- pkgsrc/lang/gcc48/distinfo:1.37     Wed Jun 27 10:07:07 2018
+++ pkgsrc/lang/gcc48/distinfo  Wed Jul 18 23:15:42 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2018/06/27 10:07:07 maya Exp $
+$NetBSD: distinfo,v 1.38 2018/07/18 23:15:42 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -60,6 +60,7 @@ SHA1 (patch-gcc_go_go-lang.c) = dbef7b86
 SHA1 (patch-gcc_java_lang.c) = 781c8f70241df0e5cfb1c69beb755bee14a6c54e
 SHA1 (patch-gcc_lto_lto.c) = cc7fdf396c238785141e0ffc8ca8f62a91640f58
 SHA1 (patch-gcc_system.h) = 4c959a6b1c4d524cbdf44cfb80f0e5758ec20783
+SHA1 (patch-gcc_targhooks.c) = f9a71960346aea8cc33c397630c32bc4d48ff427
 SHA1 (patch-gcc_testsuite_g++.dg_eh_unwind-direct.C) = fd85ccee102e9618a8010d2dcbb2d9916b28f1cc
 SHA1 (patch-gcc_testsuite_gcc.dg_format_format.h) = 5bb7af9f355dcd80bfaf4a206d86e4badd4d4b4d
 SHA1 (patch-include_libiberty.h) = ad2c64e9a14405c89b02ff68811b1c889405d0a1

Index: pkgsrc/lang/gcc48-libs/Makefile
diff -u pkgsrc/lang/gcc48-libs/Makefile:1.28 pkgsrc/lang/gcc48-libs/Makefile:1.29
--- pkgsrc/lang/gcc48-libs/Makefile:1.28        Fri Jul 28 23:40:48 2017
+++ pkgsrc/lang/gcc48-libs/Makefile     Wed Jul 18 23:15:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/07/28 23:40:48 maya Exp $
+# $NetBSD: Makefile,v 1.29 2018/07/18 23:15:42 maya Exp $
 
 GCC_PKGNAME=   gcc48
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,7 +8,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC48_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc48 package so that with the dependence pattern
 ## '{gcc48,gcc48-libs}>=4.8.*' pkg_all will choose gcc48-libs over gcc48.
-PKGREVISION=   5
+PKGREVISION=   7
 CATEGORIES=    lang
 MASTER_SITES=  # empty
 DISTFILES=     # empty

Added files:

Index: pkgsrc/lang/gcc48/patches/patch-gcc_targhooks.c
diff -u /dev/null pkgsrc/lang/gcc48/patches/patch-gcc_targhooks.c:1.1
--- /dev/null   Wed Jul 18 23:15:42 2018
+++ pkgsrc/lang/gcc48/patches/patch-gcc_targhooks.c     Wed Jul 18 23:15:42 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1 2018/07/18 23:15:42 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       2013-01-10 20:38:27.000000000 +0000
++++ gcc/targhooks.c
+@@ -692,7 +692,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;