svn commit: r264214 - in stable/10: contrib/gcc sys/sys

[Pedro F. Giffuni]

Author: pfg
Date: Mon Apr  7 01:55:54 2014
New Revision: 264214
URL: http://svnweb.freebsd.org/changeset/base/264214

Log:
  MFC	r264121;
  gcc: define __block when block support is enabled
  
  This mimics the behaviour in clang and lets us build cleanly
  the libdispatch port on platforms where the base gcc is still
  the default compiler.
  
  Bump __FreeBSD_version for ports.
  
  Tested by:	theraven

Modified:
  stable/10/contrib/gcc/c-cppbuiltin.c
  stable/10/sys/sys/param.h

Modified: stable/10/contrib/gcc/c-cppbuiltin.c
==============================================================================
--- stable/10/contrib/gcc/c-cppbuiltin.c	Mon Apr  7 01:55:53 2014	(r264213)
+++ stable/10/contrib/gcc/c-cppbuiltin.c	Mon Apr  7 01:55:54 2014	(r264214)
@@ -504,7 +504,10 @@ c_cpp_builtins (cpp_reader *pfile)
   /* APPLE LOCAL begin blocks */
   /* APPLE LOCAL radar 5868913 */
   if (flag_blocks)
-    cpp_define (pfile, "__BLOCKS__=1");
+    {
+      cpp_define (pfile, "__block=__attribute__((__blocks__(byref)))");
+      cpp_define (pfile, "__BLOCKS__=1");
+    }
   /* APPLE LOCAL end blocks */
   if (optimize_size)
     cpp_define (pfile, "__OPTIMIZE_SIZE__");

Modified: stable/10/sys/sys/param.h
==============================================================================
--- stable/10/sys/sys/param.h	Mon Apr  7 01:55:53 2014	(r264213)
+++ stable/10/sys/sys/param.h	Mon Apr  7 01:55:54 2014	(r264214)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1000705	/* Master, propagated to newvers */
+#define __FreeBSD_version 1000706	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,