[llvm-commits] [llvm-gcc-4.2] r46668 - /llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

[Chris Lattner]

Author: lattner
Date: Sat Feb  2 12:55:42 2008
New Revision: 46668

URL: http://llvm.org/viewvc/llvm-project?rev=46668&view=rev
Log:
correctly protect llvm-specific pieces with ENABLE_LLVM, fixing the non-llvm 
build.

Modified:
    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c

Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: 
http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=46668&r1=46667&r2=46668&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Sat Feb  2 12:55:42 2008
@@ -9339,6 +9339,7 @@
                                             UOBJC_PROTOCOL_EXT_decl, 
NULL_TREE);
       /* APPLE LOCAL end radar 4585769 - Objective-C 1.0 extensions */
       /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
       /* Force 4 byte alignment for protocols */
       DECL_ALIGN(decl) = 32;
       DECL_USER_ALIGN(decl) = 1;
@@ -9346,6 +9347,7 @@
       /* At -O0, we may have emitted references to the decl earlier. */
       if (!optimize)
         reset_initializer_llvm(decl);
+#endif
       /* LLVM LOCAL end */
     }
 }
@@ -12270,9 +12272,11 @@
 
   finish_var_decl (class_decl, initlist);
   /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
   /* At -O0, we may have emitted references to the decl earlier. */
   if (!optimize)
     reset_type_and_initializer_llvm(class_decl);
+#endif
   /* LLVM LOCAL end */
   objc_add_to_class_list_chain (class_decl);
   if (CLASS_OR_CATEGORY_HAS_LOAD_IMPL (objc_implementation_context) != 
NULL_TREE)
@@ -13639,9 +13643,11 @@
                                             /* APPLE LOCAL end radar 4695109 */
       finish_var_decl (decl, initlist);
       /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
       /* At -O0, we may have emitted references to the decl earlier. */
       if (!optimize)
         reset_initializer_llvm(decl);
+#endif
       /* LLVM LOCAL end */
       /* APPLE LOCAL radar 4533974 - ObjC new protocol */
       objc_add_to_protocol_list_chain (decl);


_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits