Add the --target option to clang-cl and use it to fix a test.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213180 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td
index f1fc02ec522fb0d2177dca376c4b5214faa954d5..3feee6ef187bff03dc6a4eae66f9c855642d8f36 100644 (file)
--- a/include/clang/Driver/Options.td
+++ b/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/test/Driver/cl-x86-flags.c b/test/Driver/cl-x86-flags.c
index 4ddde7e93b608e2586654bd70c703e7d544a8ab6..62083dbceb191cb9f3e6b3151d145506dd1f501e 100644 (file)
--- a/test/Driver/cl-x86-flags.c
+++ b/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.