summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2014-07-16 18:31:25 +0000
committerReid Kleckner <reid@kleckner.net>2014-07-16 18:31:25 +0000
commitc8604f65d3d627fdda8eac46720e3e2e2bc82f0f (patch)
tree9aa2c7efa73d32ac291ee0276c4c131ff8a735f1
parent8250735bb04f86312f12175a3d132d78f1348114 (diff)
downloadbcm5719-llvm-c8604f65d3d627fdda8eac46720e3e2e2bc82f0f.tar.gz
bcm5719-llvm-c8604f65d3d627fdda8eac46720e3e2e2bc82f0f.zip
Add the --target option to clang-cl and use it to fix a test.
llvm-svn: 213180
-rw-r--r--clang/include/clang/Driver/Options.td2
-rw-r--r--clang/test/Driver/cl-x86-flags.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index f1fc02ec522..3feee6ef187 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -1389,7 +1389,7 @@ def no_system_header_prefix : Joined<["--"], "no-system-header-prefix=">,
"system header.">;
def : Separate<["--"], "no-system-header-prefix">, Alias<no_system_header_prefix>;
def s : Flag<["-"], "s">;
-def target : Joined<["--"], "target=">, Flags<[DriverOption]>,
+def target : Joined<["--"], "target=">, Flags<[DriverOption, CoreOption]>,
HelpText<"Generate code for the given target">;
def gcc_toolchain : Joined<["--"], "gcc-toolchain=">, Flags<[DriverOption]>,
HelpText<"Use the gcc toolchain at the given directory">;
diff --git a/clang/test/Driver/cl-x86-flags.c b/clang/test/Driver/cl-x86-flags.c
index 4ddde7e93b6..62083dbceb1 100644
--- a/clang/test/Driver/cl-x86-flags.c
+++ b/clang/test/Driver/cl-x86-flags.c
@@ -5,7 +5,7 @@
// We support -m32 and -m64. We support all x86 CPU feature flags in gcc's -m
// flag space.
// RUN: %clang_cl /Zs /WX -m32 -m64 -msse3 -msse4.1 -mavx -mno-avx \
-// RUN: -### -- 2>&1 %s | FileCheck -check-prefix=MFLAGS %s
+// RUN: --target=i386-pc-win32 -### -- 2>&1 %s | FileCheck -check-prefix=MFLAGS %s
// MFLAGS-NOT: argument unused during compilation
// -arch:IA32 is no-op.
OpenPOWER on IntegriCloud