diff options
author | Mikhail Glushenkov <foldr@codedgers.com> | 2010-08-13 02:29:24 +0000 |
---|---|---|
committer | Mikhail Glushenkov <foldr@codedgers.com> | 2010-08-13 02:29:24 +0000 |
commit | 72ffd97796b306139afc55b299af1962ab0ec3ba (patch) | |
tree | d5e221bbed63c43fc278be1f47908637443ea7d5 /utils | |
parent | 1aa1dc945219b380d1d55e7f94e8323c41119075 (diff) | |
download | external_llvm-72ffd97796b306139afc55b299af1962ab0ec3ba.zip external_llvm-72ffd97796b306139afc55b299af1962ab0ec3ba.tar.gz external_llvm-72ffd97796b306139afc55b299af1962ab0ec3ba.tar.bz2 |
llvmc: fix two tests, remove XFAILs.
Tested on Linux and Darwin; please add platform-specific XFAILs/mail me a bug
report if this still fails.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@110998 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
-rw-r--r-- | utils/TableGen/LLVMCConfigurationEmitter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/utils/TableGen/LLVMCConfigurationEmitter.cpp b/utils/TableGen/LLVMCConfigurationEmitter.cpp index d4624e2..7a68d69 100644 --- a/utils/TableGen/LLVMCConfigurationEmitter.cpp +++ b/utils/TableGen/LLVMCConfigurationEmitter.cpp @@ -2177,8 +2177,8 @@ void EmitGenerateActionMethodHeader(const ToolDescription& D, << "std::vector<std::pair<unsigned, std::string> > vec;\n"; O.indent(Indent2) << "bool stop_compilation = !HasChildren;\n"; O.indent(Indent2) << "bool no_out_file = false;\n"; - O.indent(Indent2) << "const char* output_suffix = \"" - << D.OutputSuffix << "\";\n"; + O.indent(Indent2) << "std::string output_suffix(\"" + << D.OutputSuffix << "\");\n"; } } @@ -2235,7 +2235,8 @@ void EmitGenerateActionMethod (const ToolDescription& D, O.indent(Indent3) << "out_file = this->OutFilename(" << (IsJoin ? "sys::Path(),\n" : "inFile,\n"); - O.indent(Indent4) << "TempDir, stop_compilation, output_suffix).str();\n\n"; + O.indent(Indent4) << + "TempDir, stop_compilation, output_suffix.c_str()).str();\n\n"; O.indent(Indent3) << "vec.push_back(std::make_pair(65536, out_file));\n"; O.indent(Indent2) << "}\n\n"; |