lang/gcc{6,7,8,9,0}: call SUBTARGET_INIT_BUILTINS on sparc* too

While here point out that the aarch64 equivalent patch was sent upstream.
Bump PKGREVISION. fix gcc*-libs PKGREVISION accordingly.

Fixes PR pkg/55992: math/blas fails on NetBSD/sparc64
Fixes report by Connor McLaughlan on pkgsrc-users

4 files changed, 25 insertions, 5 deletions

diff --git a/lang/gcc8/Makefile b/lang/gcc8/Makefile
index b7fd25f6d92..61a739a9971 100644
--- a/lang/gcc8/Makefile
+++ b/lang/gcc8/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.24 2020/12/04 20:45:26 nia Exp $
+# $NetBSD: Makefile,v 1.25 2021/02/13 15:56:16 maya Exp $
 
 GCC_PKGNAME=		gcc8
-PKGREVISION=		3
 .include		"version.mk"
 
 DISTNAME=	gcc-${GCC8_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC8_DIST_VERSION}
+PKGREVISION=	4
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc8-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
diff --git a/lang/gcc8/distinfo b/lang/gcc8/distinfo
index d2457c54d0b..a4edf382dee 100644
--- a/lang/gcc8/distinfo
+++ b/lang/gcc8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2020/09/17 22:04:15 ryoon Exp $
+$NetBSD: distinfo,v 1.14 2021/02/13 15:56:16 maya Exp $
 
 SHA1 (gcc-8.4.0.tar.xz) = 00ddb177b04caffd40f7af0175d5b3c8e5442545
 RMD160 (gcc-8.4.0.tar.xz) = 4b3890e8865fae1d2b91166fb98e1097f5401d4a
@@ -13,13 +13,14 @@ SHA1 (patch-fixincludes_fixincl.x) = f4d3504db0480f8a3443a684e0132a521a06b026
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
 SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_config.gcc) = 4a971d1df7f05cfaefdf462d1b7c6dea1e838713
-SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = b10ef4b9ad39e605fc4e2a0c8dffdae677842e94
+SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 2ca1343216902252fab1fbc28b6bdfbf1b7f110b
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = bf45de53dfbf2cf5298cc8836996e19e2fd67274
 SHA1 (patch-gcc_config_aarch64_aarch64.h) = 64e7a12701f14fea94693908ab0581677d1b9606
 SHA1 (patch-gcc_config_aarch64_t-aarch64-netbsd) = 29de4fe018f7cecf740bc596d8205f8980de5bfa
 SHA1 (patch-gcc_config_arm_arm.h) = b668b6753e375e57bc4fbc3e5726f60f4808906e
 SHA1 (patch-gcc_config_netbsd-elf.h) = e392918cce01627d64d4153329775c7ad03b4a45
 SHA1 (patch-gcc_config_netbsd-protos.h) = 54641de17fa2c9459497f57fd7fc1e23372b284c
+SHA1 (patch-gcc_config_sparc_sparc.c) = 45e792fdef8de3d37577660c59fcbe0e05f9a494
 SHA1 (patch-gcc_config_t-netbsd) = 208a90f7127ad0a6a3573670b441af56716c1b1b
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 6a2d8eeeed2bf08c3c81291178e669dc91c913ce
diff --git a/lang/gcc8/patches/patch-gcc_config_aarch64_aarch64-builtins.c b/lang/gcc8/patches/patch-gcc_config_aarch64_aarch64-builtins.c
index 26d06383e5d..e3ff568be1c 100644
--- a/lang/gcc8/patches/patch-gcc_config_aarch64_aarch64-builtins.c
+++ b/lang/gcc8/patches/patch-gcc_config_aarch64_aarch64-builtins.c
@@ -1,6 +1,7 @@
-$NetBSD: patch-gcc_config_aarch64_aarch64-builtins.c,v 1.1 2018/11/10 11:45:27 mrg Exp $
+$NetBSD: patch-gcc_config_aarch64_aarch64-builtins.c,v 1.2 2021/02/13 15:56:17 maya Exp $
 
 initialise subtarget builtins so cabs*() are renamed.
+https://gcc.gnu.org/pipermail/gcc-patches/2021-February/565289.html
 
 --- gcc/config/aarch64/aarch64-builtins.c.orig	2017-01-20 21:03:41.000000000 +0000
 +++ gcc/config/aarch64/aarch64-builtins.c	2018-11-10 00:44:41.905576216 +0000
diff --git a/lang/gcc8/patches/patch-gcc_config_sparc_sparc.c b/lang/gcc8/patches/patch-gcc_config_sparc_sparc.c
new file mode 100644
index 00000000000..e10b9ac1267
--- /dev/null
+++ b/lang/gcc8/patches/patch-gcc_config_sparc_sparc.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-gcc_config_sparc_sparc.c,v 1.1 2021/02/13 15:56:17 maya Exp $
+
+Invoke subtarget-specific code for replacing builtin functions.
+Causes "cabsl" to be converted to _c99_cabsl on NetBSD.
+https://gcc.gnu.org/pipermail/gcc-patches/2021-February/565290.html
+
+--- gcc/config/sparc/sparc.c.orig	2020-03-04 08:30:00.000000000 +0000
++++ gcc/config/sparc/sparc.c
+@@ -10943,6 +10943,9 @@ sparc_init_builtins (void)
+ 
+   if (TARGET_VIS)
+     sparc_vis_init_builtins ();
++#ifdef SUBTARGET_INIT_BUILTINS
++  SUBTARGET_INIT_BUILTINS;
++#endif
+ }
+ 
+ /* Create builtin functions for FPU instructions.  */