Skip to content

Commit d9cafa0

Browse files
committed
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/ChangeLog: * config.host: Build legacy libgcc_s.1 on hosts before macOS 15. * config/i386/t-darwin: Remove reference to legacy libgcc_s.1 * config/rs6000/t-darwin: Likewise. * config/t-darwin-libgccs1: New file. Signed-off-by: Iain Sandoe <[email protected]>
1 parent dab4500 commit d9cafa0

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

libgcc/config.host

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,22 +239,25 @@ case ${host} in
239239
esac
240240
tmake_file="$tmake_file t-slibgcc-darwin"
241241
case ${host} in
242+
x86_64-*-darwin2[0-3]*)
243+
tmake_file="t-darwin-min-11 t-darwin-libgccs1 $tmake_file"
244+
;;
242245
*-*-darwin2*)
243246
tmake_file="t-darwin-min-11 $tmake_file"
244247
;;
245248
*-*-darwin1[89]*)
246-
tmake_file="t-darwin-min-8 $tmake_file"
249+
tmake_file="t-darwin-min-8 t-darwin-libgccs1 $tmake_file"
247250
;;
248251
*-*-darwin9* | *-*-darwin1[0-7]*)
249-
tmake_file="t-darwin-min-5 $tmake_file"
252+
tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
250253
;;
251254
*-*-darwin[4-8]*)
252-
tmake_file="t-darwin-min-1 $tmake_file"
255+
tmake_file="t-darwin-min-1 t-darwin-libgccs1 $tmake_file"
253256
;;
254257
*)
255258
# Fall back to configuring for the oldest system known to work with
256259
# all archs and the current sources.
257-
tmake_file="t-darwin-min-5 $tmake_file"
260+
tmake_file="t-darwin-min-5 t-darwin-libgccs1 $tmake_file"
258261
echo "Warning: libgcc configured to support macOS 10.5" 1>&2
259262
;;
260263
esac

libgcc/config/i386/t-darwin

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,3 @@ LIB2FUNCS_EXCLUDE = _fixtfdi _fixunstfdi _floatditf _floatunditf
44

55
# Extra symbols for this port.
66
SHLIB_MAPFILES += $(srcdir)/config/i386/libgcc-darwin.ver
7-
8-
# Build a legacy libgcc_s.1
9-
BUILD_LIBGCCS1 = YES

libgcc/config/rs6000/t-darwin

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,3 @@ unwind-dw2_s.o: HOST_LIBGCC2_CFLAGS += -maltivec
5656
unwind-dw2.o: HOST_LIBGCC2_CFLAGS += -maltivec
5757

5858
LIB2ADDEH += $(srcdir)/config/rs6000/darwin-fallback.c
59-
60-
# Build a legacy libgcc_s.1
61-
BUILD_LIBGCCS1 = YES

libgcc/config/t-darwin-libgccs1

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
2+
# Build a legacy libgcc_s.1
3+
BUILD_LIBGCCS1 = YES

0 commit comments

Comments
 (0)