OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR target/80204 (macosx-version-min wrong for macOS Sierra 10.12.3)

Browse Source 
PR target/80204
	* config/darwin-driver.c (darwin_find_version_from_kernel): Eliminate
	calculation of the minor version, always output as 0.

From-SVN: r252029
This commit is contained in:
Simon Wright 2017-09-12 15:29:16 +00:00 committed by Jeff Law
parent cbc45bea5f
commit 7d843469d5
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2017-09-02 Simon Wright <simon@pushface.org>
PR target/80204
* config/darwin-driver.c (darwin_find_version_from_kernel): Eliminate
calculation of the minor version, always output as 0.
2017-09-12 Jakub Jelinek <jakub@redhat.com>
PR target/82112

16
gcc/config/darwin-driver.c
View File

@ -37,9 +37,7 @@ darwin_find_version_from_kernel (void)
size_t osversion_len = sizeof (osversion) - 1;
static int osversion_name[2] = { CTL_KERN, KERN_OSRELEASE };
int major_vers;
char minor_vers[6];
char * version_p;
char * version_pend;
char * new_flag;
/* Determine the version of the running OS. If we can't, warn user,
@ -61,13 +59,6 @@ darwin_find_version_from_kernel (void)
major_vers = major_vers * 10 + (*version_p++ - '0');
if (*version_p++ != '.')
goto parse_failed;
version_pend = strchr(version_p, '.');
if (!version_pend)
goto parse_failed;
if (! ISDIGIT (*version_p))
goto parse_failed;
strncpy(minor_vers, version_p, version_pend - version_p);
minor_vers[version_pend - version_p] = '\0';
/* The major kernel version number is 4 plus the second OS version
component. */
@ -77,7 +68,11 @@ darwin_find_version_from_kernel (void)
FIXME: we should not assume this - a newer linker could be used. */
asprintf (&new_flag, "10.%d", major_vers - 4);
else
asprintf (&new_flag, "10.%d.%s", major_vers - 4, minor_vers);
/* Although the newer linker supports three-component system
versions, there's no guarantee that the minor version component
of the kernel and the system are the same. Apple's clang always
uses 0 as the minor version: do the same. */
asprintf (&new_flag, "10.%d.0", major_vers - 4);
return new_flag;
@ -86,7 +81,6 @@ darwin_find_version_from_kernel (void)
(int) osversion_len, osversion);
return NULL;
}
#endif
/* When running on a Darwin system and using that system's headers and