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

[Bill Wendling]

Author: void
Date: Tue Apr 13 23:26:29 2010
New Revision: 101225

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

Modified:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/   (props changed)
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/gcc/llvm-convert.cpp

Propchange: llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 13 23:26:29 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101216

Modified: llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/gcc/llvm-convert.cpp?rev=101225&r1=101224&r2=101225&view=diff
==============================================================================
--- llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/tags/Apple/llvmgcc42-2327.1/gcc/llvm-convert.cpp Tue Apr 13 23:26:29 2010
@@ -2096,7 +2096,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) {
@@ -2131,6 +2131,7 @@
             CatchAll = new GlobalVariable(*TheModule, Init->getType(), true,
                                           GlobalVariable::LinkOnceAnyLinkage,
                                           Init, ".llvm.eh.catch.all.value");
+            CatchAll->setSection("llvm.metadata");
           }
 
           Args.push_back(CatchAll);
@@ -2173,6 +2174,7 @@
             CatchAll = new GlobalVariable(*TheModule, Init->getType(), true,
                                           GlobalVariable::LinkOnceAnyLinkage,
                                           Init, ".llvm.eh.catch.all.value");
+            CatchAll->setSection("llvm.metadata");
           }
 
           Args.push_back(CatchAll);