public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sys-devel/gcc-apple/files: gcc-apple-4.2.1_p5666-darwin14.patch
@ 2014-10-19 19:03 Fabian Groffen (grobian)
  0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2014-10-19 19:03 UTC (permalink / raw
  To: gentoo-commits

grobian     14/10/19 19:03:50

  Added:                gcc-apple-4.2.1_p5666-darwin14.patch
  Log:
  First steps towards support for OS X Yosemite
  
  (Portage version: 2.2.14_rc1-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

Revision  Changes    Path
1.1                  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.1&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.1&content-type=text/plain

Index: gcc-apple-4.2.1_p5666-darwin14.patch
===================================================================
Darwin 14 is 10.10, but the encoding scheme doesn't allow this, so
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 @@
   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 */
+	  } else {
       if (darwin_macosx_version_min[4] != '.')
 	goto fail;
       if (! ISDIGIT (darwin_macosx_version_min[5]))
@@ -952,6 +956,7 @@
       if (darwin_macosx_version_min[6] != '\0')
 	goto fail;
       result[3] = darwin_macosx_version_min[5];
+	  }
     }
   else
     result[3] = '0';
--- gcc/libgcov.c
+++ gcc/libgcov.c
@@ -34,6 +34,14 @@
 #include "coretypes.h"
 #include "tm.h"
 
