commit d01f305c431947506343a8212bbb5de82c6a4dc2
author Bill Wendling <isanbard@gmail.com> Wed Apr 14 04:00:26 2010 +0000
committer Bill Wendling <isanbard@gmail.com> Wed Apr 14 04:00:26 2010 +0000
tree 09957f258c5186a33f40aff939b1245eeea0e966
parent 58abe189149f3abac0ebf4eedfed0d6ca814b40d

Merge r101216 into 2326.6.

llvm-svn: 101219

llvm-gcc-4.2/gcc/llvm-convert.cpp

diff --git a/llvm-gcc-4.2/gcc/llvm-convert.cpp b/llvm-gcc-4.2/gcc/llvm-convert.cpp
index b0450ce..e3f6296 100644
--- a/llvm-gcc-4.2/gcc/llvm-convert.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-convert.cpp
@@ -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);