From 99aacad9aacbd928ed05a9fec20aa39f7044cbe8 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Thu, 10 Oct 2013 22:36:20 +0000 Subject: [PATCH] clang-cl: Expose the -m32 and -m64 command-line options And add a test to check that they work. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@192402 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/Options.td | 4 ++-- test/Driver/cl-options.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index a3f652f7f4..7ca2547f30 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -917,12 +917,12 @@ def lazy__framework : Separate<["-"], "lazy_framework">, Flags<[LinkerInput]>; def lazy__library : Separate<["-"], "lazy_library">, Flags<[LinkerInput]>; def EL : Flag<["-"], "EL">, Flags<[DriverOption]>; def EB : Flag<["-"], "EB">, Flags<[DriverOption]>; -def m32 : Flag<["-"], "m32">, Group, Flags<[DriverOption]>; +def m32 : Flag<["-"], "m32">, Group, Flags<[DriverOption, CoreOption]>; def mqdsp6_compat : Flag<["-"], "mqdsp6-compat">, Group, Flags<[DriverOption,CC1Option]>, HelpText<"Enable hexagon-qdsp6 backward compatibility">; def m3dnowa : Flag<["-"], "m3dnowa">, Group; def m3dnow : Flag<["-"], "m3dnow">, Group; -def m64 : Flag<["-"], "m64">, Group, Flags<[DriverOption]>; +def m64 : Flag<["-"], "m64">, Group, Flags<[DriverOption, CoreOption]>; def mabi_EQ : Joined<["-"], "mabi=">, Group; def march_EQ : Joined<["-"], "march=">, Group; def maltivec : Flag<["-"], "maltivec">, Alias; diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c index 16efae4e92..20018b085b 100644 --- a/test/Driver/cl-options.c +++ b/test/Driver/cl-options.c @@ -129,4 +129,11 @@ // Xclang: "-cc1" // Xclang: "hellocc1" +// We support -m32 and -m64. +// RUN: %clang_cl -Xclang -target -Xclang x86_64-pc-win32 -m32 -### -- %s 2>&1 | FileCheck -check-prefix=M32 %s +// M32: "-triple" "i{{[0-9]}}86-{{.*}}" +// RUN: %clang_cl -Xclang -target -Xclang i386-pc-win32 -m64 -### -- %s 2>&1 | FileCheck -check-prefix=M64 %s +// M64: "-triple" "{{[^-]+}}64-{{.*}}" + + void f() { } -- 2.40.0