[llvm-branch-commits] [llvm-gcc-branch] r95790 - /llvm-gcc-4.2/branches/Apple/Hermes/gcc/varasm.c

Devang Patel dpatel at apple.com
Wed Feb 10 11:05:41 PST 2010


Author: dpatel
Date: Wed Feb 10 13:05:41 2010
New Revision: 95790

URL: http://llvm.org/viewvc/llvm-project?rev=95790&view=rev
Log:
Merge 95604 from trunk.

Modified:
    llvm-gcc-4.2/branches/Apple/Hermes/gcc/varasm.c

Modified: llvm-gcc-4.2/branches/Apple/Hermes/gcc/varasm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Hermes/gcc/varasm.c?rev=95790&r1=95789&r2=95790&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Hermes/gcc/varasm.c (original)
+++ llvm-gcc-4.2/branches/Apple/Hermes/gcc/varasm.c Wed Feb 10 13:05:41 2010
@@ -1361,7 +1361,15 @@
 {
   const char **type = &first_global_object_name;
 
-  if (first_global_object_name
+  /* LLVM LOCAL begin */
+  if (
+#ifndef ENABLE_LLVM
+    !MEM_P (DECL_RTL (decl))
+#else
+    (DECL_LLVM (decl), 0)
+#endif
+    || first_global_object_name
+    /* LLVM LOCAL end */
       || !TREE_PUBLIC (decl)
       || DECL_EXTERNAL (decl)
       || !DECL_NAME (decl)
@@ -1369,15 +1377,7 @@
 	  && (TREE_CODE (decl) != VAR_DECL
 	      || (DECL_COMMON (decl)
 		  && (DECL_INITIAL (decl) == 0
-		      || DECL_INITIAL (decl) == error_mark_node))))
-      /* LLVM LOCAL begin */
-#ifndef ENABLE_LLVM
-      || !MEM_P (DECL_RTL (decl))
-#else
-      || (DECL_LLVM (decl), 0)
-#endif
-      )
-    /* LLVM LOCAL end */
+		      || DECL_INITIAL (decl) == error_mark_node)))))
     return;
 
   /* We win when global object is found, but it is useful to know about weak





More information about the llvm-branch-commits mailing list