Skip to content

Commit add1ada

Browse files
simonjwrightiains
authored andcommitted
Darwin: Truncate kernel-provided version to OS major for Darwin >= 20.
In common with system tools, GCC uses a version obtained from the kernel as the prevailing macOS target, when that is not overridden by command line or environment versions (i.e. mmacosx-version-min=, MACOSX_DEPLOYMENT_TARGET). Presently, GCC assumes that if the OS version is >= 20, the value used should include both major and minium version identifiers. However the system tools (for those versions) truncate the value to the major version - this leads to link errors when combining objects built with clang and GCC for example: ld: warning: object file (null.o) was built for newer macOS version (12.2) than being linked (12.0) The change here truncates the values GCC uses to the major version. gcc/ChangeLog: PR target/104871 * config/darwin-driver.cc (darwin_find_version_from_kernel): If the OS version is darwin20 (macOS 11) or greater, truncate the version to the major number.
1 parent 6725f18 commit add1ada

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

gcc/config/darwin-driver.cc

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,13 @@ darwin_find_version_from_kernel (void)
160160
goto parse_failed;
161161

162162
/* Darwin20 sees a transition to macOS 11. In this, it seems that the
163-
mapping to macOS minor version is now shifted to the kernel minor
164-
version - 1 (at least for the initial releases). */
163+
mapping to macOS minor version and patch level is now always 0, 0
164+
(at least for macOS 11 and 12). */
165165
if (major_vers >= 20)
166166
{
167-
int minor_vers = *version_p++ - '0';
168-
if (ISDIGIT (*version_p))
169-
minor_vers = minor_vers * 10 + (*version_p++ - '0');
170-
if (*version_p++ != '.')
171-
goto parse_failed;
172-
if (minor_vers > 0)
173-
minor_vers -= 1; /* Kernel 20.3 => macOS 11.2. */
174-
/* It's not yet clear whether patch level will be considered. */
175-
asprintf (&new_flag, "%d.%02d.00", major_vers - 9, minor_vers);
167+
/* Apple clang doesn't include the minor version or the patch level
168+
in the object file, nor does it pass it to ld */
169+
asprintf (&new_flag, "%d.00.00", major_vers - 9);
176170
}
177171
else if (major_vers - 4 <= 4)
178172
/* On 10.4 and earlier, the old linker is used which does not

0 commit comments

Comments
 (0)