Finalise fixes for Yosemite

Package-Manager: portage-2.2.14_rc1-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

1 files changed, 14 insertions, 14 deletions

diff --git a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch
index d33d66d7ffbe..a06c78365578 100644
--- a/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch
+++ b/sys-devel/gcc-apple/files/gcc-apple-4.2.1_p5666-darwin14.patch
@@ -4,17 +4,16 @@ encode everything from Darwin 14 and up as 10.9.
 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 @@ Lift some seemingly arbitrary restriction for Darwin 14 and up.
      }
    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 @@ Lift some seemingly arbitrary restriction for Darwin 14 and up.
  /* 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, '.');