From owner-svn-src-head@FreeBSD.ORG  Fri Apr  4 15:49:23 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EA296CDB;
 Fri,  4 Apr 2014 15:49:23 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D7998E7F;
 Fri,  4 Apr 2014 15:49:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s34FnNmu060955;
 Fri, 4 Apr 2014 15:49:23 GMT (envelope-from pfg@svn.freebsd.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s34FnNQd060953;
 Fri, 4 Apr 2014 15:49:23 GMT (envelope-from pfg@svn.freebsd.org)
Message-Id: <201404041549.s34FnNQd060953@svn.freebsd.org>
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Fri, 4 Apr 2014 15:49:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r264121 - in head: contrib/gcc sys/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Apr 2014 15:49:24 -0000

Author: pfg
Date: Fri Apr  4 15:49:23 2014
New Revision: 264121
URL: http://svnweb.freebsd.org/changeset/base/264121

Log:
  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
  MFC after:	3 days

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

Modified: head/contrib/gcc/c-cppbuiltin.c
==============================================================================
--- head/contrib/gcc/c-cppbuiltin.c	Fri Apr  4 15:31:57 2014	(r264120)
+++ head/contrib/gcc/c-cppbuiltin.c	Fri Apr  4 15:49:23 2014	(r264121)
@@ -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: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Fri Apr  4 15:31:57 2014	(r264120)
+++ head/sys/sys/param.h	Fri Apr  4 15:49:23 2014	(r264121)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100016	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100017	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,