CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   mrg
Date:           Mon Aug  4 02:48:25 UTC 2025

Modified Files:
        pkgsrc/lang/gcc15: Makefile distinfo
        pkgsrc/lang/gcc15-libs: Makefile
Added Files:
        pkgsrc/lang/gcc15/patches: patch-gcc_config.gcc
            patch-gcc_config_i386_t-netbsd64

Log Message:
enable "gcc -m32" support on amd64.

this can probably be ported to many prior GCC versions.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc15/Makefile \
    pkgsrc/lang/gcc15/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/gcc15-libs/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/gcc15/patches/patch-gcc_config.gcc \
    pkgsrc/lang/gcc15/patches/patch-gcc_config_i386_t-netbsd64

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

Modified files:

Index: pkgsrc/lang/gcc15/Makefile
diff -u pkgsrc/lang/gcc15/Makefile:1.1 pkgsrc/lang/gcc15/Makefile:1.2
--- pkgsrc/lang/gcc15/Makefile:1.1      Mon Jul 14 17:44:53 2025
+++ pkgsrc/lang/gcc15/Makefile  Mon Aug  4 02:48:24 2025
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2025/07/14 17:44:53 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/08/04 02:48:24 mrg Exp $
 
 PKGNAME=       ${GCC_PKGNAME}-${GCC15_DIST_VERSION}
 ## When bumping the PKGREVISION of this package the PKGREVISION of
 ## lang/gcc15-libs needs to be bumped to be at least 1 more than the
 ## PKGREVISION of this package!
-#PKGREVISION=  1
+PKGREVISION=   1
 COMMENT=       The GNU Compiler Collection (GCC) - 15.0 Release Series
 
 LANGS=         c
Index: pkgsrc/lang/gcc15/distinfo
diff -u pkgsrc/lang/gcc15/distinfo:1.1 pkgsrc/lang/gcc15/distinfo:1.2
--- pkgsrc/lang/gcc15/distinfo:1.1      Mon Jul 14 17:44:53 2025
+++ pkgsrc/lang/gcc15/distinfo  Mon Aug  4 02:48:24 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2025/07/14 17:44:53 wiz Exp $
+$NetBSD: distinfo,v 1.2 2025/08/04 02:48:24 mrg Exp $
 
 BLAKE2s (gcc-15.1.0.tar.xz) = 260d64654fbfc0ee06540cc4604cd7071be53d616069a9dd57e5359a0b0ecf46
 SHA512 (gcc-15.1.0.tar.xz) = ddd35ca6c653dffa88f7c7ef9ee4cd806e156e0f3b30f4d63e75a8363361285cd566ee73127734cde6a934611de815bee3e32e24bfd2e0ab9f7ff35c929821c1
@@ -7,6 +7,7 @@ BLAKE2s (isl-0.24.tar.xz) = a3013b0d39b7
 SHA512 (isl-0.24.tar.xz) = ff6bdcff839e1cd473f2a0c1e4dd4a3612ec6fee4544ccbc62b530a7248db2cf93b4b99bf493a86ddf2aba00e768927265d5d411f92061ea85fd7929073428e8
 Size (isl-0.24.tar.xz) = 1930956 bytes
 SHA1 (patch-gcc_Makefile.in) = a31ddc27f1092cfdf5ac896ca79c8590b5aceb47
+SHA1 (patch-gcc_config.gcc) = 65126c56f0cd9027f66b5f677773dfa9973b451c
 SHA1 (patch-gcc_config.host) = bf95dd21bfdf79d173e745fbd35c9bb99fdf4087
 SHA1 (patch-gcc_config_aarch64_aarch64-netbsd.h) = abf19e2445bce1773162bddef16cd7f41eb36827
 SHA1 (patch-gcc_config_arm_arm.h) = 9d554349869d67d6393552c33a7824f0dd53cb11
@@ -14,6 +15,7 @@ SHA1 (patch-gcc_config_arm_bpabi.h) = 0b
 SHA1 (patch-gcc_config_arm_elf.h) = 57748157084319cb92d892f2ea5b2f3355567551
 SHA1 (patch-gcc_config_arm_netbsd-eabi.h) = 85eb89de6f2e64fac50251f06d7e4eab35903dae
 SHA1 (patch-gcc_config_arm_netbsd-elf.h) = 568f537d624199ef9f9f56088fe4fff7e946b2e2
