<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Nov 19, 2015 at 8:58 PM, Douglas Katzman via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dougk<br>
Date: Thu Nov 19 22:58:12 2015<br>
New Revision: 253647<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=253647&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=253647&view=rev</a><br>
Log:<br>
[Myriad]: handle Preprocess job action (-E)<br>
<br>
Modified:<br>
cfe/trunk/lib/Driver/<wbr>ToolChains.cpp<br>
cfe/trunk/lib/Driver/Tools.cpp<br>
cfe/trunk/test/Driver/myriad-<wbr>toolchain.c<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>ToolChains.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains.cpp?rev=253647&r1=253646&r2=253647&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>ToolChains.cpp?rev=253647&r1=<wbr>253646&r2=253647&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>ToolChains.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>ToolChains.cpp Thu Nov 19 22:58:12 2015<br>
@@ -4434,6 +4434,7 @@ Tool *MyriadToolChain::SelectTool(<wbr>const<br>
if (!isShaveCompilation(<wbr>getTriple()))<br>
return ToolChain::SelectTool(JA);<br>
switch (JA.getKind()) {<br>
+ case Action::PreprocessJobClass:<br>
case Action::CompileJobClass:<br>
if (!Compiler)<br>
Compiler.reset(new tools::SHAVE::Compiler(*this))<wbr>;<br>
<br>
Modified: cfe/trunk/lib/Driver/Tools.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=253647&r1=253646&r2=253647&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>Tools.cpp?rev=253647&r1=<wbr>253646&r2=253647&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/Tools.cpp (original)<br>
+++ cfe/trunk/lib/Driver/Tools.cpp Thu Nov 19 22:58:12 2015<br>
@@ -9895,17 +9895,22 @@ void tools::SHAVE::Compiler::<wbr>ConstructJo<br>
const InputInfoList &Inputs,<br>
const ArgList &Args,<br>
const char *LinkingOutput) const {<br>
-<br>
ArgStringList CmdArgs;<br>
-<br>
assert(Inputs.size() == 1);<br>
const InputInfo &II = Inputs[0];<br>
- assert(II.getType() == types::TY_C || II.getType() == types::TY_CXX);<br>
- assert(Output.getType() == types::TY_PP_Asm); // Require preprocessed asm.<br>
+ assert(II.getType() == types::TY_C || II.getType() == types::TY_CXX ||<br>
+ II.getType() == types::TY_PP_CXX);<br></blockquote><div><br></div><div>This assert fails when compiling a .i file (TY_PP_C).</div><div> <br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
- CmdArgs.push_back("-DMYRIAD2")<wbr>;<br>
+ if (JA.getKind() == Action::PreprocessJobClass) {<br>
+ Args.ClaimAllArgs();<br>
+ CmdArgs.push_back("-E");<br>
+ } else {<br>
+ assert(Output.getType() == types::TY_PP_Asm); // Require preprocessed asm.<br>
+ CmdArgs.push_back("-S");<br>
+ CmdArgs.push_back("-fno-<wbr>exceptions"); // Always do this even if unspecified.<br>
+ }<br>
CmdArgs.push_back("-mcpu=<wbr>myriad2");<br>
- CmdArgs.push_back("-S");<br>
+ CmdArgs.push_back("-DMYRIAD2")<wbr>;<br>
<br>
// Append all -I, -iquote, -isystem paths, defines/undefines,<br>
// 'f' flags, optimize flags, and warning options.<br>
@@ -9931,8 +9936,6 @@ void tools::SHAVE::Compiler::<wbr>ConstructJo<br>
}<br>
}<br>
<br>
- CmdArgs.push_back("-fno-<wbr>exceptions"); // Always do this even if unspecified.<br>
-<br>
CmdArgs.push_back(II.<wbr>getFilename());<br>
CmdArgs.push_back("-o");<br>
CmdArgs.push_back(Output.<wbr>getFilename());<br>
<br>
Modified: cfe/trunk/test/Driver/myriad-<wbr>toolchain.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/myriad-toolchain.c?rev=253647&r1=253646&r2=253647&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>myriad-toolchain.c?rev=253647&<wbr>r1=253646&r2=253647&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/myriad-<wbr>toolchain.c (original)<br>
+++ cfe/trunk/test/Driver/myriad-<wbr>toolchain.c Thu Nov 19 22:58:12 2015<br>
@@ -38,7 +38,7 @@<br>
<br>
// RUN: %clang -target shave-myriad -c -### %s -isystem somewhere -Icommon -Wa,-yippee 2>&1 \<br>
// RUN: | FileCheck %s -check-prefix=MOVICOMPILE<br>
-// MOVICOMPILE: moviCompile" "-DMYRIAD2" "-mcpu=myriad2" "-S" "-isystem" "somewhere" "-I" "common"<br>
+// MOVICOMPILE: moviCompile" "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-isystem" "somewhere" "-I" "common"<br>
// MOVICOMPILE: moviAsm" "-no6thSlotCompression" "-cv:myriad2" "-noSPrefixing" "-a"<br>
// MOVICOMPILE: "-yippee" "-i:somewhere" "-i:common" "-elf"<br>
<br>
@@ -58,11 +58,15 @@<br>
<br>
// RUN: %clang -target shave-myriad -c %s -o foo.o -### -MD -MF dep.d 2>&1 \<br>
// RUN: | FileCheck %s -check-prefix=MDMF<br>
-// MDMF: "-S" "-MD" "-MF" "dep.d" "-MT" "foo.o"<br>
+// MDMF: "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-MD" "-MF" "dep.d" "-MT" "foo.o"<br>
<br>
// RUN: %clang -target shave-myriad -std=gnu++11 -S %s -o foo.o -### 2>&1 \<br>
// RUN: | FileCheck %s -check-prefix=STDEQ<br>
-// STDEQ: "-mcpu=myriad2" "-S" "-std=gnu++11"<br>
+// STDEQ: "-S" "-fno-exceptions" "-mcpu=myriad2" "-DMYRIAD2" "-std=gnu++11"<br>
+<br>
+// RUN: %clang -target shave-myriad -E -Ifoo %s -o foo.i -### 2>&1 \<br>
+// RUN: | FileCheck %s -check-prefix=PREPROCESS<br>
+// PREPROCESS: "-E" "-mcpu=myriad2" "-DMYRIAD2" "-I" "foo"<br>
<br>
// RUN: %clang -target sparc-myriad -### --driver-mode=g++ %s 2>&1 | FileCheck %s --check-prefix=STDLIBCXX<br>
// STDLIBCXX: "-lstdc++" "-lc" "-lgcc"<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>