Pullup ticket #5795 - requested by maya

lang/gcc48: i386 build fix
lang/gcc5: i386 build fix
lang/gcc6: i386 build fix
lang/gcc7: i386 build fix
lang/gcc8: i386 build fix

Revisions pulled up:
- lang/gcc48-libs/Makefile                                      1.29
- lang/gcc48/Makefile                                           1.41
- lang/gcc48/distinfo                                           1.38
- lang/gcc48/patches/patch-gcc_targhooks.c                      1.1
- lang/gcc5-libs/Makefile                                       1.13
- lang/gcc5/Makefile                                            1.29
- lang/gcc5/distinfo                                            1.19
- lang/gcc5/patches/patch-gcc_targhooks.c                       1.1
- lang/gcc6-libs/Makefile                                       1.7
- lang/gcc6/Makefile                                            1.14
- lang/gcc6/distinfo                                            1.11
- lang/gcc6/patches/patch-gcc_targhooks.c                       1.1
- lang/gcc7-libs/Makefile                                       1.3
- lang/gcc7/Makefile                                            1.19
- lang/gcc7/distinfo                                            1.11
- lang/gcc7/patches/patch-gcc_targhooks.c                       1.1
- lang/gcc8/Makefile                                            1.2
- lang/gcc8/distinfo                                            1.2
- lang/gcc8/patches/patch-gcc_targhooks.c                       1.1

---
   Module Name:    pkgsrc
   Committed By:   maya
   Date:           Wed Jul 18 22:42:57 UTC 2018

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

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

---
   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.

---
   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.

---
   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.

---
   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.

19 files changed, 113 insertions, 24 deletions

diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index 2f1e3d6b37f..4e245784532 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2017/07/28 23:40:48 maya Exp $
+# $NetBSD: Makefile,v 1.28.10.1 2018/07/20 12:06:08 bsiegert Exp $
 
 GCC_PKGNAME=	gcc48
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC48_DIST_VERSION}
 ## 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
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 86747911ea8..49523910c48 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2018/01/28 16:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.39.4.1 2018/07/20 12:06:08 bsiegert Exp $
 
 GCC_PKGNAME=	gcc48
 .include	"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC48_DIST_VERSION}
 ## 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
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index cba9d47249c..fca124ebced 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.37 2018/06/27 10:07:07 maya Exp $
+$NetBSD: distinfo,v 1.37.2.1 2018/07/20 12:06:08 bsiegert Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -60,6 +60,7 @@ SHA1 (patch-gcc_go_go-lang.c) = dbef7b86ccbf657356412a2420d98725d53eb356
 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
diff --git a/lang/gcc48/patches/patch-gcc_targhooks.c b/lang/gcc48/patches/patch-gcc_targhooks.c
new file mode 100644
index 00000000000..74993f1ff74
--- /dev/null
+++ b/lang/gcc48/patches/patch-gcc_targhooks.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1.2.2 2018/07/20 12:06:08 bsiegert 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;
diff --git a/lang/gcc5-libs/Makefile b/lang/gcc5-libs/Makefile
index a715efa6da3..147534da75e 100644
--- a/lang/gcc5-libs/Makefile
+++ b/lang/gcc5-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2017/10/20 23:50:19 maya Exp $
+# $NetBSD: Makefile,v 1.12.6.1 2018/07/20 12:06:08 bsiegert Exp $
 
 GCC_PKGNAME=	gcc5
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC5_DIST_VERSION}
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc5 package so that with the dependence pattern
 ## '{gcc5,gcc5-libs}>=5.1.*' pkg_add will choose gcc5-libs over gcc5.
-PKGREVISION=	1
+PKGREVISION=	2
 
 CATEGORIES=	lang
 MASTER_SITES=	# empty
diff --git a/lang/gcc5/Makefile b/lang/gcc5/Makefile
index 208b6e02942..b235c47e84c 100644
--- a/lang/gcc5/Makefile
+++ b/lang/gcc5/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2018/01/28 16:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.27.4.1 2018/07/20 12:06:08 bsiegert Exp $
 
 GCC_PKGNAME=		gcc5
-PKGREVISION=		1
+PKGREVISION=		2
 .include		"version.mk"
 
 DISTNAME=	gcc-${GCC5_DIST_VERSION}
diff --git a/lang/gcc5/distinfo b/lang/gcc5/distinfo
index 019ae090914..4ba43996e21 100644
--- a/lang/gcc5/distinfo
+++ b/lang/gcc5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2017/10/20 23:49:47 maya Exp $
+$NetBSD: distinfo,v 1.18.6.1 2018/07/20 12:06:08 bsiegert Exp $
 
 SHA1 (gcc-5.5.0.tar.xz) = 0d985aaf6d63598916933a690cb902d47d385bea
 RMD160 (gcc-5.5.0.tar.xz) = 63fdc006c2289f81df664d1fd9b4124f71732e7b
@@ -25,6 +25,7 @@ SHA1 (patch-gcc_configure) = d6cc6a0bd257829ca2fd077a852fc447acaa63a0
 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) = b4389cc6e2490e8ee3d4dd60d84e32dee8473648
 SHA1 (patch-libcilkrts_configure) = d52de4f104bd4c7c9f200d7ce45d782cccfe73bf
 SHA1 (patch-libcilkrts_runtime_os-unix.c) = 653c5e3486d09bddae6a384edc2a3b3f2c95f74b
 SHA1 (patch-libdecnumber_decNumber.c) = cec90e49c829bfc6ba1ec605d2fac7daaad62762