+SHA1 (patch-gcc_config_i386_t-netbsd64) = 914b4d2fd65f5e46681aa2ea592d0bc75299f09a
 SHA1 (patch-isl_configure) = a6295c509bdc82e8b54d7dec5252994532463091
 SHA1 (patch-libffi_configure) = 919bbe094e3ce547a0186eeaddb20a662595f79a
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea

Index: pkgsrc/lang/gcc15-libs/Makefile
diff -u pkgsrc/lang/gcc15-libs/Makefile:1.1 pkgsrc/lang/gcc15-libs/Makefile:1.2
--- pkgsrc/lang/gcc15-libs/Makefile:1.1 Mon Jul 14 17:45:31 2025
+++ pkgsrc/lang/gcc15-libs/Makefile     Mon Aug  4 02:48:25 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2025/07/14 17:45:31 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2025/08/04 02:48:25 mrg Exp $
 
 GCC_PKGNAME=   gcc15
 .include       "../../lang/${GCC_PKGNAME}/version.mk"
@@ -9,7 +9,7 @@ PKGNAME=        ${GCC_PKGNAME}-libs-${GCC15_DIS
 ## The PKGREVISION of this package needs to be at least 1 more than the
 ## PKGREVISION of the lang/gcc15 package so that with the dependence pattern
 ## '{gcc15,gcc15-libs}>=15.1.*' pkg_add will choose gcc15-libs over gcc15.
-PKGREVISION=   1
+PKGREVISION=   2
 
 CATEGORIES=    lang
 MASTER_SITES=  # empty

Added files:

Index: pkgsrc/lang/gcc15/patches/patch-gcc_config.gcc
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-gcc_config.gcc:1.1
--- /dev/null   Mon Aug  4 02:48:25 2025
+++ pkgsrc/lang/gcc15/patches/patch-gcc_config.gcc      Mon Aug  4 02:48:24 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-gcc_config.gcc,v 1.1 2025/08/04 02:48:24 mrg Exp $
+
+Enable multilib support on amd64.
+
+--- gcc/config.gcc.orig        2025-04-25 01:18:00.000000000 -0700
++++ gcc/config.gcc     2025-08-03 17:22:06.592442114 -0700
+@@ -1992,6 +1992,7 @@
+       ;;
+ x86_64-*-netbsd*)
+       tm_file="${tm_file} i386/unix.h i386/att.h elfos.h ${nbsd_tm_file} i386/x86-64.h i386/netbsd64.h"
++      tmake_file="${tmake_file} i386/t-netbsd64"
+       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+       ;;
+ i[34567]86-*-openbsd*)
Index: pkgsrc/lang/gcc15/patches/patch-gcc_config_i386_t-netbsd64
diff -u /dev/null pkgsrc/lang/gcc15/patches/patch-gcc_config_i386_t-netbsd64:1.1
--- /dev/null   Mon Aug  4 02:48:25 2025
+++ pkgsrc/lang/gcc15/patches/patch-gcc_config_i386_t-netbsd64  Mon Aug  4 02:48:24 2025
@@ -0,0 +1,22 @@
+$NetBSD: patch-gcc_config_i386_t-netbsd64,v 1.1 2025/08/04 02:48:24 mrg Exp $
+
+Enable multilib support on amd64.
+
+--- /dev/null  2025-08-03 17:17:47.388033634 -0700
++++ gcc/config/i386/t-netbsd64 2025-08-03 17:20:16.285905032 -0700
+@@ -0,0 +1,15 @@
++# NetBSD has "non-native" libraries in /usr/lib/<arch>.
++# For NetBSD/amd64 we thus have /usr/lib and /usr/lib/i386.
++
++MULTILIB_OPTIONS = m64/m32
++MULTILIB_DIRNAMES = 64 32 
++MULTILIB_OSDIRNAMES = . ../lib/i386
++
++LIBGCC = stmp-multilib
++INSTALL_LIBGCC = install-multilib
++
++# The pushl in CTOR initialization interferes with frame pointer elimination.
++# crtend*.o cannot be compiled without -fno-asynchronous-unwind-tables,
++# because then __FRAME_END__ might not be the last thing in .eh_frame
++# section.
++CRTSTUFF_T_CFLAGS += -fno-omit-frame-pointer -fno-asynchronous-unwind-tables