public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Iain D Sandoe <iains@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r11-9870] Darwin, config: Amend for Darwin 21 / macOS 12. Date: Thu, 14 Apr 2022 05:25:52 +0000 (GMT) [thread overview] Message-ID: <20220414052552.12DDA3858D3C@sourceware.org> (raw) https://gcc.gnu.org/g:6d8e290af858f8698f04b798644a52feda6797cb commit r11-9870-g6d8e290af858f8698f04b798644a52feda6797cb Author: Saagar Jha <saagar@saagarjha.com> Date: Tue Jun 15 04:08:23 2021 -0700 Darwin, config: Amend for Darwin 21 / macOS 12. It seems that the OS major version is now tracking the kernel major version - 9. Minor version has been set to kernel minor - 1. Signed-off-by: Iain Sandoe <iain@sandoe.co.uk> Signed-off-by: Saagar Jha <saagar@saagarjha.com> gcc/ChangeLog: * config.gcc: Adjust for Darwin21. * config/darwin-c.c (macosx_version_as_macro): Likewise. * config/darwin-driver.c (validate_macosx_version_min): Likewise. (darwin_find_version_from_kernel): Likewise. Diff: --- gcc/config.gcc | 6 +++--- gcc/config/darwin-c.c | 2 +- gcc/config/darwin-driver.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/config.gcc b/gcc/config.gcc index b272518a813..5e33570a2bd 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -704,9 +704,9 @@ case ${target} in *-*-darwin[4-9]* | *-*-darwin1[0-9]*) macos_min=`expr $darwin_maj - 4` ;; - *-*-darwin20*) - # Darwin 20 corresponds to macOS 11. - macos_maj=11 + *-*-darwin2*) + # Darwin 20 corresponds to macOS 11, Darwin 21 to macOS 12. + macos_maj=`expr $darwin_maj - 9` def_ld64=609.0 ;; *-*-darwin) diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c index b0424a981e8..8b3dec25476 100644 --- a/gcc/config/darwin-c.c +++ b/gcc/config/darwin-c.c @@ -691,7 +691,7 @@ macosx_version_as_macro (void) if (!version_array) goto fail; - if (version_array[MAJOR] < 10 || version_array[MAJOR] > 11) + if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12) goto fail; if (version_array[MAJOR] == 10 && version_array[MINOR] < 10) diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c index 3d7768f055d..9d206199154 100644 --- a/gcc/config/darwin-driver.c +++ b/gcc/config/darwin-driver.c @@ -64,17 +64,17 @@ validate_macosx_version_min (const char *version_str) major = strtoul (version_str, &end, 10); - if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */ + if (major < 10 || major > 12 ) /* macOS 10, 11, and 12 are known. */ return NULL; /* Skip a separating period, if there's one. */ version_str = end + ((*end == '.') ? 1 : 0); - if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0])) - /* For MacOS 11, we allow just the major number, but if the minor is + if (major > 10 && *end != '\0' && !ISDIGIT (version_str[0])) + /* For macOS 11+, we allow just the major number, but if the minor is there it must be numeric. */ return NULL; - else if (major == 11 && *end == '\0') + else if (major > 10 && *end == '\0') /* We will rewrite 11 => 11.0.0. */ need_rewrite = true; else if (major == 10 && (*end == '\0' || !ISDIGIT (version_str[0]))) @@ -172,7 +172,7 @@ darwin_find_version_from_kernel (void) if (minor_vers > 0) minor_vers -= 1; /* Kernel 20.3 => macOS 11.2. */ /* It's not yet clear whether patch level will be considered. */ - asprintf (&new_flag, "11.%02d.00", minor_vers); + asprintf (&new_flag, "%d.%02d.00", major_vers - 9, minor_vers); } else if (major_vers - 4 <= 4) /* On 10.4 and earlier, the old linker is used which does not
reply other threads:[~2022-04-14 5:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220414052552.12DDA3858D3C@sourceware.org \ --to=iains@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).