pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang lang/gcc{6,7,8,9,0}: call SUBTARGET_INIT_BUILTINS...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/eaf0359c3fd2
branches:  trunk
changeset: 446825:eaf0359c3fd2
user:      maya <maya%pkgsrc.org@localhost>
date:      Sat Feb 13 15:56:16 2021 +0000

description:
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

diffstat:

 lang/gcc10-libs/Makefile                                       |   4 +-
 lang/gcc10/Makefile                                            |   4 +-
 lang/gcc10/distinfo                                            |   5 +-
 lang/gcc10/patches/patch-gcc_config_aarch64_aarch64-builtins.c |   3 +-
 lang/gcc10/patches/patch-gcc_config_sparc_sparc.c              |  18 ++++++++++
 lang/gcc6-libs/Makefile                                        |   4 +-
 lang/gcc6/Makefile                                             |   4 +-
 lang/gcc6/distinfo                                             |   3 +-
 lang/gcc6/patches/patch-gcc_config_sparc_sparc.c               |  18 ++++++++++
 lang/gcc7-libs/Makefile                                        |   4 +-
 lang/gcc7/Makefile                                             |   4 +-
 lang/gcc7/distinfo                                             |   5 +-
 lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c  |   3 +-
 lang/gcc7/patches/patch-gcc_config_sparc_sparc.c               |  18 ++++++++++
 lang/gcc8-libs/Makefile                                        |   4 +-
 lang/gcc8/Makefile                                             |   4 +-
 lang/gcc8/distinfo                                             |   5 +-
 lang/gcc8/patches/patch-gcc_config_aarch64_aarch64-builtins.c  |   3 +-
 lang/gcc8/patches/patch-gcc_config_sparc_sparc.c               |  18 ++++++++++
 lang/gcc9-libs/Makefile                                        |   4 +-
 lang/gcc9/Makefile                                             |   4 +-
 lang/gcc9/distinfo                                             |   3 +-
 lang/gcc9/patches/patch-gcc_config_sparc_sparc.c               |  18 ++++++++++
 23 files changed, 129 insertions(+), 31 deletions(-)

diffs (truncated from 422 to 300 lines):

diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc10-libs/Makefile
--- a/lang/gcc10-libs/Makefile  Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc10-libs/Makefile  Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/09/02 16:14:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2021/02/13 15:56:18 maya Exp $
 
 GCC_PKGNAME=   gcc10
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc10 package so that with the dependence pattern
 ## '{gcc10,gcc10-libs}>=8.2.*' pkg_add will choose gcc10-libs over gcc10.
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc10/Makefile
--- a/lang/gcc10/Makefile       Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc10/Makefile       Sat Feb 13 15:56:16 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2021/02/05 18:32:11 maya Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/13 15:56:17 maya Exp $
 
 GCC_PKGNAME=           gcc10
-PKGREVISION=           1
+PKGREVISION=           2
 .include               "version.mk"
 
 DISTNAME=      gcc-${GCC10_DIST_VERSION}
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc10/distinfo
--- a/lang/gcc10/distinfo       Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc10/distinfo       Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2020/10/20 18:37:36 tnn Exp $
+$NetBSD: distinfo,v 1.6 2021/02/13 15:56:17 maya Exp $
 
 SHA1 (gcc-10.2.0.tar.xz) = 8de0aecd3a52bb92b43082df8a9256356d1f03be
 RMD160 (gcc-10.2.0.tar.xz) = 73f182e7d40e5c2988b2b8cd80cfca601f20e9fc
