gcc13: Move conflictin patch file aside

[Jason W. Bacon (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason W. Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Thu Feb 6 11:58:39 2025 -0600
Changeset:	339051da1b8e0b03e36160b45903eaa46a661df1

Modified Files:
	gcc13/distinfo
Added Files:
	gcc13/Conflicting-patches/patch-libgcc_config.host
Removed Files:
	gcc13/patches/patch-libgcc_config.host

Log Message:
gcc13: Move conflictin patch file aside

Passes patch and configure now, but fails build on macOS 15 aarch64

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=339051da1b8e0b03e36160b45903eaa46a661df1

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

diffstat:
 gcc13/Conflicting-patches/patch-libgcc_config.host | 86 ++++++++++++++++++++++
 gcc13/distinfo                                     |  1 -
 gcc13/patches/patch-libgcc_config.host             | 86 ----------------------
 3 files changed, 86 insertions(+), 87 deletions(-)

diffs:
diff --git a/gcc13/Conflicting-patches/patch-libgcc_config.host b/gcc13/Conflicting-patches/patch-libgcc_config.host
new file mode 100644
index 0000000000..79a41cb3eb
--- /dev/null
+++ b/gcc13/Conflicting-patches/patch-libgcc_config.host
@@ -0,0 +1,86 @@
+$NetBSD: patch-libgcc_config.host,v 1.2 2024/12/15 03:07:57 brook 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.
+libsupc++ fails to link without this, and for arm to build.
+
+--- libgcc/config.host.orig	2024-05-21 07:47:41.000000000 +0000
++++ libgcc/config.host
+@@ -235,19 +235,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
+@@ -406,6 +412,7 @@ aarch64*-*-freebsd*)
+ aarch64*-*-netbsd*)
+ 	extra_parts="$extra_parts crtfastmath.o"
+ 	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
++	tmake_file="${tmake_file} ${cpu_type}/t-lse"
+ 	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
+ 	tmake_file="${tmake_file} t-dfprules"
+ 	md_unwind_header=aarch64/aarch64-unwind.h
+@@ -497,7 +504,8 @@ arm*-*-netbsdelf*)
+ 	case ${host} in
+ 	  arm*-*-netbsdelf-*eabi*)
+ 	    tmake_file="${tmake_file} arm/t-netbsd-eabi"
+-	    unwind_header=config/arm/unwind-arm.h
++	    # GCC 7 vs NetBSD/eabi -> avoid arm unwinder
++	    #unwind_header=config/arm/unwind-arm.h
+ 	    ;;
+ 	  *)
+ 	    tmake_file="${tmake_file} arm/t-netbsd t-slibgcc-gld-nover"
diff --git a/gcc13/distinfo b/gcc13/distinfo
index e48305ac74..3be5690f66 100644
--- a/gcc13/distinfo
+++ b/gcc13/distinfo
@@ -23,7 +23,6 @@ SHA1 (patch-gcc_configure) = f13d23c46315d18fdbc3bbbad26d0763e2b27690
 SHA1 (patch-isl_configure) = a6295c509bdc82e8b54d7dec5252994532463091
 SHA1 (patch-libffi_configure) = 919bbe094e3ce547a0186eeaddb20a662595f79a
 SHA1 (patch-libffi_testsuite_libffi.call_float2.c) = 89e2dd6aaf2c1f75726f02362d8a8bf7178694ea
-SHA1 (patch-libgcc_config.host) = e3c3bc36f9f18e4b0864f10aa464774e133339c1
 SHA1 (patch-libgcc_config_i386_t-darwin) = 5c719be042134bf33f7d4d2bde63573f37df9a84
 SHA1 (patch-libgcc_config_rs6000_t-darwin) = a88cca89c7f28997e28b81d830b96613f23978ec
 SHA1 (patch-libgcc_config_t-darwin-libgccs1) = 75e5c3467bfd5716519a65f4d1a6da169486999e
diff --git a/gcc13/patches/patch-libgcc_config.host b/gcc13/patches/patch-libgcc_config.host
deleted file mode 100644
index 79a41cb3eb..0000000000
--- a/gcc13/patches/patch-libgcc_config.host
+++ /dev/null
@@ -1,86 +0,0 @@
-$NetBSD: patch-libgcc_config.host,v 1.2 2024/12/15 03:07:57 brook 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.
-libsupc++ fails to link without this, and for arm to build.
-
---- libgcc/config.host.orig	2024-05-21 07:47:41.000000000 +0000
-+++ libgcc/config.host
-@@ -235,19 +235,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
-@@ -406,6 +412,7 @@ aarch64*-*-freebsd*)
- aarch64*-*-netbsd*)
- 	extra_parts="$extra_parts crtfastmath.o"
- 	tmake_file="${tmake_file} ${cpu_type}/t-aarch64"
-+	tmake_file="${tmake_file} ${cpu_type}/t-lse"
- 	tmake_file="${tmake_file} ${cpu_type}/t-softfp t-softfp t-crtfm"
- 	tmake_file="${tmake_file} t-dfprules"
- 	md_unwind_header=aarch64/aarch64-unwind.h
-@@ -497,7 +504,8 @@ arm*-*-netbsdelf*)
- 	case ${host} in
- 	  arm*-*-netbsdelf-*eabi*)
- 	    tmake_file="${tmake_file} arm/t-netbsd-eabi"
--	    unwind_header=config/arm/unwind-arm.h
-+	    # GCC 7 vs NetBSD/eabi -> avoid arm unwinder
-+	    #unwind_header=config/arm/unwind-arm.h
- 	    ;;
- 	  *)
- 	    tmake_file="${tmake_file} arm/t-netbsd t-slibgcc-gld-nover"