(lib)gcc15: Update to 15.2.0

This commit is contained in:
Chris Jones
2025-10-23 16:26:48 +01:00
parent 79c0359245
commit 966dd0e329
3 changed files with 5 additions and 94 deletions
+5 -9
View File
@@ -21,17 +21,17 @@ long_description {*}${description}, including front ends for \
C, C++, Objective-C, Objective-C++, Modula-2 and Fortran.
# Remember to reset all revision increments below to 0 on new versions
version ${gcc_major_v}.1.0
revision 3
version ${gcc_major_v}.2.0
revision 0
set libgccname lib${name}
subport ${libgccname} { revision [ expr ${revision} + 0 ] }
set libcxxname ${name}-libcxx
checksums rmd160 711fdf2d13fcda8b2b149b6f3a1b30b04326d5f3 \
sha256 e2b09ec21660f01fecffb715e0120265216943f038d0e48a9868713e54f06cea \
size 98268344
checksums rmd160 b16e24d6caab2f7be54edc500b99ef08d436d300 \
sha256 438fd996826b0c82485a29da03a72d71d6e3541a83ec702df4271f6fe025d24e \
size 101056276
# Primary releases
master_sites https://ftpmirror.gnu.org/gcc/gcc-${version}/ \
@@ -187,10 +187,6 @@ if { ${os.platform} eq "darwin" } {
# git diff --no-prefix releases/gcc-14.2.0 gcc-14.2-darwin-r1
patchfiles-append patch-darwin-gcc-${version}.diff
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=120645
# Should be removed once in the release / darwoin patch we use above
patchfiles-append patch-darwin-driver-macOS26.diff
if { ${os.major} == 8 } {
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117834
patchfiles-append darwin8-define-PTHREAD_RWLOCK_INITIALIZER.patch
@@ -1,85 +0,0 @@
From c677121d3843e383906a4d7679dc647808ddab3a Mon Sep 17 00:00:00 2001
From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Mon, 14 Jul 2025 12:14:00 +0200
Subject: Darwin: account for macOS 26
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
darwin25 will be named macOS 26 (codename Tahoe). This is a change from
darwin24, which was macOS 15. We need to adapt the driver to this new
numbering scheme.
2025-07-14 François-Xavier Coudert <fxcoudert@gcc.gnu.org>
gcc/ChangeLog:
PR target/120645
* config/darwin-driver.cc: Account for latest macOS numbering
scheme.
gcc/testsuite/ChangeLog:
* gcc.dg/darwin-minversion-link.c: Account for macOS 26.
(cherry picked from commit cc4f3397331f6ecd5e775cf963c65face0145f3f)
---
gcc/config/darwin-driver.cc | 22 ++++++++++++----------
gcc/testsuite/gcc.dg/darwin-minversion-link.c | 1 +
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/gcc/config/darwin-driver.cc b/gcc/config/darwin-driver.cc
index 224e0a0de700..e83b7cdc0c95 100644
--- gcc/config/darwin-driver.cc.orig
+++ gcc/config/darwin-driver.cc
@@ -64,7 +64,8 @@ validate_macosx_version_min (const char *version_str)
major = strtoul (version_str, &end, 10);
- /* macOS 10, 11, and 12 are known. clang accepts up to 99. */
+ /* macOS 10, 11, 12, 13, 14, 15 and 26 are known.
+ clang accepts up to 99. */
if (major < 10 || major > 99)
return NULL;
@@ -159,15 +160,16 @@ darwin_find_version_from_kernel (void)
if (*version_p++ != '.')
goto parse_failed;
- /* Darwin20 sees a transition to macOS 11. In this, it seems that the
- mapping to macOS minor version and patch level is now always 0, 0
- (at least for macOS 11 and 12). */
- if (major_vers >= 20)
- {
- /* Apple clang doesn't include the minor version or the patch level
- in the object file, nor does it pass it to ld */
- asprintf (&new_flag, "%d.00.00", major_vers - 9);
- }
+ /* Darwin25 saw a transition to macOS 26. */
+ if (major_vers >= 25)
+ /* Apple clang doesn't include the minor version or the patch level
+ in the object file, nor does it pass it to ld */
+ asprintf (&new_flag, "%d.00.00", major_vers + 1);
+ /* Darwin20 saw a transition to macOS 11. */
+ else if (major_vers >= 20)
+ /* Apple clang doesn't include the minor version or the patch level
+ in the object file, nor does it pass it to ld */
+ asprintf (&new_flag, "%d.00.00", major_vers - 9);
else if (major_vers - 4 <= 4)
/* On 10.4 and earlier, the old linker is used which does not
support three-component system versions.
diff --git a/gcc/testsuite/gcc.dg/darwin-minversion-link.c b/gcc/testsuite/gcc.dg/darwin-minversion-link.c
index af712a1b8963..55f7c7ea8374 100644
--- gcc/testsuite/gcc.dg/darwin-minversion-link.c.orig
+++ gcc/testsuite/gcc.dg/darwin-minversion-link.c
@@ -20,6 +20,7 @@
/* { dg-additional-options "-mmacosx-version-min=013.000.00 -DCHECK=130000" { target *-*-darwin22* } } */
/* { dg-additional-options "-mmacosx-version-min=014.000.00 -DCHECK=140000" { target *-*-darwin23* } } */
/* { dg-additional-options "-mmacosx-version-min=015.000.00 -DCHECK=150000" { target *-*-darwin24* } } */
+/* { dg-additional-options "-mmacosx-version-min=026.000.00 -DCHECK=260000" { target *-*-darwin25* } } */
int
main ()
--
cgit