|
| 1 | +From 407e1099d055eaf39478cfdd933ed8aad273c1cc Mon Sep 17 00:00:00 2001 |
| 2 | +From: Iain Sandoe < [email protected]> |
| 3 | +Date: Sun, 9 Mar 2025 09:24:34 +0000 |
| 4 | +Subject: [PATCH] Darwin: Pass -macos_version_min to the linker [PR119172]. |
| 5 | + |
| 6 | +For binaries to be notarised, the SDK version must be available. |
| 7 | +Since we do not, at present, parse this information we have been |
| 8 | +passing "0.0" to ld64. This now results in a warning and a fail |
| 9 | +to notarise. As a quick-fix, we can fall back to letting ld64 |
| 10 | +figure out the SDK version (which it does for -macos_version_min). |
| 11 | + |
| 12 | +TODO: Parse the SDKSetting.plist at some point. |
| 13 | + |
| 14 | +cherry-picked from 952e17223d3a9 and fc728cfd569e291a5 |
| 15 | + |
| 16 | + PR target/119172 |
| 17 | + |
| 18 | +gcc/ChangeLog: |
| 19 | + |
| 20 | + * config.in: Regenerate. |
| 21 | + * config/darwin.h (DARWIN_PLATFORM_ID): Add the option to |
| 22 | + use -macos_version_min where available. |
| 23 | + * configure: Regenerate. |
| 24 | + * configure.ac: Check for ld64 support of -macos_version_min. |
| 25 | + |
| 26 | +Co-authored-by: Andrew Pinski < [email protected]> |
| 27 | + |
| 28 | +Signed-off-by: Iain Sandoe < [email protected]> |
| 29 | +Signed-off-by: Andrew Pinski < [email protected]> |
| 30 | +--- |
| 31 | + gcc/config.in | 6 ++++++ |
| 32 | + gcc/config/darwin.h | 13 +++++++++---- |
| 33 | + gcc/configure | 17 +++++++++++++++++ |
| 34 | + gcc/configure.ac | 12 ++++++++++++ |
| 35 | + 4 files changed, 44 insertions(+), 4 deletions(-) |
| 36 | + |
| 37 | +diff --git a/gcc/config.in b/gcc/config.in |
| 38 | +index f3de4ba6776b..7db2dfdc192b 100644 |
| 39 | +--- a/gcc/config.in |
| 40 | ++++ b/gcc/config.in |
| 41 | +@@ -2289,6 +2289,12 @@ |
| 42 | + #endif |
| 43 | + |
| 44 | + |
| 45 | ++/* Define to 1 if ld64 supports '-macos_version_min'. */ |
| 46 | ++#ifndef USED_FOR_TARGET |
| 47 | ++#undef LD64_HAS_MACOS_VERSION_MIN |
| 48 | ++#endif |
| 49 | ++ |
| 50 | ++ |
| 51 | + /* Define to 1 if ld64 supports '-platform_version'. */ |
| 52 | + #ifndef USED_FOR_TARGET |
| 53 | + #undef LD64_HAS_PLATFORM_VERSION |
| 54 | +diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h |
| 55 | +index 5370511bec21..75050d2197a8 100644 |
| 56 | +--- a/gcc/config/darwin.h |
| 57 | ++++ b/gcc/config/darwin.h |
| 58 | +@@ -285,12 +285,17 @@ extern GTY(()) int darwin_ms_struct; |
| 59 | + #define DARWIN_RDYNAMIC "%{rdynamic:%nrdynamic is not supported}" |
| 60 | + #endif |
| 61 | + |
| 62 | +-#if LD64_HAS_PLATFORM_VERSION |
| 63 | +-#define DARWIN_PLATFORM_ID \ |
| 64 | +- "%{mmacosx-version-min=*: -platform_version macos %* 0.0} " |
| 65 | ++#if LD64_HAS_MACOS_VERSION_MIN |
| 66 | ++# define DARWIN_PLATFORM_ID \ |
| 67 | ++ "%{mmacosx-version-min=*:-macos_version_min %*} " |
| 68 | + #else |
| 69 | +-#define DARWIN_PLATFORM_ID \ |
| 70 | ++# if LD64_HAS_PLATFORM_VERSION |
| 71 | ++# define DARWIN_PLATFORM_ID \ |
| 72 | ++ "%{mmacosx-version-min=*: -platform_version macos %* 0.0} " |
| 73 | ++# else |
| 74 | ++# define DARWIN_PLATFORM_ID \ |
| 75 | + "%{mmacosx-version-min=*:-macosx_version_min %*} " |
| 76 | ++# endif |
| 77 | + #endif |
| 78 | + |
| 79 | + /* Code built with mdynamic-no-pic does not support PIE/PIC, so we disallow |
| 80 | +diff --git a/gcc/configure b/gcc/configure |
| 81 | +index 4f3a50627368..d19d262eedb8 100755 |
| 82 | +--- a/gcc/configure |
| 83 | ++++ b/gcc/configure |
| 84 | +@@ -32718,6 +32718,7 @@ if test x"$ld64_flag" = x"yes"; then |
| 85 | + # Set defaults for possibly untestable items. |
| 86 | + gcc_cv_ld64_export_dynamic=0 |
| 87 | + gcc_cv_ld64_platform_version=0 |
| 88 | ++ gcc_cv_ld64_macos_version_min=0 |
| 89 | + gcc_cv_ld64_demangle=0 |
| 90 | + |
| 91 | + if test "$build" = "$host"; then |
| 92 | +@@ -32750,6 +32751,7 @@ $as_echo "$gcc_cv_ld64_major" >&6; } |
| 93 | + fi |
| 94 | + if test "$gcc_cv_ld64_major" -ge 512; then |
| 95 | + gcc_cv_ld64_platform_version=1 |
| 96 | ++ gcc_cv_ld64_macos_version_min=1 |
| 97 | + fi |
| 98 | + elif test -x "$gcc_cv_ld" -a "$darwin_try_test" -eq 1; then |
| 99 | + # If the version was not specified, try to find it. |
| 100 | +@@ -32788,6 +32790,15 @@ $as_echo_n "checking linker for -platform_version support... " >&6; } |
| 101 | + fi |
| 102 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_platform_version" >&5 |
| 103 | + $as_echo "$gcc_cv_ld64_platform_version" >&6; } |
| 104 | ++ |
| 105 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker for -macos_version_min" >&5 |
| 106 | ++$as_echo_n "checking linker for -macos_version_min... " >&6; } |
| 107 | ++ gcc_cv_ld64_macos_version_min=1 |
| 108 | ++ if $gcc_cv_ld -macos_version_min 10.5 < /dev/null 2>&1 | grep 'unknown option' > /dev/null; then |
| 109 | ++ gcc_cv_ld64_macos_version_min=0 |
| 110 | ++ fi |
| 111 | ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_ld64_macos_version_min" >&5 |
| 112 | ++$as_echo "$gcc_cv_ld64_macos_version_min" >&6; } |
| 113 | + fi |
| 114 | + |
| 115 | + if test x"${gcc_cv_ld64_version}" != x; then |
| 116 | +@@ -32815,6 +32826,12 @@ cat >>confdefs.h <<_ACEOF |
| 117 | + #define LD64_HAS_PLATFORM_VERSION $gcc_cv_ld64_platform_version |
| 118 | + _ACEOF |
| 119 | + |
| 120 | ++ |
| 121 | ++ |
| 122 | ++cat >>confdefs.h <<_ACEOF |
| 123 | ++#define LD64_HAS_MACOS_VERSION_MIN $gcc_cv_ld64_macos_version_min |
| 124 | ++_ACEOF |
| 125 | ++ |
| 126 | + fi |
| 127 | + |
| 128 | + if test x"$dsymutil_flag" = x"yes"; then |
| 129 | +diff --git a/gcc/configure.ac b/gcc/configure.ac |
| 130 | +index e12a237ea118..60309421cd1a 100644 |
| 131 | +--- a/gcc/configure.ac |
| 132 | ++++ b/gcc/configure.ac |
| 133 | +@@ -6426,6 +6426,7 @@ if test x"$ld64_flag" = x"yes"; then |
| 134 | + # Set defaults for possibly untestable items. |
| 135 | + gcc_cv_ld64_export_dynamic=0 |
| 136 | + gcc_cv_ld64_platform_version=0 |
| 137 | ++ gcc_cv_ld64_macos_version_min=0 |
| 138 | + gcc_cv_ld64_demangle=0 |
| 139 | + |
| 140 | + if test "$build" = "$host"; then |
| 141 | +@@ -6456,6 +6457,7 @@ if test x"$ld64_flag" = x"yes"; then |
| 142 | + fi |
| 143 | + if test "$gcc_cv_ld64_major" -ge 512; then |
| 144 | + gcc_cv_ld64_platform_version=1 |
| 145 | ++ gcc_cv_ld64_macos_version_min=1 |
| 146 | + fi |
| 147 | + elif test -x "$gcc_cv_ld" -a "$darwin_try_test" -eq 1; then |
| 148 | + # If the version was not specified, try to find it. |
| 149 | +@@ -6486,6 +6488,13 @@ if test x"$ld64_flag" = x"yes"; then |
| 150 | + gcc_cv_ld64_platform_version=0 |
| 151 | + fi |
| 152 | + AC_MSG_RESULT($gcc_cv_ld64_platform_version) |
| 153 | ++ |
| 154 | ++ AC_MSG_CHECKING(linker for -macos_version_min) |
| 155 | ++ gcc_cv_ld64_macos_version_min=1 |
| 156 | ++ if $gcc_cv_ld -macos_version_min 10.5 < /dev/null 2>&1 | grep 'unknown option' > /dev/null; then |
| 157 | ++ gcc_cv_ld64_macos_version_min=0 |
| 158 | ++ fi |
| 159 | ++ AC_MSG_RESULT($gcc_cv_ld64_macos_version_min) |
| 160 | + fi |
| 161 | + |
| 162 | + if test x"${gcc_cv_ld64_version}" != x; then |
| 163 | +@@ -6501,6 +6510,9 @@ if test x"$ld64_flag" = x"yes"; then |
| 164 | + |
| 165 | + AC_DEFINE_UNQUOTED(LD64_HAS_PLATFORM_VERSION, $gcc_cv_ld64_platform_version, |
| 166 | + [Define to 1 if ld64 supports '-platform_version'.]) |
| 167 | ++ |
| 168 | ++ AC_DEFINE_UNQUOTED(LD64_HAS_MACOS_VERSION_MIN, $gcc_cv_ld64_macos_version_min, |
| 169 | ++ [Define to 1 if ld64 supports '-macos_version_min'.]) |
| 170 | + fi |
| 171 | + |
| 172 | + if test x"$dsymutil_flag" = x"yes"; then |
0 commit comments