RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 11:02:59 +02:00
Code Issues Projects Releases Wiki Activity

Revert r111007.

Browse Source 
Apparently, this is now fixed in Clang.

llvm-svn: 111032
This commit is contained in:
Mikhail Glushenkov 2010-08-13 20:08:53 +00:00
parent c58d128eb8
commit be7bdc80c3
2 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
utils/TableGen/LLVMCConfigurationEmitter.cpp
View File

@ -17,8 +17,6 @@
#include "llvm/ADT/IntrusiveRefCntPtr.h" #include "llvm/ADT/IntrusiveRefCntPtr.h"
#include "llvm/ADT/StringMap.h" #include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringSet.h" #include "llvm/ADT/StringSet.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/System/Path.h"
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
@ -29,8 +27,6 @@
using namespace llvm; using namespace llvm;
extern cl::opt<std::string> InputFilename;
namespace { namespace {
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
@ -2978,18 +2974,9 @@ void EmitHookDeclarations(const ToolDescriptions& ToolDescs,
O << "}\n\n"; O << "}\n\n";
} }
std::string GetPluginName() {
if (!InputFilename.empty()) {
return sys::Path(InputFilename).getBasename();
}
return "";
}
/// EmitRegisterPlugin - Emit code to register this plugin. /// EmitRegisterPlugin - Emit code to register this plugin.
void EmitRegisterPlugin(int Priority, raw_ostream& O) { void EmitRegisterPlugin(int Priority, raw_ostream& O) {
O << "struct Plugin" << GetPluginName() O << "struct Plugin : public llvmc::BasePlugin {\n\n";
<< " : public llvmc::BasePlugin {\n\n";
O.indent(Indent1) << "int Priority() const { return " O.indent(Indent1) << "int Priority() const { return "
<< Priority << "; }\n\n"; << Priority << "; }\n\n";
O.indent(Indent1) << "int PreprocessOptions() const\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"; << "int PopulateCompilationGraph(CompilationGraph& graph) const\n";
O.indent(Indent1) << "{ return PopulateCompilationGraphLocal(graph); }\n" O.indent(Indent1) << "{ return PopulateCompilationGraphLocal(graph); }\n"
<< "};\n\n" << "};\n\n"
<< "static llvmc::RegisterPlugin<Plugin" << "static llvmc::RegisterPlugin<Plugin> RP;\n\n";
<< GetPluginName()<< "> RP;\n\n";
} }
/// EmitIncludes - Emit necessary #include directives and some /// EmitIncludes - Emit necessary #include directives and some

6
utils/TableGen/TableGen.cpp
View File

@ -146,6 +146,9 @@ namespace {
OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"), OutputFilename("o", cl::desc("Output filename"), cl::value_desc("filename"),
cl::init("-")); cl::init("-"));
cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
cl::list<std::string> cl::list<std::string>
IncludeDirs("I", cl::desc("Directory of include files"), IncludeDirs("I", cl::desc("Directory of include files"),
cl::value_desc("directory"), cl::Prefix); cl::value_desc("directory"), cl::Prefix);
@ -158,9 +161,6 @@ namespace {
// FIXME: Eliminate globals from tblgen. // FIXME: Eliminate globals from tblgen.
cl::opt<std::string>
InputFilename(cl::Positional, cl::desc("<input file>"), cl::init("-"));
RecordKeeper llvm::Records; RecordKeeper llvm::Records;
static SourceMgr SrcMgr; static SourceMgr SrcMgr;