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

[Devang Patel]

Author: dpatel
Date: Wed Feb 17 11:51:50 2010
New Revision: 96482

URL: http://llvm.org/viewvc/llvm-project?rev=96482&view=rev
Log:
Revert 95790. It was reverted from mainline also because it broke self-hosting at -O0.

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=96482&r1=96481&r2=96482&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 17 11:51:50 2010
@@ -1361,15 +1361,7 @@
 {
   const char **type = &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 */
+  if (first_global_object_name
       || !TREE_PUBLIC (decl)
       || DECL_EXTERNAL (decl)
       || !DECL_NAME (decl)
@@ -1377,7 +1369,15 @@
 	  && (TREE_CODE (decl) != VAR_DECL
 	      || (DECL_COMMON (decl)
 		  && (DECL_INITIAL (decl) == 0
-		      || DECL_INITIAL (decl) == error_mark_node)))))
+		      || 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 */
     return;
 
   /* We win when global object is found, but it is useful to know about weak