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/gcc7/Makefile b/lang/gcc7/Makefile
index ab27a462952..c813cafbd94 100644
--- a/lang/gcc7/Makefile
+++ b/lang/gcc7/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.36 2020/10/23 00:45:48 gutteridge Exp $
+# $NetBSD: Makefile,v 1.37 2021/02/13 15:56:16 maya Exp $
 
 GCC_PKGNAME=		gcc7
 .include		"version.mk"
 
 DISTNAME=	gcc-${GCC7_DIST_VERSION}
 PKGNAME=	${GCC_PKGNAME}-${GCC7_DIST_VERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc7-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
diff --git a/lang/gcc7/distinfo b/lang/gcc7/distinfo
index 0536d5643a6..78142db6752 100644
--- a/lang/gcc7/distinfo
+++ b/lang/gcc7/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2020/04/09 12:02:14 rhialto Exp $
+$NetBSD: distinfo,v 1.19 2021/02/13 15:56:16 maya Exp $
 
 SHA1 (gcc-7.5.0.tar.xz) = 9153345fa05adfa58b4759ccb9f37d09662dd101
 RMD160 (gcc-7.5.0.tar.xz) = 91d46ec088badec75f41a2ad2a0ba228a6715107
@@ -13,7 +13,7 @@ SHA1 (patch-gcc_Makefile.in) = d96a57a098e49a2c5ea6478dd5d22aba584fc1bc
 SHA1 (patch-gcc_common_config_arm_arm-common.c) = 7c973cb9554a52f4b85f8fc98708f5e5cce8e8bd
 SHA1 (patch-gcc_config.gcc) = 20d1444cc2c031c8adc96289e1ccc6c1d29eb72f
 SHA1 (patch-gcc_config.host) = 1b1e11cd199eb93f49443d51c0063b09b7327858
-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) = ed7bc42813b33c87242f5ef0a304a621b873c9eb
 SHA1 (patch-gcc_config_aarch64_aarch64.h) = 5339d9c7ce9d040097c29cc3b7ec1d2fbfff811c
 SHA1 (patch-gcc_config_aarch64_t-aarch64-netbsd) = 0e7feb6f238b0a752ccc50e95e09b017cb368a90
@@ -27,6 +27,7 @@ SHA1 (patch-gcc_config_host-netbsd.c) = 765295f07edb8a68f1910e3a9b4dd2a7dcd491a5
 SHA1 (patch-gcc_config_netbsd-elf.h) = 5a9b5ef26c03bec3cd58e2f446224aa6e94a30d5
 SHA1 (patch-gcc_config_netbsd-protos.h) = 6d28864b4ccc8c1a63fe28e43601b84b63a00633
 SHA1 (patch-gcc_config_netbsd.h) = 662226f4491f94b641f78b1273a9047434d75aed
+SHA1 (patch-gcc_config_sparc_sparc.c) = 7d37f33744d620faa5a2154056ba80bede0d67f6
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
diff --git a/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c b/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c
index 76208c56fd5..60524547672 100644
--- a/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c
+++ b/lang/gcc7/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 04:24:00 mrg Exp $
+$NetBSD: patch-gcc_config_aarch64_aarch64-builtins.c,v 1.2 2021/02/13 15:56:16 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/gcc7/patches/patch-gcc_config_sparc_sparc.c b/lang/gcc7/patches/patch-gcc_config_sparc_sparc.c
new file mode 100644
index 00000000000..188e38e1384
--- /dev/null
+++ b/lang/gcc7/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:16 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	2021-02-13 10:19:18.404989362 +0000
++++ gcc/config/sparc/sparc.c
+@@ -10838,6 +10838,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.  */