4 files changed, 14 insertions, 13 deletions
diff --git a/lib/Analysis/AliasAnalysisCounter.cpp b/lib/Analysis/AliasAnalysisCounter.cpp
index 99b17661b2..9c42902a04 100644
--- a/lib/Analysis/AliasAnalysisCounter.cpp
+++ b/lib/Analysis/AliasAnalysisCounter.cpp
@@ -22,9 +22,9 @@
 using namespace llvm;
 
 namespace {
-  cl::opt<bool>
+  static cl::opt<bool>
   PrintAll("count-aa-print-all-queries", cl::ReallyHidden);
-  cl::opt<bool>
+  static cl::opt<bool>
   PrintAllFailures("count-aa-print-all-failed-queries", cl::ReallyHidden);
 
   class VISIBILITY_HIDDEN AliasAnalysisCounter 
diff --git a/lib/Analysis/AliasAnalysisEvaluator.cpp b/lib/Analysis/AliasAnalysisEvaluator.cpp
index c9865548ce..704ab8273c 100644
--- a/lib/Analysis/AliasAnalysisEvaluator.cpp
+++ b/lib/Analysis/AliasAnalysisEvaluator.cpp
@@ -35,16 +35,17 @@
 using namespace llvm;
 
 namespace {
-  cl::opt<bool> PrintAll("print-all-alias-modref-info", cl::ReallyHidden);
+  static cl::opt<bool>
+  PrintAll("print-all-alias-modref-info", cl::ReallyHidden);
 
-  cl::opt<bool> PrintNoAlias("print-no-aliases", cl::ReallyHidden);
-  cl::opt<bool> PrintMayAlias("print-may-aliases", cl::ReallyHidden);
-  cl::opt<bool> PrintMustAlias("print-must-aliases", cl::ReallyHidden);
+  static cl::opt<bool> PrintNoAlias("print-no-aliases", cl::ReallyHidden);
+  static cl::opt<bool> PrintMayAlias("print-may-aliases", cl::ReallyHidden);
+  static cl::opt<bool> PrintMustAlias("print-must-aliases", cl::ReallyHidden);
 
-  cl::opt<bool> PrintNoModRef("print-no-modref", cl::ReallyHidden);
-  cl::opt<bool> PrintMod("print-mod", cl::ReallyHidden);
-  cl::opt<bool> PrintRef("print-ref", cl::ReallyHidden);
-  cl::opt<bool> PrintModRef("print-modref", cl::ReallyHidden);
+  static cl::opt<bool> PrintNoModRef("print-no-modref", cl::ReallyHidden);
+  static cl::opt<bool> PrintMod("print-mod", cl::ReallyHidden);
+  static cl::opt<bool> PrintRef("print-ref", cl::ReallyHidden);
+  static cl::opt<bool> PrintModRef("print-modref", cl::ReallyHidden);
 
   class VISIBILITY_HIDDEN AAEval : public FunctionPass {
     unsigned NoAlias, MayAlias, MustAlias;
@@ -75,7 +76,7 @@ namespace {
   };
 
   char AAEval::ID = 0;
-  RegisterPass<AAEval>
+  static RegisterPass<AAEval>
   X("aa-eval", "Exhaustive Alias Analysis Precision Evaluator", false, true);
 }
 
diff --git a/lib/Analysis/MemoryDependenceAnalysis.cpp b/lib/Analysis/MemoryDependenceAnalysis.cpp
index 161c2fed1c..8a59c3a743 100644
--- a/lib/Analysis/MemoryDependenceAnalysis.cpp
+++ b/lib/Analysis/MemoryDependenceAnalysis.cpp
@@ -31,7 +31,7 @@ using namespace llvm;
 namespace {
   // Control the calculation of non-local dependencies by only examining the
   // predecessors if the basic block has less than X amount (50 by default).
-  cl::opt<int> 
+  static cl::opt<int> 
   PredLimit("nonlocaldep-threshold", cl::Hidden, cl::init(50),
             cl::desc("Control the calculation of non-local"
                      "dependencies (default = 50)"));           
diff --git a/lib/Analysis/ProfileInfoLoaderPass.cpp b/lib/Analysis/ProfileInfoLoaderPass.cpp
index 07d96821ab..e7612e1d82 100644
--- a/lib/Analysis/ProfileInfoLoaderPass.cpp
+++ b/lib/Analysis/ProfileInfoLoaderPass.cpp
@@ -24,7 +24,7 @@
 using namespace llvm;
 
 namespace {
-  cl::opt<std::string>
+  static cl::opt<std::string>
   ProfileInfoFilename("profile-info-file", cl::init("llvmprof.out"),
                       cl::value_desc("filename"),
                       cl::desc("Profile file loaded by -profile-loader"));