@@ -12,7 +12,8 @@
 SHA1 (patch-fixincludes_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a
 SHA1 (patch-gcc_Makefile.in) = c0f97c75ba1d37eae894141edd58bb36b734f651
 SHA1 (patch-gcc_config.host) = 8920ce841f6088b365c9b590e3ea9535bd880b40
-SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = f4d8ab855d0755dfe533053cedde6940cb837ce0
+SHA1 (patch-gcc_config_aarch64_aarch64-builtins.c) = 87185f5c2e2dbe4195cb19fe6213d2d616d5519b
+SHA1 (patch-gcc_config_sparc_sparc.c) = e9cb956f3769642bcd0ba4a477d16c73dea46014
 SHA1 (patch-gcc_configure) = 6a2d8eeeed2bf08c3c81291178e669dc91c913ce
 SHA1 (patch-gcc_ggc-common.c) = 3e325767922ab7d2079fdb9a3d6b6aa531a2fea5
 SHA1 (patch-gcc_lto_lto.c) = 7bd85ac8ade76a28c394f6fbe5d495f91824f79f
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc10/patches/patch-gcc_config_aarch64_aarch64-builtins.c
--- a/lang/gcc10/patches/patch-gcc_config_aarch64_aarch64-builtins.c    Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc10/patches/patch-gcc_config_aarch64_aarch64-builtins.c    Sat Feb 13 15:56:16 2021 +0000
@@ -1,6 +1,7 @@
-$NetBSD: patch-gcc_config_aarch64_aarch64-builtins.c,v 1.1 2020/05/10 15:02:44 maya 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 -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc10/patches/patch-gcc_config_sparc_sparc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc10/patches/patch-gcc_config_sparc_sparc.c Sat Feb 13 15:56:16 2021 +0000
@@ -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-07-23 06:35:17.480386051 +0000
++++ gcc/config/sparc/sparc.c
+@@ -10993,6 +10993,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.  */
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc6-libs/Makefile
--- a/lang/gcc6-libs/Makefile   Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc6-libs/Makefile   Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2021/02/12 00:34:22 gutteridge Exp $
+# $NetBSD: Makefile,v 1.15 2021/02/13 15:56:16 maya Exp $
 
 GCC_PKGNAME=   gcc6
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## 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=   6
+PKGREVISION=   7
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc6/Makefile
--- a/lang/gcc6/Makefile        Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc6/Makefile        Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2020/12/04 20:45:26 nia Exp $
+# $NetBSD: Makefile,v 1.30 2021/02/13 15:56:16 maya Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -8,7 +8,7 @@
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc6-libs needs to be bumped 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-${GCC6_DIST_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc6/distinfo
--- a/lang/gcc6/distinfo        Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc6/distinfo        Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2020/03/02 23:33:04 khorben Exp $
+$NetBSD: distinfo,v 1.19 2021/02/13 15:56:16 maya Exp $
 
 SHA1 (ecj-4.5.jar) = 58c1d79c64c8cd718550f32a932ccfde8d1e6449
 RMD160 (ecj-4.5.jar) = d3f4da657f086b6423f74e93f001132f4855368a
@@ -21,6 +21,7 @@
 SHA1 (patch-gcc_config_netbsd-stdint.h) = 025fc883101a187e84ed4c0772406720d645d550
 SHA1 (patch-gcc_config_netbsd.c) = 3c09521e1803633a3643cf396a03f1f433ec869b
 SHA1 (patch-gcc_config_netbsd.h) = 7586993f89f43de33bd0aac674e3e48c86dfe56d
+SHA1 (patch-gcc_config_sparc_sparc.c) = a8c668597d70f6af52860e97a4f900b1126fae08
 SHA1 (patch-gcc_config_t-netbsd) = 802ad5706aa7ca9629f8e237f08fbb1569d28846
 SHA1 (patch-gcc_config_x-netbsd) = 6dc3d78e26df62054ea29f98ca51592858e671e3
 SHA1 (patch-gcc_configure) = 15fb7af267b79965f83bc64ce8aad1279b0ea52d
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc6/patches/patch-gcc_config_sparc_sparc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc6/patches/patch-gcc_config_sparc_sparc.c  Sat Feb 13 15:56:16 2021 +0000
@@ -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      2018-04-06 22:33:55.000000000 +0000
++++ gcc/config/sparc/sparc.c
+@@ -10208,6 +10208,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.  */
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc7-libs/Makefile
--- a/lang/gcc7-libs/Makefile   Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc7-libs/Makefile   Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2020/10/23 00:39:37 gutteridge Exp $
+# $NetBSD: Makefile,v 1.12 2021/02/13 15:56:16 maya Exp $
 
 GCC_PKGNAME=   gcc7
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## 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.5.*' pkg_add will choose gcc7-libs over gcc7.
-PKGREVISION=   4
+PKGREVISION=   5
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc7/Makefile
--- a/lang/gcc7/Makefile        Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc7/Makefile        Sat Feb 13 15:56:16 2021 +0000
@@ -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 -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc7/distinfo
--- a/lang/gcc7/distinfo        Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc7/distinfo        Sat Feb 13 15:56:16 2021 +0000
@@ -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_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_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 -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c
--- a/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c     Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc7/patches/patch-gcc_config_aarch64_aarch64-builtins.c     Sat Feb 13 15:56:16 2021 +0000
@@ -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 -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc7/patches/patch-gcc_config_sparc_sparc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/gcc7/patches/patch-gcc_config_sparc_sparc.c  Sat Feb 13 15:56:16 2021 +0000
@@ -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.  */
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc8-libs/Makefile
--- a/lang/gcc8-libs/Makefile   Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc8-libs/Makefile   Sat Feb 13 15:56:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/02/12 00:34:23 gutteridge Exp $
+# $NetBSD: Makefile,v 1.12 2021/02/13 15:56:17 maya Exp $
 
 GCC_PKGNAME=   gcc8
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc8 package so that with the dependence pattern
 ## '{gcc8,gcc8-libs}>=8.2.*' pkg_add will choose gcc8-libs over gcc8.
-PKGREVISION=   4
+PKGREVISION=   5
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty
diff -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc8/Makefile
--- a/lang/gcc8/Makefile        Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc8/Makefile        Sat Feb 13 15:56:16 2021 +0000
@@ -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 -r 8102abb0a1cc -r eaf0359c3fd2 lang/gcc8/distinfo
--- a/lang/gcc8/distinfo        Sat Feb 13 15:30:23 2021 +0000
+++ b/lang/gcc8/distinfo        Sat Feb 13 15:56:16 2021 +0000
@@ -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_inclhack.def) = 7b00974d3f52a8364190a607f52a5d7e8a6db41a



Home | Main Index | Thread Index | Old Index