From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp002.apm-internet.net (smtp002.apm-internet.net [85.119.248.221]) by sourceware.org (Postfix) with ESMTPS id 14A4539421CA for ; Fri, 10 Jun 2022 15:18:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 14A4539421CA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=sandoe.co.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=sandoe.co.uk Received: (qmail 5620 invoked from network); 10 Jun 2022 15:18:09 -0000 X-APM-Out-ID: 16548742890561 X-APM-Authkey: 257869/1(257869/1) 5 Received: from unknown (HELO ?192.168.1.95?) (81.138.1.83) by smtp002.apm-internet.net with SMTP; 10 Jun 2022 15:18:09 -0000 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.7\)) Subject: Re: [PATCH] Darwin: Future-proof -mmacosx-version-min From: Iain Sandoe In-Reply-To: <20220610145642.29159-1-mark@mentovai.com> Date: Fri, 10 Jun 2022 16:18:08 +0100 Cc: GCC Patches , =?utf-8?Q?Fran=C3=A7ois-Xavier_Coudert?= Content-Transfer-Encoding: 7bit Message-Id: <014F8BAE-2051-4064-BB55-EC31545CF6C7@sandoe.co.uk> References: <20220610145642.29159-1-mark@mentovai.com> To: Mark Mentovai X-Mailer: Apple Mail (2.3608.120.23.2.7) X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_COUK, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Jun 2022 15:18:12 -0000 Hi Mark, > On 10 Jun 2022, at 15:56, Mark Mentovai wrote: > > 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. OK for master and open branches, thanks Iain > > gcc/ChangeLog: > > * config/darwin-c.cc: Make -mmacosx-version-min more future-proof. > > Signed-off-by: Mark Mentovai > --- > gcc/config/darwin-c.cc | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/gcc/config/darwin-c.cc b/gcc/config/darwin-c.cc > index 9203c84d2c26..00fc1253e265 100644 > --- a/gcc/config/darwin-c.cc > +++ b/gcc/config/darwin-c.cc > @@ -691,7 +691,8 @@ macosx_version_as_macro (void) > if (!version_array) > goto fail; > > - if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12) > + /* clang accepts up to 99. */ > + if (version_array[MAJOR] < 10 || version_array[MINOR] > 99) > goto fail; > > if (version_array[MAJOR] == 10 && version_array[MINOR] < 10) > -- > 2.36.1 >