+/* to deal with XBC headers from 10.10 */
+#ifndef __has_extension
+#define __has_extension(x) 0
+#endif
+#ifndef __has_feature
+#define __has_feature(x) 0
+#endif
+
 /* 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, '.');





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-devel/gcc-apple/files: gcc-apple-4.2.1_p5666-darwin14.patch
@ 2014-10-21 18:55 Fabian Groffen (grobian)
  0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2014-10-21 18:55 UTC (permalink / raw
  To: gentoo-commits

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, '.');





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sys-devel/gcc-apple/files: gcc-apple-4.2.1_p5666-darwin14.patch
@ 2015-01-31 16:15 Fabian Groffen (grobian)
  0 siblings, 0 replies; 3+ messages in thread
From: Fabian Groffen (grobian) @ 2015-01-31 16:15 UTC (permalink / raw
  To: gentoo-commits

grobian     15/01/31 16:15:23

  Modified:             gcc-apple-4.2.1_p5666-darwin14.patch
  Log:
  Update darwin14 patch with much better approach by Michael Weisner, not revbumping because darwin14 bootstrapping should be broken anyway
  
  (Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

Revision  Changes    Path
1.3                  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.3&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.3&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.2&r2=1.3

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc-apple-4.2.1_p5666-darwin14.patch	21 Oct 2014 18:55:02 -0000	1.2
+++ gcc-apple-4.2.1_p5666-darwin14.patch	31 Jan 2015 16:15:23 -0000	1.3
@@ -1,43 +1,16 @@
-Darwin 14 is 10.10, but the encoding scheme doesn't allow this, so
-encode everything from Darwin 14 and up as 10.9.
+https://537826.bugs.gentoo.org/attachment.cgi?id=394896
+https://bugs.gentoo.org/show_bug.cgi?id=537826
+Michael Weiser
 
-Darwin 14 has some newer preprocessor stuff in its headers, work around
-that.
+Backport of https://gcc.gnu.org/viewcvs/gcc?view=revision&revision=218873 (as
+per https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61407) to correctly encode Mac
+OS X versions >10.9 into __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__.
+Extended to also encode patch level the way clang and Apple GCC 4.2.1 do.
+
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810 has a much more generic
+patch. But it's not yet in-tree pending legal paperwork. Once that's done, we
+can backport that.
 
---- gcc/config/darwin-c.c
-+++ gcc/config/darwin-c.c
-@@ -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;
-       if (! ISDIGIT (darwin_macosx_version_min[5]))
-@@ -952,6 +956,7 @@
-       if (darwin_macosx_version_min[6] != '\0')
- 	goto fail;
-       result[3] = darwin_macosx_version_min[5];
-+	  }
-     }
-   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 @@
@@ -55,3 +28,121 @@
  /* 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.orig	2010-10-14 22:27:53.000000000 +0200
++++ gcc/config/darwin-driver.c	2015-01-25 21:15:09.000000000 +0100
+@@ -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, '.');
+--- gcc/config/darwin-c.c.orig	2015-01-25 19:44:40.000000000 +0100
++++ gcc/config/darwin-c.c	2015-01-25 21:05:47.000000000 +0100
+@@ -930,31 +930,91 @@
+ 
+ /* Return the value of darwin_macosx_version_min suitable for the
+    __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
+-   so '10.4.2' becomes 1042.
++   so '10.4.2' becomes 1042 and '10.10.2' becomes 101002.
++   Cap patch level to 9 in the old format.
+    Print a warning if the version number is not known.  */
+ static const char *
+ /* APPLE LOCAL ARM 5683689 */
+ macosx_version_as_macro (void)
+ {
+-  static char result[] = "1000";
++  static char result[7] = "1000";
++  int inputindex = 3, outputindex = 2;
+ 
++  /* make sure version starts with "10." - makes sure we can safely start
++   * parsing at inputindex == 3 */
+   if (strncmp (darwin_macosx_version_min, "10.", 3) != 0)
+     goto fail;
++
++  /* first character of minor version needs to be digit */
+   if (! ISDIGIT (darwin_macosx_version_min[3]))
+     goto fail;
+-  result[2] = darwin_macosx_version_min[3];
+-  if (darwin_macosx_version_min[4] != '\0')
++
++  result[outputindex++] = darwin_macosx_version_min[inputindex++];
++
++  if (ISDIGIT (darwin_macosx_version_min[inputindex])) {
++    /* Starting with OS X 10.10, the macro ends '00' rather than '0',
++       i.e. 10.10.x becomes 101000 rather than 10100.  */
++    result[outputindex++] = darwin_macosx_version_min[inputindex++];
++    result[4] = '0';
++    result[5] = '0';
++    result[6] = '\0';
++  }
++
++  /* if we're out of input, leave patch level at 0 or 00 and finish */
++  if (darwin_macosx_version_min[inputindex] == '\0')
++    return result;
++
++  /* a dot *must* follow now */
++  if (darwin_macosx_version_min[inputindex++] != '.')
++     goto fail;
++
++  /* a digit must follow after the dot */
++  if (! ISDIGIT (darwin_macosx_version_min[inputindex]))
++     goto fail;
++
++  /* old-style macro */
++  if (outputindex == 3)
++  {
++    /* one-digit patch level */
++    if (darwin_macosx_version_min[inputindex + 1] == '\0')
+     {
+-      if (darwin_macosx_version_min[4] != '.')
+-	goto fail;
+-      if (! ISDIGIT (darwin_macosx_version_min[5]))
+-	goto fail;
+-      if (darwin_macosx_version_min[6] != '\0')
+-	goto fail;
+-      result[3] = darwin_macosx_version_min[5];
++      result[outputindex] = darwin_macosx_version_min[inputindex];
++      return result;
+     }
+-  else
+-    result[3] = '0';
++
++    inputindex++;
++    if (! ISDIGIT (darwin_macosx_version_min[inputindex++]))
++      goto fail;
++
++    /* three digits? */
++    if (darwin_macosx_version_min[inputindex] != '\0')
++      goto fail;
++
++    /* no room for another digit. Traditional Apple GCC 4.2.1 doesn't accept
++     * it but current clang caps it to 9. We choose to be in line with clang. */
++    result[outputindex] = '9';
++    return result;
++  }
++
++  /* new-style macro */
++
++  /* leave a leading zero if only one digit is following */
++  if (darwin_macosx_version_min[inputindex + 1] == '\0') {
++    result[outputindex + 1] = darwin_macosx_version_min[inputindex];
++    return result;
++  }
++
++  result[outputindex++] = darwin_macosx_version_min[inputindex++];
++
++  /* a digit must follow now */
++  if (! ISDIGIT (darwin_macosx_version_min[inputindex]))
++     goto fail;
++
++  result[outputindex] = darwin_macosx_version_min[inputindex++];
++
++  /* no more input allowed */
++  if (darwin_macosx_version_min[inputindex] != '\0')
++    goto fail;
+ 
+   return result;
+ 





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-01-31 16:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-21 18:55 [gentoo-commits] gentoo-x86 commit in sys-devel/gcc-apple/files: gcc-apple-4.2.1_p5666-darwin14.patch Fabian Groffen (grobian)
  -- strict thread matches above, loose matches on Subject: below --
2015-01-31 16:15 Fabian Groffen (grobian)
2014-10-19 19:03 Fabian Groffen (grobian)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox