summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Naroff <snaroff@apple.com>2008-09-02 18:04:36 +0000
committerSteve Naroff <snaroff@apple.com>2008-09-02 18:04:36 +0000
commitd450bffcf1be0c166938bd337b35ba4b8e3c6fd3 (patch)
tree2cb39f2224b7eb175174972bb14ecff13490bd32
parent61e0a821cc88388eaba911234577a4a21d85042f (diff)
downloadbcm5719-llvm-d450bffcf1be0c166938bd337b35ba4b8e3c6fd3.tar.gz
bcm5719-llvm-d450bffcf1be0c166938bd337b35ba4b8e3c6fd3.zip
Pull code from last commit. will put back soon.
llvm-svn: 55637
-rw-r--r--clang/lib/Lex/Preprocessor.cpp7
-rw-r--r--clang/test/Parser/block-block-storageclass.c3
2 files changed, 2 insertions, 8 deletions
diff --git a/clang/lib/Lex/Preprocessor.cpp b/clang/lib/Lex/Preprocessor.cpp
index 27c2e676e65..18b106ad841 100644
--- a/clang/lib/Lex/Preprocessor.cpp
+++ b/clang/lib/Lex/Preprocessor.cpp
@@ -476,13 +476,6 @@ static void InitializePredefinedMacros(Preprocessor &PP,
DefineBuiltinMacro(Buf, "__int64=long long");
DefineBuiltinMacro(Buf, "__declspec(X)=");
}
- if (PP.getLangOptions().Blocks) {
- DefineBuiltinMacro(Buf, "__byref=__attribute__((__blocks__(byref)))");
- DefineBuiltinMacro(Buf, "__block=__attribute__((__blocks__(byref)))");
- } else {
- DefineBuiltinMacro(Buf, "__byref=");
- DefineBuiltinMacro(Buf, "__block=");
- }
// FIXME: Should emit a #line directive here.
}
diff --git a/clang/test/Parser/block-block-storageclass.c b/clang/test/Parser/block-block-storageclass.c
index c15d731ec8c..c9be12f1f07 100644
--- a/clang/test/Parser/block-block-storageclass.c
+++ b/clang/test/Parser/block-block-storageclass.c
@@ -1,5 +1,5 @@
// RUN: clang -fsyntax-only -verify -parse-noop %s
-
+#if 0
#include <stdio.h>
void _Block_byref_release(void*src){}
@@ -16,3 +16,4 @@ int main() {
return X;
}
+#endif
OpenPOWER on IntegriCloud