CVS commit: pkgsrc/lang

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Thu Apr  9 06:30:04 UTC 2026

Modified Files:
        pkgsrc/lang/gcc12: Makefile distinfo
        pkgsrc/lang/gcc12-libs: Makefile
Added Files:
        pkgsrc/lang/gcc12/patches: patch-gcc_config_rs6000_rs6000-logue.cc
            patch-gcc_config_rs6000_rs6000.cc patch-gcc_config_rs6000_sysv4.h
            patch-gcc_config_rs6000_t-netbsd

Log Message:
bring across netbsd/powerpc support from netbsd gcc12, bump versions.

this also includes bump version for genmatch.cc updates.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/gcc12/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/lang/gcc12/distinfo
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc12-libs/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000-logue.cc \
    pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000.cc \
    pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_sysv4.h \
    pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_t-netbsd

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc12/Makefile
diff -u pkgsrc/lang/gcc12/Makefile:1.13 pkgsrc/lang/gcc12/Makefile:1.14
--- pkgsrc/lang/gcc12/Makefile:1.13     Fri Feb 20 21:41:15 2026
+++ pkgsrc/lang/gcc12/Makefile  Thu Apr  9 06:30:03 2026
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2026/02/20 21:41:15 triaxx Exp $
+# $NetBSD: Makefile,v 1.14 2026/04/09 06:30:03 mrg Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC12_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc12-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       The GNU Compiler Collection (GCC) - 12.0 Release Series
 
 LANGS=                 c

Index: pkgsrc/lang/gcc12/distinfo
diff -u pkgsrc/lang/gcc12/distinfo:1.16 pkgsrc/lang/gcc12/distinfo:1.17
--- pkgsrc/lang/gcc12/distinfo:1.16     Thu Apr  9 06:22:51 2026
+++ pkgsrc/lang/gcc12/distinfo  Thu Apr  9 06:30:03 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2026/04/09 06:22:51 mrg Exp $
+$NetBSD: distinfo,v 1.17 2026/04/09 06:30:03 mrg Exp $
 
 BLAKE2s (gcc-12.5.0-1.diff) = 2e5b0c6e8cececdddf451c07f55a47e693410cb4c50aedb8534ec345810d05c6
 SHA512 (gcc-12.5.0-1.diff) = 6137995194e2c5b1bbedef6efd1083018ee03cadbb29c2e1a8bda7ef49a76b13c307749f5a1ee4284d399d200a5a46aa888feacc2bfaf743de25f16b00640c76
@@ -19,6 +19,10 @@ SHA1 (patch-gcc_config_arm_elf.h) = 5774
 SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab35903dae
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 367d83c808fd7b5b1989d0490b532ad06b425b31
 SHA1 (patch-gcc_config_nvptx_gen-opt.sh) = 67b8c84f198561c1d964a50946937a0a9cc26749
+SHA1 (patch-gcc_config_rs6000_rs6000-logue.cc) = 8852ee6656836836b882f673448873190c44466b
+SHA1 (patch-gcc_config_rs6000_rs6000.cc) = 9aa2e73720f380c45a59e9e3b4c2b4fd0c4d689e
+SHA1 (patch-gcc_config_rs6000_sysv4.h) = be389b7b2a784ca4cd8dd8b8cefb03ae158d368c
+SHA1 (patch-gcc_config_rs6000_t-netbsd) = 2deb4b1735c95903aa4f66447a87cb41155d82b7
 SHA1 (patch-gcc_configure) = f13d23c46315d18fdbc3bbbad26d0763e2b27690
 SHA1 (patch-gcc_genmatch.cc) = e902ba7ee27e61a632bd8a976c0b16168ef47b85
 SHA1 (patch-gcc_targhooks.cc) = 3bd54b7c3efc310aa2277f33cbd87b4a877cafea

Index: pkgsrc/lang/gcc12-libs/Makefile
diff -u pkgsrc/lang/gcc12-libs/Makefile:1.11 pkgsrc/lang/gcc12-libs/Makefile:1.12
--- pkgsrc/lang/gcc12-libs/Makefile:1.11        Fri Feb 20 21:42:16 2026
+++ pkgsrc/lang/gcc12-libs/Makefile     Thu Apr  9 06:30:04 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2026/02/20 21:42:16 triaxx Exp $
+# $NetBSD: Makefile,v 1.12 2026/04/09 06:30:04 mrg Exp $
 
 GCC_PKGNAME=   gcc12
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC12_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc12 package so that with the dependence pattern
 ## '{gcc12,gcc12-libs}>=12.1.*' pkg_add will choose gcc12-libs over gcc12.
-PKGREVISION=   2
+PKGREVISION=   3
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Added files:

