grobian 14/10/21 18:55:02 Modified: gcc-apple-4.2.1_p5666-darwin14.patch Log: Finalise fixes for Yosemite (Portage version: 2.2.14_rc1-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.2 sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch?r1=1.1&r2=1.2 Index: gcc-apple-4.2.1_p5666-darwin14.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcc-apple-4.2.1_p5666-darwin14.patch 19 Oct 2014 19:03:49 -0000 1.1 +++ gcc-apple-4.2.1_p5666-darwin14.patch 21 Oct 2014 18:55:02 -0000 1.2 @@ -4,17 +4,16 @@ Darwin 14 has some newer preprocessor stuff in its headers, work around that. -Lift some seemingly arbitrary restriction for Darwin 14 and up. - --- gcc/config/darwin-c.c +++ gcc/config/darwin-c.c -@@ -945,6 +945,10 @@ +@@ -945,6 +945,11 @@ result[2] = darwin_macosx_version_min[3]; if (darwin_macosx_version_min[4] != '\0') { + if (ISDIGIT(darwin_macosx_version_min[4])) + { + result[2] = '9'; /* latest version we can encode */ ++ result[3] = '0'; + } else { if (darwin_macosx_version_min[4] != '.') goto fail; @@ -27,6 +26,18 @@ } else result[3] = '0'; +--- gcc/config/darwin-driver.c ++++ gcc/config/darwin-driver.c +@@ -174,8 +174,8 @@ + version_p = osversion + 1; + if (ISDIGIT (*version_p)) + major_vers = major_vers * 10 + (*version_p++ - '0'); + if (major_vers > 4 + 9) +- goto parse_failed; ++ major_vers = 4 + 9; + if (*version_p++ != '.') + goto parse_failed; + version_pend = strchr(version_p, '.'); --- gcc/libgcov.c +++ gcc/libgcov.c @@ -34,6 +34,14 @@ @@ -44,14 +55,3 @@ /* APPLE LOCAL begin instant off 6414141 */ #if defined(__APPLE__) && !defined(__STATIC__) && !defined(__ppc__) && !defined(__ppc64__) && !defined(__arm__) #include <vproc.h> ---- gcc/config/darwin-driver.c -+++ gcc/config/darwin-driver.c -@@ -174,8 +174,6 @@ - version_p = osversion + 1; - if (ISDIGIT (*version_p)) - major_vers = major_vers * 10 + (*version_p++ - '0'); -- if (major_vers > 4 + 9) -- goto parse_failed; - if (*version_p++ != '.') - goto parse_failed; - version_pend = strchr(version_p, '.');
