[llvm-branch-commits] [llvm-gcc-branch] r99651 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c

[Bill Wendling]

Author: void
Date: Fri Mar 26 15:37:11 2010
New Revision: 99651

URL: http://llvm.org/viewvc/llvm-project?rev=99651&view=rev
Log:
$ svn merge -c 99629 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r99629 into '.':
U    gcc/gimplify.c


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c?rev=99651&r1=99650&r2=99651&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/gimplify.c Fri Mar 26 15:37:11 2010
@@ -3097,9 +3097,16 @@
 		TREE_STATIC (new) = 1;
 		TREE_READONLY (new) = 1;
                 /* LLVM LOCAL begin */
+                /* On Darwin, we can't emit temporaries like this with private
+                 * linkage, because it breaks 'atomization' of stuff in the
+                 * object file by the linker.  We need to emit this as a l label
+                 * without .globl.
+                 */
+#ifndef CONFIG_DARWIN_H
 #ifdef ENABLE_LLVM
 		DECL_LLVM_PRIVATE (new) = 1;
 #endif
+#endif
                 /* LLVM LOCAL end */
 		DECL_INITIAL (new) = ctor;
 		if (align > DECL_ALIGN (new))