Index: pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000-logue.cc
diff -u /dev/null pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000-logue.cc:1.1
--- /dev/null   Thu Apr  9 06:30:04 2026
+++ pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000-logue.cc   Thu Apr  9 06:30:04 2026
@@ -0,0 +1,22 @@
+--- gcc/config/rs6000/rs6000-logue.cc.orig     2024-06-20 01:08:06.000000000 -0700
++++ gcc/config/rs6000/rs6000-logue.cc  2024-12-17 15:44:35.079391555 -0800
+@@ -2277,7 +2277,8 @@
+     }
+   else if (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_ELFv2)
+     {
+-#if !defined (POWERPC_LINUX) && !defined (POWERPC_FREEBSD)
++#if !defined (POWERPC_LINUX) && !defined (POWERPC_FREEBSD) \
++    && !defined(POWERPC_NETBSD)
+       /* No out-of-line save/restore routines for GPRs on AIX.  */
+       gcc_assert (!TARGET_AIX || (sel & SAVRES_REG) != SAVRES_GPR);
+ #endif
+@@ -2289,7 +2290,8 @@
+                 : ((sel & SAVRES_LR) ? "_restgpr0_" : "_restgpr1_"));
+       else if ((sel & SAVRES_REG) == SAVRES_FPR)
+       {
+-#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD)
++#if defined (POWERPC_LINUX) || defined (POWERPC_FREEBSD) \
++    || defined(POWERPC_NETBSD)
+         if ((sel & SAVRES_LR))
+           prefix = ((sel & SAVRES_SAVE) ? "_savefpr_" : "_restfpr_");
+         else
Index: pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000.cc
diff -u /dev/null pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000.cc:1.1
--- /dev/null   Thu Apr  9 06:30:04 2026
+++ pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_rs6000.cc Thu Apr  9 06:30:04 2026
@@ -0,0 +1,24 @@
+--- gcc/config/rs6000/rs6000.cc.orig   2024-06-20 01:08:06.000000000 -0700
++++ gcc/config/rs6000/rs6000.cc        2024-12-17 15:46:35.810029314 -0800
+@@ -97,7 +97,8 @@
+      of the include files, so that POWERPC_LINUX and POWERPC_FREEBSD are
+      properly defined.  */
+ #ifndef TARGET_IEEEQUAD_DEFAULT
+-#if !defined (POWERPC_LINUX) && !defined (POWERPC_FREEBSD)
++#if !defined (POWERPC_LINUX) && !defined (POWERPC_FREEBSD) \
++    && !defined(POWERPC_NETBSD)
+ #define TARGET_IEEEQUAD_DEFAULT 1
+ #else
+ #define TARGET_IEEEQUAD_DEFAULT 0
+@@ -20747,7 +20748,11 @@
+   if (flag_pic)
+     return 3;
+   else if (DEFAULT_ABI == ABI_AIX || DEFAULT_ABI == ABI_ELFv2)
++#if defined (POWERPC_NETBSD)
++    return 3;
++#else
+     return 2;
++#endif
+   else
+     return 0;
+ }
Index: pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_sysv4.h
diff -u /dev/null pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_sysv4.h:1.1
--- /dev/null   Thu Apr  9 06:30:04 2026
+++ pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_sysv4.h   Thu Apr  9 06:30:04 2026
@@ -0,0 +1,27 @@
+--- gcc/config/rs6000/sysv4.h.orig     2024-06-20 01:08:06.000000000 -0700
++++ gcc/config/rs6000/sysv4.h  2024-12-17 15:48:26.037567286 -0800
+@@ -798,21 +798,14 @@
+ #define LIB_NETBSD_SPEC "\
+ -lc"
+ 
+-#define       STARTFILE_NETBSD_SPEC "\
+-ncrti.o%s crt0.o%s \
+-%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}"
++#define       STARTFILE_NETBSD_SPEC NETBSD_STARTFILE_SPEC
+ 
+-#define ENDFILE_NETBSD_SPEC "\
+-%{!shared:crtend.o%s} %{shared:crtendS.o%s} \
+-ncrtn.o%s"
++#define ENDFILE_NETBSD_SPEC NETBSD_ENDFILE_SPEC
+ 
+ #define LINK_START_NETBSD_SPEC "\
+ "
+ 
+-#define LINK_OS_NETBSD_SPEC "\
+-%{!shared: %{!static: \
+-  %{rdynamic:-export-dynamic} \
+-  -dynamic-linker /usr/libexec/ld.elf_so}}"
++#define LINK_OS_NETBSD_SPEC NETBSD_LINK_SPEC_ELF
+ 
+ #define CPP_OS_NETBSD_SPEC "\
+ -D__powerpc__ -D__NetBSD__ -D__KPRINTF_ATTRIBUTE__"
Index: pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_t-netbsd
diff -u /dev/null pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_t-netbsd:1.1
--- /dev/null   Thu Apr  9 06:30:04 2026
+++ pkgsrc/lang/gcc12/patches/patch-gcc_config_rs6000_t-netbsd  Thu Apr  9 06:30:04 2026
@@ -0,0 +1,10 @@
+--- gcc/config/rs6000/t-netbsd.orig    2024-06-20 01:08:06.000000000 -0700
++++ gcc/config/rs6000/t-netbsd 2024-12-17 15:48:58.969841508 -0800
+@@ -34,3 +34,7 @@
+ MULTILIB_EXCEPTIONS   =
+ 
+ MULTILIB_MATCHES      = ${MULTILIB_MATCHES_FLOAT}
++
++# It is important that crtbegin.o, etc., aren't surprised by stuff in .sdata.
++CRTSTUFF_T_CFLAGS += -msdata=none
++CRTSTUFF_T_CFLAGS_S += -msdata=none