public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10847] Darwin: Future-proof -mmacosx-version-min
@ 2022-06-15 19:16 Iain D Sandoe
  0 siblings, 0 replies; only message in thread
From: Iain D Sandoe @ 2022-06-15 19:16 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:f335ab5b77230590618f80f76a5e83626909b8ee

commit r10-10847-gf335ab5b77230590618f80f76a5e83626909b8ee
Author: Mark Mentovai <mark@mentovai.com>
Date:   Fri Jun 10 15:56:42 2022 +0100

    Darwin: Future-proof -mmacosx-version-min
    
    f18cbc1ee1f4 (2021-12-18) updated various parts of gcc to not impose a
    Darwin or macOS version maximum of the current known release. Different
    parts of gcc accept, variously, Darwin version numbers matching
    darwin2*, and macOS major version numbers up to 99. The current released
    version is Darwin 21 and macOS 12, with Darwin 22 and macOS 13 expected
    for public release later this year. With one major OS release per year,
    this strategy is expected to provide another 8 years of headroom.
    
    However, f18cbc1ee1f4 missed config/darwin-c.c (now .cc), which
    continued to impose a maximum of macOS 12 on the -mmacosx-version-min
    compiler driver argument. This was last updated from 11 to 12 in
    11b967577483 (2021-10-27), but kicking the can down the road one year at
    a time is not a viable strategy, and is not in line with the more recent
    technique from f18cbc1ee1f4.
    
    Prior to 556ab5125912 (2020-11-06), config/darwin-c.c did not impose a
    maximum that needed annual maintenance, as at that point, all macOS
    releases had used a major version of 10. The stricter approach imposed
    since then was valuable for a time until the particulars of the new
    versioning scheme were established and understood, but now that they
    are, it's prudent to restore a more permissive approach.
    
    gcc/ChangeLog:
    
            * config/darwin-c.c: Make -mmacosx-version-min more future-proof.
    
    Signed-off-by: Mark Mentovai <mark@mentovai.com>
    (cherry picked from commit 6725f186cb70d48338f69456864bf469a12ee5be)

Diff:
---
 gcc/config/darwin-c.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
index 3c2afe56522..0f746e933c1 100644
--- a/gcc/config/darwin-c.c
+++ b/gcc/config/darwin-c.c
@@ -691,7 +691,8 @@ macosx_version_as_macro (void)
   if (!version_array)
     goto fail;
 
-  if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12)
+  /* System tools accept up to 99 as a major version.  */
+  if (version_array[MAJOR] < 10 || version_array[MAJOR] > 99)
     goto fail;
 
   if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-06-15 19:16 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-15 19:16 [gcc r10-10847] Darwin: Future-proof -mmacosx-version-min Iain D Sandoe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).