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

[Bill Wendling]

Author: void
Date: Thu Jan 24 15:00:50 2008
New Revision: 46324

URL: http://llvm.org/viewvc/llvm-project?rev=46324&view=rev
Log:
Don't output these directives for the new ObjC ABI.

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

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=46324&r1=46323&r2=46324&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Thu Jan 24 15:00:50 2008
@@ -954,7 +954,7 @@
 #define ASM_DECLARE_CLASS_REFERENCE(FILE,NAME)                          \
   do {                                                                  \
     if (FILE) {                                                         \
-      char *Buffer = alloca(strlen(NAME)+30);                           \
+      char *Buffer = alloca(strlen(NAME) + 30);                         \
       sprintf(Buffer, "\t%s=0", NAME);                                  \
       llvm_emit_file_scope_asm(Buffer);                                 \
       sprintf(Buffer, "\t.globl %s", NAME);                             \

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=46324&r1=46323&r2=46324&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Thu Jan 24 15:00:50 2008
@@ -18412,7 +18412,12 @@
 #ifdef ASM_DECLARE_CLASS_REFERENCE
   if (flag_next_runtime)
     {
-      ASM_DECLARE_CLASS_REFERENCE (asm_out_file, string);
+      /* LLVM LOCAL begin - radar 5702446 */
+#ifdef ENABLE_LLVM
+      if (flag_objc_abi != 2)
+#endif
+      /* LLVM LOCAL end - radar 5702446 */
+        ASM_DECLARE_CLASS_REFERENCE (asm_out_file, string);
       return;
     }
   else