[llvm-branch-commits] [llvm-gcc-branch] r100150 - /llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Thu Apr  1 18:10:06 2010
New Revision: 100150

URL: http://llvm.org/viewvc/llvm-project?rev=100150&view=rev
Log:
$ svn merge -c 100149 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r100149 into '.':
U    gcc/llvm-convert.cpp


Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp?rev=100150&r1=100149&r2=100150&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-convert.cpp Thu Apr  1 18:10:06 2010
@@ -2165,7 +2165,7 @@
               Init = cast<Constant>(Emit(catch_all_type, 0));
 
             CatchAll = new GlobalVariable(*TheModule, Init->getType(), true,
-                                          GlobalVariable::PrivateLinkage,
+                                          GlobalVariable::LinkOnceAnyLinkage,
                                           Init, ".llvm.eh.catch.all.value");
           }