<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/573b82fd5df538ea2ad75e2c2373f4727ef3430c">https://github.com/macports/macports-ports/commit/573b82fd5df538ea2ad75e2c2373f4727ef3430c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 573b82fd5df {lib}gcc11: Fix macOS12 builds At least on Intel machines...
</span>573b82fd5df is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 573b82fd5df538ea2ad75e2c2373f4727ef3430c
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Tue Nov 2 22:21:11 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> {lib}gcc11: Fix macOS12 builds
</span><span style='display:block; white-space:pre;color:#404040;'> At least on Intel machines...
</span>---
lang/gcc11/Portfile | 23 +++----
lang/gcc11/files/patch-darwin21-arm.diff | 89 -------------------------
lang/gcc11/files/patch-darwin21-support.diff | 97 ++++++++++++++--------------
3 files changed, 57 insertions(+), 152 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc11/Portfile b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ba1fc75e40..b93f39c739c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,8 +40,6 @@ master_sites https://ftpmirror.gnu.org/gcc/gcc-${version}/ \
</span> ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/ \
gnu:gcc/gcc-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Make-lang.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # Use specific patched version, taken from homebrew comment
# https://github.com/Homebrew/homebrew-core/blob/HEAD/Formula/gcc.rb
# Branch from the Darwin maintainer of GCC with Apple Silicon support
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,27 +51,26 @@ if { ${os.arch} eq "arm" } {
</span> checksums rmd160 ccb26e52571aff9230f4bdf067fe8c9d1fb79235 \
sha256 ce862b4a4bdc8f36c9240736d23cd625a48af82c2332d2915df0e16e1609a74c \
size 125460899
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/63677
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-darwin21-arm.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> } else {
distname gcc-${version}
use_xz yes
checksums rmd160 0fdd0b2c0954ccbd32e24f027d7b55fd26dcc627 \
sha256 d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b \
size 80888824
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add preliminary Darwin 21 support to GCC 11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This should be removed, when GCC 11 supports Darwin 21 officially and the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # respective version is used by macports.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See also: https://github.com/iains/gcc-darwin-arm64/commit/20f61faaed3b335d792e38892d826054d2ac9f15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-darwin21-support.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
subport libgcc11 { revision [ expr ${revision} + 0 ] }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-Make-lang.in.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ${os.platform} eq "darwin" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Add preliminary Darwin 21 support to GCC 11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This should be removed, when GCC 11 supports Darwin 21 officially and the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # respective version is used by macports.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # See also: https://github.com/iains/gcc-darwin-arm64/commit/20f61faaed3b335d792e38892d826054d2ac9f15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-darwin21-support.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if { ${os.platform} eq "darwin" && ${os.major} >= 17 } {
# On macOS 10.13 and later, compilation is extremely slow if SIP is
# disabled; e.g. from ~30m with SIP enabled, to ~6 hours if disabled.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc11/files/patch-darwin21-arm.diff b/lang/gcc11/files/patch-darwin21-arm.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8f722310371..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc11/files/patch-darwin21-arm.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 20f61faaed3b335d792e38892d826054d2ac9f15 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Saagar Jha <saagar@saagarjha.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 15 Jun 2021 04:08:23 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Darwin, config: Amend for Darwin 21 / macOS 12.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-It seems that the OS major version is now tracking the kernel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-major version - 9. Minor version tracking is unknown.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Saagar Jha <saagar@saagarjha.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gcc/ChangeLog:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * config.gcc: Adjust for Darwin21.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * config/darwin-c.c (macosx_version_as_macro): Likewise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * config/darwin-driver.c (validate_macosx_version_min):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Likewise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (darwin_find_version_from_kernel): Likewise.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc/config.gcc | 6 +++---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc/config/darwin-c.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gcc/config/darwin-driver.c | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 9 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gcc/config.gcc b/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 498c51e619de772aecac0ad9303fdb72c4db930b..d430c24e4749c66d510f503e9389362a93e6da97 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config.gcc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -679,9 +679,9 @@ case ${target} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-darwin[4-9]* | *-*-darwin1[0-9]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macos_min=`expr $darwin_maj - 4`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-*-darwin20*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Darwin 20 corresponds to macOS 11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- macos_maj=11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-*-darwin2*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Darwin 20 corresponds to macOS 11, Darwin 21 to macOS 12.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ macos_maj=`expr $darwin_maj - 9`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def_ld64=609.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 951a998775f83e16ed6c11963e6e9eb1286c51a7..62d28fcea501bbcb9eb403c74793af45eb91ca7f 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-c.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -691,7 +691,7 @@ macosx_version_as_macro (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!version_array)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (version_array[MAJOR] < 10 || version_array[MAJOR] > 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (version_array[MAJOR] < 10 || version_array[MAJOR] > 12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto fail;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0b86bb6faf7ca246afd23d43f716242f3d802123..3e02d003cd19dabc9518e21655586768feae6756 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-driver.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,17 +64,17 @@ validate_macosx_version_min (const char *version_str)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- major = strtoul (version_str, &end, 10);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (major < 10 || major > 11 ) /* MacOS 10 and 11 are known. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major < 10 || major > 12 ) /* macOS 10, 11, and 12 are known. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Skip a separating period, if there's one. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version_str = end + ((*end == '.') ? 1 : 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* For MacOS 11, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major > 10 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* For macOS 11+, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- there it must be numeric. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (major == 11 && *end == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (major > 10 && *end == '\0')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* We will rewrite 11 => 11.0.0. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- need_rewrite = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (major == 10 && (*end == '\0' || !ISDIGIT (version_str[0])))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -172,7 +172,7 @@ darwin_find_version_from_kernel (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (minor_vers > 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minor_vers -= 1; /* Kernel 20.3 => macOS 11.2. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* It's not yet clear whether patch level will be considered. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- asprintf (&new_flag, "11.%02d.00", minor_vers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asprintf (&new_flag, "%d.%02d.00", major_vers - 9, minor_vers);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (major_vers - 4 <= 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* On 10.4 and earlier, the old linker is used which does not
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc11/files/patch-darwin21-support.diff b/lang/gcc11/files/patch-darwin21-support.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d8aff70a7bf..8f722310371 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc11/files/patch-darwin21-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc11/files/patch-darwin21-support.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +1,47 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-As seen in commit https://github.com/iains/gcc-darwin-arm64/commit/20f61faaed3b335d792e38892d826054d2ac9f15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-this patch adds Darwin 21 support to GCC 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 20f61faaed3b335d792e38892d826054d2ac9f15 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Saagar Jha <saagar@saagarjha.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 15 Jun 2021 04:08:23 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Darwin, config: Amend for Darwin 21 / macOS 12.
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/config.gcc gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index fb1f06f3da8..b447ec4c8e2 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+It seems that the OS major version is now tracking the kernel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+major version - 9. Minor version tracking is unknown.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Saagar Jha <saagar@saagarjha.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+gcc/ChangeLog:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config.gcc: Adjust for Darwin21.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/darwin-c.c (macosx_version_as_macro): Likewise.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * config/darwin-driver.c (validate_macosx_version_min):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Likewise.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (darwin_find_version_from_kernel): Likewise.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config.gcc | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config/darwin-c.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gcc/config/darwin-driver.c | 10 +++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 9 insertions(+), 9 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config.gcc b/gcc/config.gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 498c51e619de772aecac0ad9303fdb72c4db930b..d430c24e4749c66d510f503e9389362a93e6da97 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config.gcc.orig
</span> +++ gcc/config.gcc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -686,6 +686,11 @@ case ${target} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macos_maj=11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -679,9 +679,9 @@ case ${target} in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin[4-9]* | *-*-darwin1[0-9]*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macos_min=`expr $darwin_maj - 4`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *-*-darwin20*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Darwin 20 corresponds to macOS 11.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- macos_maj=11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *-*-darwin2*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Darwin 20 corresponds to macOS 11, Darwin 21 to macOS 12.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ macos_maj=`expr $darwin_maj - 9`
</span> def_ld64=609.0
;;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-*-darwin21*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Darwin 21 corresponds to macOS 12.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ macos_maj=12
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ def_ld64=609.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span> *-*-darwin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- case ${cpu_type} in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aarch64) macos_maj=11 ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/config/darwin-c.c gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 951a998775f..62d28fcea50 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 951a998775f83e16ed6c11963e6e9eb1286c51a7..62d28fcea501bbcb9eb403c74793af45eb91ca7f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config/darwin-c.c.orig
</span> +++ gcc/config/darwin-c.c
@@ -691,7 +691,7 @@ macosx_version_as_macro (void)
if (!version_array)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,16 +52,16 @@ index 951a998775f..62d28fcea50 100644
</span> goto fail;
if (version_array[MAJOR] == 10 && version_array[MINOR] < 10)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/config/darwin-driver.c gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a036e091c48..bca71983674 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0b86bb6faf7ca246afd23d43f716242f3d802123..3e02d003cd19dabc9518e21655586768feae6756 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gcc/config/darwin-driver.c.orig
</span> +++ 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. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major < 10 || major > 12 ) /* MacOS 10, 11 and 12 are known. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (major < 10 || major > 12 ) /* macOS 10, 11, and 12 are known. */
</span> return NULL;
/* Skip a separating period, if there's one. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,46 +69,21 @@ index a036e091c48..bca71983674 100644
</span>
- if (major == 11 && *end != '\0' && !ISDIGIT (version_str[0]))
- /* For MacOS 11, we allow just the major number, but if the minor is
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (major >= 11 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* For MacOS 11 and newer, we allow just the major number, but if the minor is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (major > 10 && *end != '\0' && !ISDIGIT (version_str[0]))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* For macOS 11+, we allow just the major number, but if the minor is
</span> there it must be numeric. */
return NULL;
- else if (major == 11 && *end == '\0')
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (major >= 11 && *end == '\0')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (major > 10 && *end == '\0')
</span> /* We will rewrite 11 => 11.0.0. */
need_rewrite = true;
else if (major == 10 && (*end == '\0' || !ISDIGIT (version_str[0])))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -160,10 +160,10 @@ darwin_find_version_from_kernel (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Darwin20 sees a transition to macOS 11. In this, it seems that the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mapping to macOS minor version is now shifted to the kernel minor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- version - 1 (at least for the initial releases). At this stage, we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- don't know what macOS version will correspond to Darwin21. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ version - 1 (at least for the initial releases). */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (major_vers >= 20)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int macos_vers = major_vers - 9;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int minor_vers = *version_p++ - '0';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ISDIGIT (*version_p))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- minor_vers = minor_vers * 10 + (*version_p++ - '0');
</span> @@ -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);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ asprintf (&new_flag, "%d.%02d.00", macos_vers, minor_vers);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ asprintf (&new_flag, "%d.%02d.00", major_vers - 9, minor_vers);
</span> }
else if (major_vers - 4 <= 4)
/* On 10.4 and earlier, the old linker is used which does not
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git gcc/testsuite/gcc.dg/darwin-minversion-link.c gcc/testsuite/gcc.dg/darwin-minversion-link.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 765fb799a91..e142a5830a4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gcc/testsuite/gcc.dg/darwin-minversion-link.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gcc/testsuite/gcc.dg/darwin-minversion-link.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,6 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* { dg-additional-options "-mmacosx-version-min=010.014.05 -DCHECK=101405" { target *-*-darwin18* } } */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* { dg-additional-options "-mmacosx-version-min=010.015.06 -DCHECK=101506" { target *-*-darwin19* } } */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* { dg-additional-options "-mmacosx-version-min=011.000.00 -DCHECK=110000" { target *-*-darwin20 } } */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* { dg-additional-options "-mmacosx-version-min=012.000.00 -DCHECK=120000" { target *-*-darwin21 } } */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main ()
</span></pre><pre style='margin:0'>
</pre>