summaryrefslogtreecommitdiffstats
path: root/contrib/gcc
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2014-04-07 01:55:54 +0000
committerpfg <pfg@FreeBSD.org>2014-04-07 01:55:54 +0000
commitf0fa402e84d9cbbf682051cf69ad5fb25011eb13 (patch)
tree20efae5f531049f4e26f5c8c9cdeea3194636bd9 /contrib/gcc
parent0a0ec7aed42f294456f40beebb14c8d18cc41dd9 (diff)
downloadFreeBSD-src-f0fa402e84d9cbbf682051cf69ad5fb25011eb13.zip
FreeBSD-src-f0fa402e84d9cbbf682051cf69ad5fb25011eb13.tar.gz
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
Diffstat (limited to 'contrib/gcc')
-rw-r--r--contrib/gcc/c-cppbuiltin.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/gcc/c-cppbuiltin.c b/contrib/gcc/c-cppbuiltin.c
index 6dd6e18..6b65cdf 100644
--- a/contrib/gcc/c-cppbuiltin.c
+++ b/contrib/gcc/c-cppbuiltin.c
@@ -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__");
OpenPOWER on IntegriCloud