[llvm-branch-commits] [llvm-gcc-tag] r100203 - in /llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5: ./ gcc/llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Fri Apr  2 13:44:54 2010
New Revision: 100203

URL: http://llvm.org/viewvc/llvm-project?rev=100203&view=rev
Log:
Create llvmgcc42-2326.5, which is llvmgcc42-2326.3 plus a fix for 471.omnetpp.

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/   (props changed)
      - copied from r100160, llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.3/
Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/gcc/llvm-convert.cpp

Propchange: llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Apr  2 13:44:54 2010
@@ -0,0 +1 @@
+/llvm-gcc-4.2/trunk:98728,98841,98893,99305,99592-99593,100134,100149-100150

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/gcc/llvm-convert.cpp?rev=100203&r1=100160&r2=100203&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.5/gcc/llvm-convert.cpp Fri Apr  2 13:44:54 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");
           }