Avoid #including CommandLine.h

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

diff --git a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
index dab6d3c7f3d4dd35e77c6e9a4e4b342e402f0655..816dd860d0b5369450bab9067228410bdd9ba0e5 100644 (file)
--- a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
+++ b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
@@ -63,22 +63,10 @@
 
 #include "llvm/Pass.h"
 #include "llvm/Analysis/LiveVar/ValueSet.h"
-#include "Support/CommandLine.h"
 
 class BBLiveVar;
 class MachineInstr;
 
-
-enum LiveVarDebugLevel_t {
-  LV_DEBUG_None,
-  LV_DEBUG_Normal,
-  LV_DEBUG_Instr,
-  LV_DEBUG_Verbose
-};
-
-extern cl::Enum<LiveVarDebugLevel_t> DEBUG_LV;
-
-
 class FunctionLiveVarInfo : public FunctionPass {
   // Machine Instr to LiveVarSet Map for providing LVset BEFORE each inst
   std::map<const MachineInstr *, const ValueSet *> MInst2LVSetBI; 

diff --git a/include/llvm/CodeGen/FunctionLiveVarInfo.h b/include/llvm/CodeGen/FunctionLiveVarInfo.h
index dab6d3c7f3d4dd35e77c6e9a4e4b342e402f0655..816dd860d0b5369450bab9067228410bdd9ba0e5 100644 (file)
--- a/include/llvm/CodeGen/FunctionLiveVarInfo.h
+++ b/include/llvm/CodeGen/FunctionLiveVarInfo.h
@@ -63,22 +63,10 @@
 
 #include "llvm/Pass.h"
 #include "llvm/Analysis/LiveVar/ValueSet.h"
-#include "Support/CommandLine.h"
 
 class BBLiveVar;
 class MachineInstr;
 
-
-enum LiveVarDebugLevel_t {
-  LV_DEBUG_None,
-  LV_DEBUG_Normal,
-  LV_DEBUG_Instr,
-  LV_DEBUG_Verbose
-};
-
-extern cl::Enum<LiveVarDebugLevel_t> DEBUG_LV;
-
-
 class FunctionLiveVarInfo : public FunctionPass {
   // Machine Instr to LiveVarSet Map for providing LVset BEFORE each inst
   std::map<const MachineInstr *, const ValueSet *> MInst2LVSetBI; 

diff --git a/include/llvm/CodeGen/RegAllocCommon.h b/include/llvm/CodeGen/RegAllocCommon.h
index 9f8abe38e7860ff0433ba5fe7cf85e65cac77a26..7c5cf04952196817c402157eafecfeada241439b 100644 (file)
--- a/include/llvm/CodeGen/RegAllocCommon.h
+++ b/include/llvm/CodeGen/RegAllocCommon.h
@@ -1,9 +1,7 @@
 
 
 #ifndef REG_ALLOC_COMMON_H
-#define  REG_ALLOC_COMMON_H
-
-#include "Support/CommandLine.h"
+#define REG_ALLOC_COMMON_H
 
 // set DEBUG_RA for printing out debug messages
 // if DEBUG_RA is 1 normal output messages
@@ -15,6 +13,6 @@ enum RegAllocDebugLevel_t {
   RA_DEBUG_Verbose = 2,
 };
 
-extern cl::Enum<RegAllocDebugLevel_t> DEBUG_RA;
+extern RegAllocDebugLevel_t DEBUG_RA;
 
 #endif

diff --git a/lib/CodeGen/RegAlloc/RegAllocCommon.h b/lib/CodeGen/RegAlloc/RegAllocCommon.h
index 9f8abe38e7860ff0433ba5fe7cf85e65cac77a26..7c5cf04952196817c402157eafecfeada241439b 100644 (file)
--- a/lib/CodeGen/RegAlloc/RegAllocCommon.h
+++ b/lib/CodeGen/RegAlloc/RegAllocCommon.h
@@ -1,9 +1,7 @@
 
 
 #ifndef REG_ALLOC_COMMON_H
-#define  REG_ALLOC_COMMON_H
-
-#include "Support/CommandLine.h"
+#define REG_ALLOC_COMMON_H
 
 // set DEBUG_RA for printing out debug messages
 // if DEBUG_RA is 1 normal output messages
@@ -15,6 +13,6 @@ enum RegAllocDebugLevel_t {
   RA_DEBUG_Verbose = 2,
 };
 
-extern cl::Enum<RegAllocDebugLevel_t> DEBUG_RA;
+extern RegAllocDebugLevel_t DEBUG_RA;
 
 #endif

diff --git a/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h b/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h
index 9f8abe38e7860ff0433ba5fe7cf85e65cac77a26..7c5cf04952196817c402157eafecfeada241439b 100644 (file)
--- a/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h
+++ b/lib/Target/SparcV9/RegAlloc/RegAllocCommon.h
@@ -1,9 +1,7 @@
 
 
 #ifndef REG_ALLOC_COMMON_H
-#define  REG_ALLOC_COMMON_H
-
-#include "Support/CommandLine.h"
+#define REG_ALLOC_COMMON_H
 
 // set DEBUG_RA for printing out debug messages
 // if DEBUG_RA is 1 normal output messages
@@ -15,6 +13,6 @@ enum RegAllocDebugLevel_t {
   RA_DEBUG_Verbose = 2,
 };
 
-extern cl::Enum<RegAllocDebugLevel_t> DEBUG_RA;
+extern RegAllocDebugLevel_t DEBUG_RA;
 
 #endif