CVS commit: pkgsrc/lang/gcc12

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Dec 20 09:29:10 UTC 2024

Modified Files:
        pkgsrc/lang/gcc12: distinfo
        pkgsrc/lang/gcc12/patches: patch-libgcc_config.host
Removed Files:
        pkgsrc/lang/gcc12/patches: patch-libgcc_config_i386_t-darwin
            patch-libgcc_config_rs6000_t-darwin
            patch-libgcc_config_t-darwin-libgccs1
            patch-libgcc_config_t-darwin-min-11

Log Message:
gcc12: Revert previous.

This broke the build on Darwin/aarch64 due to the large patchset that we
apply for that platform.  As this is the chosen gfortran version for
pkgsrc on Darwin it also caused widespread breakage of all fortran
packages.

This can be resolved after the branch.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc12/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc12/patches/patch-libgcc_config.host
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/gcc12/patches/patch-libgcc_config_i386_t-darwin \
    pkgsrc/lang/gcc12/patches/patch-libgcc_config_rs6000_t-darwin \
    pkgsrc/lang/gcc12/patches/patch-libgcc_config_t-darwin-libgccs1 \
    pkgsrc/lang/gcc12/patches/patch-libgcc_config_t-darwin-min-11

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/distinfo
diff -u pkgsrc/lang/gcc12/distinfo:1.9 pkgsrc/lang/gcc12/distinfo:1.10
--- pkgsrc/lang/gcc12/distinfo:1.9      Sun Dec 15 03:05:12 2024
+++ pkgsrc/lang/gcc12/distinfo  Fri Dec 20 09:29:10 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2024/12/15 03:05:12 brook Exp $
+$NetBSD: distinfo,v 1.10 2024/12/20 09:29:10 jperkin Exp $
 
 BLAKE2s (gcc-12.4.0.diff) = ff17898717cb3781dd802a3376ce9a659df97d7d4a3ec3c4bd26279755ab752b
 SHA512 (gcc-12.4.0.diff) = 1e5df17525c13ff3b79117ffb426726c47a9bbb1ffb8555a75083eff5b2134c728decf765be24e4e0bb21685e60973211e359027e9b90f298e24b501cbc899aa
@@ -24,11 +24,7 @@ SHA1 (patch-gcc_targhooks.cc) = 3bd54b7c
 SHA1 (patch-isl_configure) = 5523c76d95b229b3cd25461b4c2b7af24bf2534e
 SHA1 (patch-libffi_configure) = 919bbe094e3ce547a0186eeaddb20a662595f79a
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
-SHA1 (patch-libgcc_config.host) = 9f7c7571408bb2112d77257dfaea3558c6ed9e06
-SHA1 (patch-libgcc_config_i386_t-darwin) = bf59366eec8a9210ccdf9e79ab770263961c92e5
-SHA1 (patch-libgcc_config_rs6000_t-darwin) = c428d1e58617f55fcf93e2672b4956ce79433834
-SHA1 (patch-libgcc_config_t-darwin-libgccs1) = 2924a8e5ca8baf72003ee8f832a7bb73eca26ba0
-SHA1 (patch-libgcc_config_t-darwin-min-11) = 4264fa3e974819daf6bb1641f066db3faea9224c
+SHA1 (patch-libgcc_config.host) = d40d4d08c807eeff98cc246d1ea756b5b2c749b0
 SHA1 (patch-libgcc_crtstuff.c) = a16d465039de00c195cf0694560140a9c38f3a25
 SHA1 (patch-libgfortran_io_io.h) = d44676239a7f45e42054d24bd5224f43c20055c0
 SHA1 (patch-libquadmath_printf_quadmath-printf.c) = 78e09f1e6d61ee57cee83275093cf46b2335d204

Index: pkgsrc/lang/gcc12/patches/patch-libgcc_config.host
diff -u pkgsrc/lang/gcc12/patches/patch-libgcc_config.host:1.2 pkgsrc/lang/gcc12/patches/patch-libgcc_config.host:1.3
--- pkgsrc/lang/gcc12/patches/patch-libgcc_config.host:1.2      Sun Dec 15 03:05:12 2024
+++ pkgsrc/lang/gcc12/patches/patch-libgcc_config.host  Fri Dec 20 09:29:10 2024
@@ -1,72 +1,11 @@
-$NetBSD: patch-libgcc_config.host,v 1.2 2024/12/15 03:05:12 brook Exp $
+$NetBSD: patch-libgcc_config.host,v 1.3 2024/12/20 09:29:10 jperkin Exp $
 
-Part 1: drop legacy library build for macOS >= 14 [PR116809].
-
-This is a mixture of two upstream patches.  See
-
-     https://github.com/gcc-mirror/gcc/blob/master/libgcc/config.host
-
-libgcc, Darwin: Drop the legacy library build for macOS >= 15 [PR116809].
-
-We have been building a legacy libgcc_s.1 DSO to support code that
-was built with older compilers.
-
-From macOS 15,  the unwinder no longer exports some of the symbols used
-in that library which (a) cuases bootstrap fail and (b) means that the
-legacy library is no longer useful.
-
-No open branch of GCC emits references to this library - and any already
--built code that depends on the symbols would need rework anyway.
-
-       PR target/116809
-
-libgcc, Darwin: Don't build legacy libgcc_s.1 on macOS 14 [PR116809]
-
-d9cafa0 stopped building libgcc_s.1 on macOS >= 15, in part because
-that is required to bootstrap the compiler using the macOS 15 SDK. The
-macOS 15 SDK ships in Xcode 16, which also runs on macOS 14. libgcc_s.1
-can no longer be built on macOS 14 using Xcode 16 by the same logic that
-the previous change disabled it for macOS 15.
-
-       PR target/116809
-
-Parts 2-3: This is needed for arm64 to get Out-of-line LSE atomics linked into libgcc.
+This is needed for arm64 to get Out-of-line LSE atomics linked into libgcc.
 libsupc++ fails to link without this, and for arm to build.
 
---- libgcc/config.host.orig    2024-06-20 08:08:09.000000000 +0000
-+++ libgcc/config.host
-@@ -243,19 +243,25 @@ case ${host} in
-   tmake_file="$tmake_file t-slibgcc-darwin"
-   # newer toolsets produce warnings when building for unsupported versions.
-   case ${host} in
--    *-*-darwin1[89]* | *-*-darwin2* )
--      tmake_file="t-darwin-min-8 $tmake_file"
-+    x86_64-*-darwin2[0-2]*)
-+      tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
-+      ;;
-+    *-*-darwin2*)
-+      tmake_file="t-darwin-min-11 $tmake_file"
-+      ;;
-+    *-*-darwin1[89]*)
-+      tmake_file="t-darwin-min-8 t-darwin-libgccs1 $tmake_file"
-       ;;
-     *-*-darwin9* | *-*-darwin1[0-7]*)
--      tmake_file="t-darwin-min-5 $tmake_file"
-+      tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
-       ;;
-     *-*-darwin[4-8]*)
--      tmake_file="t-darwin-min-1 $tmake_file"
-+      tmake_file="t-darwin-min-1 t-darwin-libgccs1 $tmake_file"
-       ;;
-     *)
-       # Fall back to configuring for the oldest system known to work with
-       # all archs and the current sources.
--      tmake_file="t-darwin-min-5 $tmake_file"
-+      tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
-       echo "Warning: libgcc configured to support macOS 10.5" 1>&2
-       ;;
-   esac
-@@ -412,6 +418,7 @@ aarch64*-*-freebsd*)
+--- libgcc/config.host.orig    2021-04-08 04:56:29.805761640 -0700
++++ libgcc/config.host 2022-02-02 04:08:51.653635705 -0800
+@@ -377,6 +377,7 @@
  aarch64*-*-netbsd*)
        extra_parts="$extra_parts crtfastmath.o"
        tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
@@ -74,7 +13,7 @@ libsupc++ fails to link without this, an
        tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
        md_unwind_header=aarch64/aarch64-unwind.h
        ;;
-@@ -499,7 +506,8 @@ arm*-*-netbsdelf*)
+@@ -463,7 +464,8 @@
        case ${host} in
          arm*-*-netbsdelf-*eabi*)
            tmake_file="${tmake_file} arm/t-netbsd-eabi"