<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/40a267e1c3265b3215fdccc45c544637e75a7557">https://github.com/macports/macports-ports/commit/40a267e1c3265b3215fdccc45c544637e75a7557</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 40a267e1c32 gcc14: Fix macOS 15 x86_64 build
</span>40a267e1c32 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 40a267e1c3265b3215fdccc45c544637e75a7557
</span>Author: Mark Mentovai <mark@mentovai.com>
AuthorDate: Wed Sep 25 11:40:44 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gcc14: Fix macOS 15 x86_64 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This also fixes the macOS 14 x86_64 build when using Xcode 16.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/70866
</span>---
lang/gcc14/Portfile | 23 +++--
...llow-for-as-versions-that-need-for-std-in.patch | 34 +++++++
...in-Drop-the-legacy-library-build-for-macO.patch | 103 +++++++++++++++++++++
...in-Don-t-build-legacy-libgcc_s.1-on-macOS.patch | 39 ++++++++
.../files/patch-as_needs_dash_for_piped_input.diff | 13 ---
5 files changed, 191 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc14/Portfile b/lang/gcc14/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e889f88204..b28dce0ae76 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc14/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,10 @@ long_description {*}${description}, including front ends for \
</span> # Remember to reset all revision increments below to 0 on new versions
version ${gcc_major_v}.2.0
revision 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove OS dependent revision bump on next version update
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" && ${os.major} >= 23 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision [ expr ${revision} + 1 ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -177,14 +181,17 @@ if { ${os.platform} eq "darwin" } {
</span> if { ${os.major} == 18 } {
patchfiles-append patch-OSX10.14-ucred-atomic-define.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # TEMPORARY workaround for macOS15+. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/70641
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and upstream discussion at
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/iains/gcc-darwin-arm64/issues/136
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # An upstream fix is likely not too far off, but in the meantime use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this workaround to provide users with a working build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} >= 24 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-as_needs_dash_for_piped_input.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Additional macOS 15 (and macOS 14 with Xcode 16) compatibility patches
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # from https://github.com/iains/gcc-14-branch, after tag gcc-14.2-darwin-r1.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See https://trac.macports.org/ticket/70641,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116794,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116809, and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/iains/gcc-darwin-arm64/issues/136.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { ${os.major} >= 23 } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append 0001-Darwin-Allow-for-as-versions-that-need-for-std-in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-libgcc-Darwin-Drop-the-legacy-library-build-for-macO.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0003-libgcc-Darwin-Don-t-build-legacy-libgcc_s.1-on-macOS.patch
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc14/files/0001-Darwin-Allow-for-as-versions-that-need-for-std-in.patch b/lang/gcc14/files/0001-Darwin-Allow-for-as-versions-that-need-for-std-in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5ce733e79ae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc14/files/0001-Darwin-Allow-for-as-versions-that-need-for-std-in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From ea41179dab5df144d2ec137c94dcbe171e427728 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 18 Sep 2024 17:46:32 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] Darwin: Allow for as versions that need '-' for std in.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Recent versions of Xcode as require a dash to read from standard
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+input. We can use this on all supported OS versions so make it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+unconditional. Patch from Mark Mentovai.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gcc/ChangeLog:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/darwin.h (AS_NEEDS_DASH_FOR_PIPED_INPUT): New.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config/darwin.h | 2 ++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git gcc/config/darwin.h gcc/config/darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7a53a1688a7d..5370511bec21 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config/darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gcc/config/darwin.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -651,6 +651,8 @@ extern GTY(()) int darwin_ms_struct;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ASM_OPTIONS "%{v} %{w:-W} %{I*}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define AS_NEEDS_DASH_FOR_PIPED_INPUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Default Darwin ASM_SPEC, very simple. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ASM_SPEC \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "%{static} -arch %(darwin_arch) " \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc14/files/0002-libgcc-Darwin-Drop-the-legacy-library-build-for-macO.patch b/lang/gcc14/files/0002-libgcc-Darwin-Drop-the-legacy-library-build-for-macO.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..385fc32e7c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc14/files/0002-libgcc-Darwin-Drop-the-legacy-library-build-for-macO.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,103 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From df72eb16a5bda90be31681a8d494a4053f891986 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 22 Sep 2024 11:43:32 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] libgcc, Darwin: Drop the legacy library build for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ >= 15 [PR116809].
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+We have been building a legacy libgcc_s.1 DSO to support code that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+was built with older compilers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From macOS 15, the unwinder no longer exports some of the symbols used
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in that library which (a) cuases bootstrap fail and (b) means that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacy library is no longer useful.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+No open branch of GCC emits references to this library - and any already
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-built code that depends on the symbols would need rework anyway.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR target/116809
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libgcc/ChangeLog:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config.host: Build legacy libgcc_s.1 on hosts before macOS 15.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/i386/t-darwin: Remove reference to legacy libgcc_s.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/rs6000/t-darwin: Likewise.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/t-darwin-libgccs1: New file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+(cherry picked from commit d9cafa0c4f0a81304d9b95a78ccc8e9003c6d7a3)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgcc/config.host | 11 +++++++----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgcc/config/i386/t-darwin | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgcc/config/rs6000/t-darwin | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgcc/config/t-darwin-libgccs1 | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 files changed, 10 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create mode 100644 libgcc/config/t-darwin-libgccs1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgcc/config.host libgcc/config.host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d27204f3fb47..08be426f3fe4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgcc/config.host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgcc/config.host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,22 +236,25 @@ case ${host} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmake_file="$tmake_file t-slibgcc-darwin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${host} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x86_64-*-darwin2[0-3]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin2*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmake_file="t-darwin-min-11 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin1[89]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_file="t-darwin-min-8 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmake_file="t-darwin-min-8 t-darwin-libgccs1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin9* | *-*-darwin1[0-7]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_file="t-darwin-min-5 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin[4-8]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_file="t-darwin-min-1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmake_file="t-darwin-min-1 t-darwin-libgccs1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Fall back to configuring for the oldest system known to work with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # all archs and the current sources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- tmake_file="t-darwin-min-5 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo "Warning: libgcc configured to support macOS 10.5" 1>&2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgcc/config/i386/t-darwin libgcc/config/i386/t-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4c18da1efbfd..c6b3acaaca28 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgcc/config/i386/t-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgcc/config/i386/t-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,6 +4,3 @@ LIB2FUNCS_EXCLUDE = _fixtfdi _fixunstfdi _floatditf _floatunditf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Extra symbols for this port.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SHLIB_MAPFILES += $(srcdir)/config/i386/libgcc-darwin.ver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Build a legacy libgcc_s.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BUILD_LIBGCCS1 = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgcc/config/rs6000/t-darwin libgcc/config/rs6000/t-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 183d0df92ce9..8b513bdb1d78 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgcc/config/rs6000/t-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgcc/config/rs6000/t-darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,6 +56,3 @@ unwind-dw2_s.o: HOST_LIBGCC2_CFLAGS += -maltivec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unwind-dw2.o: HOST_LIBGCC2_CFLAGS += -maltivec
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB2ADDEH += $(srcdir)/config/rs6000/darwin-fallback.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# Build a legacy libgcc_s.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-BUILD_LIBGCCS1 = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgcc/config/t-darwin-libgccs1 libgcc/config/t-darwin-libgccs1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+new file mode 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 000000000000..b88b1a5bba8a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgcc/config/t-darwin-libgccs1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Build a legacy libgcc_s.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++BUILD_LIBGCCS1 = YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc14/files/0003-libgcc-Darwin-Don-t-build-legacy-libgcc_s.1-on-macOS.patch b/lang/gcc14/files/0003-libgcc-Darwin-Don-t-build-legacy-libgcc_s.1-on-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8d3e42ae22e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc14/files/0003-libgcc-Darwin-Don-t-build-legacy-libgcc_s.1-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,39 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From df3861926d0604145810f38a8719984447f33a3c Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Mark Mentovai <mark@mentovai.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 24 Sep 2024 16:11:14 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] libgcc, Darwin: Don't build legacy libgcc_s.1 on macOS 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [PR116809]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+d9cafa0c4f0a stopped building libgcc_s.1 on macOS >= 15, in part because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that is required to bootstrap the compiler using the macOS 15 SDK. The
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macOS 15 SDK ships in Xcode 16, which also runs on macOS 14. libgcc_s.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+can no longer be built on macOS 14 using Xcode 16 by the same logic that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the previous change disabled it for macOS 15.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PR target/116809
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+libgcc/ChangeLog:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config.host: Don't build legacy libgcc_s.1 on macOS 14.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Mark Mentovai <mark@mentovai.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgcc/config.host | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git libgcc/config.host libgcc/config.host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 08be426f3fe4..ae4c91dee351 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgcc/config.host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgcc/config.host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -236,7 +236,7 @@ case ${host} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmake_file="$tmake_file t-slibgcc-darwin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case ${host} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x86_64-*-darwin2[0-3]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x86_64-*-darwin2[0-2]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin2*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.46.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc14/files/patch-as_needs_dash_for_piped_input.diff b/lang/gcc14/files/patch-as_needs_dash_for_piped_input.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2cde54fa981..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc14/files/patch-as_needs_dash_for_piped_input.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/config/darwin.h gcc/config/darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 377599074a75..0d8886c026c6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config/darwin.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -648,6 +648,8 @@ extern GTY(()) int darwin_ms_struct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ASM_OPTIONS "%{v} %{w:-W} %{I*}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define AS_NEEDS_DASH_FOR_PIPED_INPUT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Default Darwin ASM_SPEC, very simple. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ASM_SPEC \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "%{static} -arch %(darwin_arch) " \
</span></pre><pre style='margin:0'>
</pre>