summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2013-09-26 17:41:14 +0000
committerReid Kleckner <reid@kleckner.net>2013-09-26 17:41:14 +0000
commitaf1acd9a5e71cac8e08d051132f152f5b1f5cf47 (patch)
tree50836c2d61f4260f11412791560bf819190488a1
parent286304a31799296711940d44b989350e00574534 (diff)
downloadbcm5719-llvm-af1acd9a5e71cac8e08d051132f152f5b1f5cf47.tar.gz
bcm5719-llvm-af1acd9a5e71cac8e08d051132f152f5b1f5cf47.zip
clang-cl: Add /FI (forced include) as an alias for -include
Patch by Jeff Muizelaar, with added test case. llvm-svn: 191442
-rw-r--r--clang/include/clang/Driver/CLCompatOptions.td2
-rw-r--r--clang/test/Driver/cl-options.c9
2 files changed, 8 insertions, 3 deletions
diff --git a/clang/include/clang/Driver/CLCompatOptions.td b/clang/include/clang/Driver/CLCompatOptions.td
index c912accd254..aae4d0a6ec3 100644
--- a/clang/include/clang/Driver/CLCompatOptions.td
+++ b/clang/include/clang/Driver/CLCompatOptions.td
@@ -112,6 +112,8 @@ def _SLASH_M_Group : OptionGroup<"</M group>">, Group<cl_compile_Group>;
def _SLASH_fallback : CLCompileFlag<"fallback">,
HelpText<"Fall back to cl.exe if clang-cl fails to compile">;
+def _SLASH_FI : CLJoined<"FI">,
+ HelpText<"Include file before parsing">, Alias<include_>;
def _SLASH_Fe : CLJoined<"Fe">,
HelpText<"Set output executable file or directory (ends in / or \\)">,
MetaVarName<"<file or directory>">;
diff --git a/clang/test/Driver/cl-options.c b/clang/test/Driver/cl-options.c
index c3a90ced208..e9e18582e3c 100644
--- a/clang/test/Driver/cl-options.c
+++ b/clang/test/Driver/cl-options.c
@@ -20,9 +20,9 @@
// RUN: %clang_cl /GR- -### -- %s 2>&1 | FileCheck -check-prefix=GR_ %s
// GR_: -fno-rtti
-// RUN: %clang_cl /Imyincludedir -### -- %s 2>&1 | FileCheck -check-prefix=I %s
-// RUN: %clang_cl /I myincludedir -### -- %s 2>&1 | FileCheck -check-prefix=I %s
-// I: "-I" "myincludedir"
+// RUN: %clang_cl /Imyincludedir -### -- %s 2>&1 | FileCheck -check-prefix=SLASH_I %s
+// RUN: %clang_cl /I myincludedir -### -- %s 2>&1 | FileCheck -check-prefix=SLASH_I %s
+// SLASH_I: "-I" "myincludedir"
// RUN: %clang_cl /J -### -- %s 2>&1 | FileCheck -check-prefix=J %s
// J: -fno-signed-char
@@ -88,6 +88,9 @@
// RUN: %clang_cl /Zs -### -- %s 2>&1 | FileCheck -check-prefix=Zs %s
// Zs: -fsyntax-only
+// RUN: %clang_cl /FIasdf.h -### -- %s 2>&1 | FileCheck -check-prefix=FI %s
+// FI: "-include" "asdf.h"
+
// We forward any unrecognized -W diagnostic options to cc1.
// RUN: %clang_cl -Wunused-pragmas -### -- %s 2>&1 | FileCheck -check-prefix=WJoined %s
// WJoined: "-cc1"
OpenPOWER on IntegriCloud