diff --git a/lang/gcc5/patches/patch-gcc_targhooks.c b/lang/gcc5/patches/patch-gcc_targhooks.c
new file mode 100644
index 00000000000..cd0de3365ef
--- /dev/null
+++ b/lang/gcc5/patches/patch-gcc_targhooks.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1.2.2 2018/07/20 12:06:09 bsiegert 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	2016-03-03 13:52:57.000000000 +0000
++++ gcc/targhooks.c
+@@ -772,7 +772,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;
diff --git a/lang/gcc6-libs/Makefile b/lang/gcc6-libs/Makefile
index 927cbe06c65..f47d42d7388 100644
--- a/lang/gcc6-libs/Makefile
+++ b/lang/gcc6-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2017/07/08 21:03:55 maya Exp $
+# $NetBSD: Makefile,v 1.5.10.1 2018/07/20 12:06:09 bsiegert Exp $
 
 GCC_PKGNAME=	gcc6
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC6_DIST_VERSION}
 ## 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=	2
+PKGREVISION=	4
 
 CATEGORIES=	lang
 MASTER_SITES=	# empty
diff --git a/lang/gcc6/Makefile b/lang/gcc6/Makefile
index e9054ae88ac..7365fe9a4ae 100644
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2018/01/28 16:24:14 wiz Exp $
+# $NetBSD: Makefile,v 1.13.4.1 2018/07/20 12:06:09 bsiegert Exp $
 
 GCC_PKGNAME=		gcc6
 .include		"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC6_DIST_VERSION}
 ## 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
diff --git a/lang/gcc6/distinfo b/lang/gcc6/distinfo
index 3285a590849..c79665484a4 100644
--- a/lang/gcc6/distinfo
+++ b/lang/gcc6/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/02/03 19:30:46 adam Exp $
+$NetBSD: distinfo,v 1.10.4.1 2018/07/20 12:06:09 bsiegert 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) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
 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
diff --git a/lang/gcc6/patches/patch-gcc_targhooks.c b/lang/gcc6/patches/patch-gcc_targhooks.c
new file mode 100644
index 00000000000..59fe27a94aa
--- /dev/null
+++ b/lang/gcc6/patches/patch-gcc_targhooks.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1.2.2 2018/07/20 12:06:09 bsiegert 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;
diff --git a/lang/gcc7-libs/Makefile b/lang/gcc7-libs/Makefile
index a6c0ab69bc8..c94c34237f5 100644
--- a/lang/gcc7-libs/Makefile
+++ b/lang/gcc7-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/06/17 19:50:52 maya Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2018/07/20 12:06:09 bsiegert Exp $
 
 GCC_PKGNAME=	gcc7
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=	${GCC_PKGNAME}-libs-${GCC7_DIST_VERSION}
 ## 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
diff --git a/lang/gcc7/Makefile b/lang/gcc7/Makefile
index d8fbd36a8d1..3adced0d15a 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2018/06/17 19:50:52 maya Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2018/07/20 12:06:09 bsiegert Exp $
 
 GCC_PKGNAME=		gcc7
-PKGREVISION=		2
 .include		"version.mk"
 
 DISTNAME=	gcc-${GCC7_DIST_VERSION}
@@ -9,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC7_DIST_VERSION}
 ## 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
diff --git a/lang/gcc7/distinfo b/lang/gcc7/distinfo
index 8860dd8876e..1f7e2ebb64d 100644
--- a/lang/gcc7/distinfo
+++ b/lang/gcc7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2018/06/17 19:50:52 maya Exp $
+$NetBSD: distinfo,v 1.10.2.1 2018/07/20 12:06:09 bsiegert 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) = a5d2dba635859f5d680c3f80d7c30b42461c752b
 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
diff --git a/lang/gcc7/patches/patch-gcc_targhooks.c b/lang/gcc7/patches/patch-gcc_targhooks.c
new file mode 100644
index 00000000000..6b518bd5782
--- /dev/null
+++ b/lang/gcc7/patches/patch-gcc_targhooks.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1.2.2 2018/07/20 12:06:09 bsiegert 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;
diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile
index f22b1207de2..ce21aa36d8b 100644
--- a/lang/gcc8/Makefile
+++ b/lang/gcc8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/05/05 04:08:36 maya Exp $
+# $NetBSD: Makefile,v 1.1.2.1 2018/07/20 12:06:09 bsiegert Exp $
 
 GCC_PKGNAME=		gcc8
 .include		"version.mk"
@@ -8,7 +8,7 @@ PKGNAME=	${GCC_PKGNAME}-${GCC8_DIST_VERSION}
 ## 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 --git a/lang/gcc8/distinfo b/lang/gcc8/distinfo
index 46f7c6d4a00..4bfc5c8602d 100644
--- a/lang/gcc8/distinfo
+++ b/lang/gcc8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2018/05/05 04:08:36 maya Exp $
+$NetBSD: distinfo,v 1.1.2.1 2018/07/20 12:06:09 bsiegert 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) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 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 --git a/lang/gcc8/patches/patch-gcc_targhooks.c b/lang/gcc8/patches/patch-gcc_targhooks.c
new file mode 100644
index 00000000000..d5d7f50ee6a
--- /dev/null
+++ b/lang/gcc8/patches/patch-gcc_targhooks.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-gcc_targhooks.c,v 1.1.2.2 2018/07/20 12:06:09 bsiegert 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;