summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2013-10-10 22:36:20 +0000
committerHans Wennborg <hans@hanshq.net>2013-10-10 22:36:20 +0000
commit65a008683fb69c4c4a44229f4c147fac49fc75b4 (patch)
tree72b8c13638191028fe72310ab463c95722cdf141
parentb916e8467223ee18518e69acc0df4f669e24dc4d (diff)
downloadbcm5719-llvm-65a008683fb69c4c4a44229f4c147fac49fc75b4.tar.gz
bcm5719-llvm-65a008683fb69c4c4a44229f4c147fac49fc75b4.zip
clang-cl: Expose the -m32 and -m64 command-line options
And add a test to check that they work. llvm-svn: 192402
-rw-r--r--clang/include/clang/Driver/Options.td4
-rw-r--r--clang/test/Driver/cl-options.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index a3f652f7f4e..7ca2547f307 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/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<m_Group>, Flags<[DriverOption]>;
+def m32 : Flag<["-"], "m32">, Group<m_Group>, Flags<[DriverOption, CoreOption]>;
def mqdsp6_compat : Flag<["-"], "mqdsp6-compat">, Group<m_Group>, Flags<[DriverOption,CC1Option]>,
HelpText<"Enable hexagon-qdsp6 backward compatibility">;
def m3dnowa : Flag<["-"], "m3dnowa">, Group<m_x86_Features_Group>;
def m3dnow : Flag<["-"], "m3dnow">, Group<m_x86_Features_Group>;
-def m64 : Flag<["-"], "m64">, Group<m_Group>, Flags<[DriverOption]>;
+def m64 : Flag<["-"], "m64">, Group<m_Group>, Flags<[DriverOption, CoreOption]>;
def mabi_EQ : Joined<["-"], "mabi=">, Group<m_Group>;
def march_EQ : Joined<["-"], "march=">, Group<m_Group>;
def maltivec : Flag<["-"], "maltivec">, Alias<faltivec>;
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index 16efae4e928..20018b085bd 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/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() { }
OpenPOWER on IntegriCloud