Add support for the separate version of /FI.

Patch by Jeff Muizelaar.

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

diff --git a/include/clang/Driver/CLCompatOptions.td b/include/clang/Driver/CLCompatOptions.td
index 075e71e353c9f79a02e26df2a79966d6b018ac16..a363ea5b57859064a7f8ab4a118e0888438a1910 100644 (file)
--- a/include/clang/Driver/CLCompatOptions.td
+++ b/include/clang/Driver/CLCompatOptions.td
@@ -119,7 +119,7 @@ def _SLASH_Fa : CLJoined<"Fa">,
   MetaVarName<"<file or directory>">;
 def _SLASH_fallback : CLCompileFlag<"fallback">,
   HelpText<"Fall back to cl.exe if clang-cl fails to compile">;
-def _SLASH_FI : CLJoined<"FI">,
+def _SLASH_FI : CLJoinedOrSeparate<"FI">,
   HelpText<"Include file before parsing">, Alias<include_>;
 def _SLASH_Fe : CLJoined<"Fe">,
   HelpText<"Set output executable file or directory (ends in / or \\)">,

diff --git a/test/Driver/cl-options.c b/test/Driver/cl-options.c
index 135a0efdd5db8f5dc58a68f1bd0d9c3140efa203..4d0c3eda7d874e057f3ec7ecf33d78bea626b9be 100644 (file)
--- a/test/Driver/cl-options.c
+++ b/test/Driver/cl-options.c
@@ -91,6 +91,9 @@
 // RUN: %clang_cl /FIasdf.h -### -- %s 2>&1 | FileCheck -check-prefix=FI %s
 // FI: "-include" "asdf.h"
 
+// RUN: %clang_cl /FI asdf.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"