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

[Hans Wennborg]

Didn't this commit go in well before the branch happened?

On Tue, Jul 22, 2014 at 9:23 PM, Renato Golin <renato.golin at linaro.org> wrote:
> Hi Bill,
>
> Please include this commit in the next release candidate, as it fixes
> a test breakage on ARM.
>
> thanks,
> --renato
>
> On 16 July 2014 19:31, Reid Kleckner <reid at kleckner.net> wrote:
>> Author: rnk
>> Date: Wed Jul 16 13:31:25 2014
>> New Revision: 213180
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=213180&view=rev
>> Log:
>> Add the --target option to clang-cl and use it to fix a test.
>>
>> Modified:
>>     cfe/trunk/include/clang/Driver/Options.td
>>     cfe/trunk/test/Driver/cl-x86-flags.c
>>
>> Modified: cfe/trunk/include/clang/Driver/Options.td
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=213180&r1=213179&r2=213180&view=diff
>> ==============================================================================
>> --- cfe/trunk/include/clang/Driver/Options.td (original)
>> +++ cfe/trunk/include/clang/Driver/Options.td Wed Jul 16 13:31:25 2014
>> @@ -1389,7 +1389,7 @@ def no_system_header_prefix : Joined<["-
>>             "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">;
>>
>> Modified: cfe/trunk/test/Driver/cl-x86-flags.c
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/cl-x86-flags.c?rev=213180&r1=213179&r2=213180&view=diff
>> ==============================================================================
>> --- cfe/trunk/test/Driver/cl-x86-flags.c (original)
>> +++ cfe/trunk/test/Driver/cl-x86-flags.c Wed Jul 16 13:31:25 2014
>> @@ -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.
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits