diff options
author | Mikhail Glushenkov <foldr@codedgers.com> | 2010-08-13 20:08:53 +0000 |
---|---|---|
committer | Mikhail Glushenkov <foldr@codedgers.com> | 2010-08-13 20:08:53 +0000 |
commit | cb5d3ef88281057c81436e40bf9b43b720425b6f (patch) | |
tree | db143e47f20e71f545d43ca1647840d10d4df56c /utils | |
parent | ef0bedaba7c1466af4275e720a73f3421b9b5631 (diff) | |
download | llvm-cb5d3ef88281057c81436e40bf9b43b720425b6f.tar.gz llvm-cb5d3ef88281057c81436e40bf9b43b720425b6f.tar.bz2 llvm-cb5d3ef88281057c81436e40bf9b43b720425b6f.tar.xz |
Revert r111007.
Apparently, this is now fixed in Clang.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@111032 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r-- | utils/TableGen/LLVMCConfigurationEmitter.cpp | 18 | ||||
-rw-r--r-- | utils/TableGen/TableGen.cpp | 6 |
2 files changed, 5 insertions, 19 deletions
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp index 97dca8c6aa..7a68d696f9 100644 --- a/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -17,8 +17,6 @@ #include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringSet.h" -#include "llvm/Support/CommandLine.h" -#include "llvm/System/Path.h" #include <algorithm> #include <cassert> @@ -29,8 +27,6 @@ using namespace llvm; -extern cl::opt<std::string> InputFilename; - namespace { //===----------------------------------------------------------------------===// @@ -2978,18 +2974,9 @@ void EmitHookDeclarations(const ToolDescriptions& ToolDescs, O << "}\n\n"; } -std::string GetPluginName() { - if (!InputFilename.empty()) { - return sys::Path(InputFilename).getBasename(); - } - - return ""; -} - /// EmitRegisterPlugin - Emit code to register this plugin. void EmitRegisterPlugin(int Priority, raw_ostream& O) { - O << "struct Plugin" << GetPluginName() - << " : public llvmc::BasePlugin {\n\n"; + O << "struct Plugin : public llvmc::BasePlugin {\n\n"; O.indent(Indent1) << "int Priority() const { return " << Priority << "; }\n\n"; O.indent(Indent1) << "int PreprocessOptions() const\n"; @@ -3000,8 +2987,7 @@ void EmitRegisterPlugin(int Priority, raw_ostream& O) { << "int PopulateCompilationGraph(CompilationGraph& graph) const\n"; O.indent(Indent1) << "{ return PopulateCompilationGraphLocal(graph); }\n" << "};\n\n" - << "static llvmc::RegisterPlugin<Plugin" - << GetPluginName()<< "> RP;\n\n"; + << "static llvmc::RegisterPlugin<Plugin> RP;\n\n"; } /// EmitIncludes - Emit necessary #include directives and some diff --git a/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp index cc784103e3..ebd163d265 100644 --- a/utils/TableGen/TableGen.cpp +++ b/utils/TableGen/TableGen.cpp @@ -146,6 +146,9 @@ namespace { OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"), cl::init("-")); + cl::opt<std::string> + InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-")); + cl::list<std::string> IncludeDirs("I", cl::desc("Directory of include files"), cl::value_desc("directory"), cl::Prefix); @@ -158,9 +161,6 @@ namespace { // FIXME: Eliminate globals from tblgen. -cl::opt<std::string> -InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-")); - RecordKeeper llvm::Records; static SourceMgr SrcMgr; |