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

[Bill Wendling]

Author: void
Date: Tue Apr 13 23:00:26 2010
New Revision: 101219

URL: http://llvm.org/viewvc/llvm-project?rev=101219&view=rev
Log:
Merge r101216 into 2326.6.

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/   (props changed)
      - copied from r101200, llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.6/
Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/gcc/llvm-convert.cpp

Propchange: llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Apr 13 23:00:26 2010
@@ -0,0 +1 @@
+/llvm-gcc-4.2/trunk:98728,98841,98893,99305,99592-99593,100134,100149-100150,101216

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/gcc/llvm-convert.cpp?rev=101219&r1=101200&r2=101219&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2326.7/gcc/llvm-convert.cpp Tue Apr 13 23:00:26 2010
@@ -2090,7 +2090,7 @@
     foreach_reachable_handler(i, false, AddHandler, &Handlers);
 
     bool HasCleanup = false;
-    static Value *CatchAll = 0;
+    static GlobalVariable *CatchAll = 0;
 
     for (std::vector<struct eh_region *>::iterator I = Handlers.begin(),
          E = Handlers.end(); I != E; ++I) {
@@ -2125,6 +2125,7 @@
             CatchAll = new GlobalVariable(*TheModule, Init->getType(), true,
                                           GlobalVariable::LinkOnceAnyLinkage,
                                           Init, ".llvm.eh.catch.all.value");
+            CatchAll->setSection("llvm.metadata");
           }
 
           Args.push_back(CatchAll);
@@ -2167,6 +2168,7 @@
             CatchAll = new GlobalVariable(*TheModule, Init->getType(), true,
                                           GlobalVariable::LinkOnceAnyLinkage,
                                           Init, ".llvm.eh.catch.all.value");
+            CatchAll->setSection("llvm.metadata");
           }
 
           Args.push_back(CatchAll);