[llvm-commits] [llvm-gcc-4.2] r46041 - in /llvm-gcc-4.2/trunk/gcc: config/darwin.h llvm-backend.cpp llvm.h objc/objc-act.c varasm.c

[Chris Lattner]

Author: lattner
Date: Tue Jan 15 19:15:26 2008
New Revision: 46041

URL: http://llvm.org/viewvc/llvm-project?rev=46041&view=rev
Log:
The final ultimate(?) fix for the silly objc .reference thing.  Instead of ignoring
them, we now queue them up as a file-scope inline asm block.  This allows us to 
emit the same directives as gcc.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.h
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
    llvm-gcc-4.2/trunk/gcc/llvm.h
    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
    llvm-gcc-4.2/trunk/gcc/varasm.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=46041&r1=46040&r2=46041&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Tue Jan 15 19:15:26 2008
@@ -920,7 +920,22 @@
 #undef  TARGET_ASM_RELOC_RW_MASK
 #define TARGET_ASM_RELOC_RW_MASK machopic_reloc_rw_mask
 
-
+/* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
+#define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME)			\
+    do {								\
+	 if (FILE) {							\
+           char Buffer[strlen(NAME)+30];				\
+           sprintf(Buffer, "\t.lazy_reference %s", NAME);		\
+	   if (MACHOPIC_INDIRECT)					\
+             sprintf(Buffer, "\t.lazy_reference %s", NAME);		\
+	   else								\
+             sprintf(Buffer, "\t.reference %s", NAME);			\
+          llvm_emit_file_scope_asm(Buffer);				\
+	 }                                                              \
+       } while (0)
+#else
+/* LLVM LOCAL end */
 #define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME)			\
     do {								\
 	 if (FILE) {							\
@@ -932,6 +947,8 @@
 	   fprintf (FILE, "\n");					\
 	 }                                                              \
        } while (0)
+/* LLVM LOCAL */
+#endif /*ENABLE_LLVM*/
 
 #define ASM_DECLARE_CLASS_REFERENCE(FILE,NAME)				\
     do {								\

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=46041&r1=46040&r2=46041&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Tue Jan 15 19:15:26 2008
@@ -1282,14 +1282,12 @@
 // llvm_emit_file_scope_asm - Emit the specified string as a file-scope inline
 // asm block.
 //
-void llvm_emit_file_scope_asm(tree string) {
-  if (TREE_CODE(string) == ADDR_EXPR)
-    string = TREE_OPERAND(string, 0);
+void llvm_emit_file_scope_asm(const char *string) {
   if (TheModule->getModuleInlineAsm().empty())
-    TheModule->setModuleInlineAsm(TREE_STRING_POINTER(string));
+    TheModule->setModuleInlineAsm(string);
   else
     TheModule->setModuleInlineAsm(TheModule->getModuleInlineAsm() + "\n" +
-                                  TREE_STRING_POINTER(string));
+                                  string);
 }
 
 

Modified: llvm-gcc-4.2/trunk/gcc/llvm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm.h?rev=46041&r1=46040&r2=46041&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm.h Tue Jan 15 19:15:26 2008
@@ -76,7 +76,7 @@
 /* llvm_emit_file_scope_asm - Emit the specified string as a file-scope inline
  * asm block.
  */
-void llvm_emit_file_scope_asm(union tree_node*);
+void llvm_emit_file_scope_asm(const char*);
 
 /* llvm_emit_typedef - Emit the specified TYPE_DECL if desired.
  */

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=46041&r1=46040&r2=46041&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Tue Jan 15 19:15:26 2008
@@ -18261,11 +18261,7 @@
 #ifdef ASM_DECLARE_UNRESOLVED_REFERENCE
   if (flag_next_runtime)
     {
-      /* LLVM LOCAL begin - radar 5681912 */
-#ifndef ENABLE_LLVM
       ASM_DECLARE_UNRESOLVED_REFERENCE (asm_out_file, string);
-#endif
-      /* LLVM LOCAL end - radar 5681912 */
       return;
     }
 #endif

Modified: llvm-gcc-4.2/trunk/gcc/varasm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/varasm.c?rev=46041&r1=46040&r2=46041&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/varasm.c (original)
+++ llvm-gcc-4.2/trunk/gcc/varasm.c Tue Jan 15 19:15:26 2008
@@ -1201,7 +1201,9 @@
 {
   /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
-  llvm_emit_file_scope_asm(string);
+  if (TREE_CODE(string) == ADDR_EXPR)
+    string = TREE_OPERAND(string, 0);
+  llvm_emit_file_scope_asm(TREE_STRING_POINTER(string));
   return;
 #endif
   /* LLVM LOCAL end */