summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDouglas Katzman <dougk@google.com>2015-11-16 15:38:40 +0000
committerDouglas Katzman <dougk@google.com>2015-11-16 15:38:40 +0000
commit642e5f9fead109235059441ac7d2997b6a882cbc (patch)
treed0909d2c7e99d94e99fa7ffd6839f13e5b259019
parent7d5264fa441bb381b7501c2adbfd5c41215e1cdf (diff)
downloadbcm5719-llvm-642e5f9fead109235059441ac7d2997b6a882cbc.tar.gz
bcm5719-llvm-642e5f9fead109235059441ac7d2997b6a882cbc.zip
[Myriad]: pass the 'std=' option to moviCompile
llvm-svn: 253213
-rw-r--r--clang/lib/Driver/Tools.cpp2
-rw-r--r--clang/test/Driver/myriad-toolchain.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 0870df4a34a..e39759fe215 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -9890,7 +9890,7 @@ void tools::SHAVE::Compiler::ConstructJob(Compilation &C, const JobAction &JA,
// 'f' flags, optimize flags, and warning options.
// These are spelled the same way in clang and moviCompile.
Args.AddAllArgs(CmdArgs, {options::OPT_I_Group, options::OPT_clang_i_Group,
- options::OPT_D, options::OPT_U,
+ options::OPT_std_EQ, options::OPT_D, options::OPT_U,
options::OPT_f_Group, options::OPT_f_clang_Group,
options::OPT_g_Group, options::OPT_M_Group,
options::OPT_O_Group, options::OPT_W_Group});
diff --git a/clang/test/Driver/myriad-toolchain.c b/clang/test/Driver/myriad-toolchain.c
index 054fe34142a..e2222aced34 100644
--- a/clang/test/Driver/myriad-toolchain.c
+++ b/clang/test/Driver/myriad-toolchain.c
@@ -60,6 +60,10 @@
// RUN: | FileCheck %s -check-prefix=MDMF
// MDMF: "-S" "-MD" "-MF" "dep.d" "-MT" "foo.o"
+// RUN: %clang -target shave-myriad -std=gnu++11 -S %s -o foo.o -### 2>&1 \
+// RUN: | FileCheck %s -check-prefix=STDEQ
+// STDEQ: "-mcpu=myriad2" "-S" "-std=gnu++11"
+
// RUN: %clang -target sparc-myriad -### --driver-mode=g++ %s 2>&1 | FileCheck %s --check-prefix=STDLIBCXX
// STDLIBCXX: "-lstdc++" "-lc" "-lgcc"
OpenPOWER on IntegriCloud