[llvm-commits] [llvm-gcc-4.2] r54278 - in /llvm-gcc-4.2/trunk/gcc/config: darwin-c.c darwin.h

[Bill Wendling]

Author: void
Date: Sat Aug  2 23:05:06 2008
New Revision: 54278

URL: http://llvm.org/viewvc/llvm-project?rev=54278&view=rev
Log:
Use __byref instead of __block

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

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=54278&r1=54277&r2=54278&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin-c.c Sat Aug  2 23:05:06 2008
@@ -1086,13 +1086,9 @@
   if (flag_blocks && !c_dialect_cxx ()) {
     /* APPLE LOCAL radar 6096219 */
     builtin_define ("__byref=__attribute__((__blocks__(byref)))");
-    /* APPLE LOCAL radar 6014138 */
-    builtin_define ("__block=__attribute__((__blocks__(byref)))");
   }
   else {
     builtin_define ("__byref=");
-    /* APPLE LOCAL radar 6014138 */
-    builtin_define ("__block=");
   }
   /* APPLE LOCAL end radar 5932809 - copyable byref blocks */
 

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Sat Aug  2 23:05:06 2008
@@ -1044,6 +1044,7 @@
        } while (0)
 #else
 /* LLVM LOCAL end */
+
 #define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME)			\
     do {								\
 	 if (FILE) {							\