[llvm-commits] [llvm-gcc-4.2] r55671 - /llvm-gcc-4.2/trunk/gcc/config/darwin-c.c

[Bill Wendling]

Author: void
Date: Tue Sep  2 17:10:46 2008
New Revision: 55671

URL: http://llvm.org/viewvc/llvm-project?rev=55671&view=rev
Log:
Fix #pragma unused () parsing. Add __block=

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin-c.c

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin-c.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin-c.c?rev=55671&r1=55670&r2=55671&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin-c.c Tue Sep  2 17:10:46 2008
@@ -338,10 +338,12 @@
   tree decl, x;
   int tok;
 
-  if (pragma_lex (&x) != CPP_OPEN_PAREN)
+  /* APPLE LOCAL 5979888 */
+  if ((tok=pragma_lex (&x)) != CPP_OPEN_PAREN)
     BAD ("missing '(' after '#pragma unused', ignoring");
 
-  while (1)
+  /* APPLE LOCAL 5979888 */
+  while (tok != CPP_EOF && tok != CPP_CLOSE_PAREN)
     {
       tok = pragma_lex (&decl);
       if (tok == CPP_NAME && decl)
@@ -1083,12 +1085,14 @@
     }
   /* APPLE LOCAL end ObjC GC */
   /* APPLE LOCAL begin radar 5932809 - copyable byref blocks */
-  if (flag_blocks && !c_dialect_cxx ()) {
+  if (flag_blocks) {
     /* APPLE LOCAL radar 6096219 */
     builtin_define ("__byref=__attribute__((__blocks__(byref)))");
+    builtin_define ("__block=__attribute__((__blocks__(byref)))");
   }
   else {
     builtin_define ("__byref=");
+    builtin_define ("__block=");
   }
   /* APPLE LOCAL end radar 5932809 - copyable byref blocks */