diff options
| -rw-r--r-- | utils/TableGen/LLVMCConfigurationEmitter.cpp | 18 | ||||
| -rw-r--r-- | utils/TableGen/TableGen.cpp | 6 |
2 files changed, 19 insertions, 5 deletions
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp index 7a68d696f9..97dca8c6aa 100644 --- a/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -17,6 +17,8 @@ #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> @@ -27,6 +29,8 @@ using namespace llvm; +extern cl::opt<std::string> InputFilename; + namespace { //===----------------------------------------------------------------------===// @@ -2974,9 +2978,18 @@ 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 : public llvmc::BasePlugin {\n\n"; + O << "struct Plugin" << GetPluginName() + << " : public llvmc::BasePlugin {\n\n"; O.indent(Indent1) << "int Priority() const { return " << Priority << "; }\n\n"; O.indent(Indent1) << "int PreprocessOptions() const\n"; @@ -2987,7 +3000,8 @@ 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> RP;\n\n"; + << "static llvmc::RegisterPlugin<Plugin" + << GetPluginName()<< "> RP;\n\n"; } /// EmitIncludes - Emit necessary #include directives and some diff --git a/utils/TableGen/TableGen.cpp b/utils/TableGen/TableGen.cpp index ebd163d265..cc784103e3 100644 --- a/utils/TableGen/TableGen.cpp +++ b/utils/TableGen/TableGen.cpp @@ -146,9 +146,6 @@ 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); @@ -161,6 +158,9 @@ 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; |