Fix problems linking against the reoptimizer; _llvm_regAllocState must have

externally-visible linkage, and SaveStateToModule must default to true for llc.
I don't remember why I made it const; perhaps it should be deconstified.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9858 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
index fd615545f234d4db45fc7adc980d73e5aa233bc7..99917cdf0b46918d24a179a05e1871dd22e1640b 100644 (file)
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
@@ -53,7 +53,7 @@ RegAllocDebugLevel_t DEBUG_RA;
 /// allocator's state after it has done its job. This is a hack.
 ///
 PhyRegAlloc::SavedStateMapTy ExportedFnAllocState;
-const bool SaveStateToModule = false;
+const bool SaveStateToModule = true;
 
 static cl::opt<RegAllocDebugLevel_t, true>
 DRA_opt("dregalloc", cl::Hidden, cl::location(DEBUG_RA),
@@ -1286,7 +1286,7 @@ bool PhyRegAlloc::doFinalization (Module &M) {
   std::vector<Constant *> CV2;
   CV2.push_back (ConstantUInt::get (Type::UIntTy, Size));
   CV2.push_back (ConstantArray::get (AT2, allstate));
-  new GlobalVariable (ST2, true, GlobalValue::InternalLinkage,
+  new GlobalVariable (ST2, true, GlobalValue::ExternalLinkage,
                       ConstantStruct::get (ST2, CV2), "_llvm_regAllocState",
                       &M);
   return false; // No error.

diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
index fd615545f234d4db45fc7adc980d73e5aa233bc7..99917cdf0b46918d24a179a05e1871dd22e1640b 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
+++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
@@ -53,7 +53,7 @@ RegAllocDebugLevel_t DEBUG_RA;
 /// allocator's state after it has done its job. This is a hack.
 ///
 PhyRegAlloc::SavedStateMapTy ExportedFnAllocState;
-const bool SaveStateToModule = false;
+const bool SaveStateToModule = true;
 
 static cl::opt<RegAllocDebugLevel_t, true>
 DRA_opt("dregalloc", cl::Hidden, cl::location(DEBUG_RA),
@@ -1286,7 +1286,7 @@ bool PhyRegAlloc::doFinalization (Module &M) {
   std::vector<Constant *> CV2;
   CV2.push_back (ConstantUInt::get (Type::UIntTy, Size));
   CV2.push_back (ConstantArray::get (AT2, allstate));
-  new GlobalVariable (ST2, true, GlobalValue::InternalLinkage,
+  new GlobalVariable (ST2, true, GlobalValue::ExternalLinkage,
                       ConstantStruct::get (ST2, CV2), "_llvm_regAllocState",
                       &M);
   return false; // No error.