[llvm-branch-commits] [cfe-branch] r329624 - Merging r328708:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Apr  9 14:20:06 2018
New Revision: 329624

URL: http://llvm.org/viewvc/llvm-project?rev=329624&view=rev
Log:
Merging r328708:

------------------------------------------------------------------------
r328708 | hans | 2018-03-28 07:57:49 -0700 (Wed, 28 Mar 2018) | 1 line

clang-cl: s/Enable/Disable/ in help text for /GX-
------------------------------------------------------------------------

Modified:
    cfe/branches/release_60/include/clang/Driver/CLCompatOptions.td

Modified: cfe/branches/release_60/include/clang/Driver/CLCompatOptions.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/include/clang/Driver/CLCompatOptions.td?rev=329624&r1=329623&r2=329624&view=diff
==============================================================================
--- cfe/branches/release_60/include/clang/Driver/CLCompatOptions.td (original)
+++ cfe/branches/release_60/include/clang/Driver/CLCompatOptions.td Mon Apr  9 14:20:06 2018
@@ -238,7 +238,7 @@ def _SLASH_Fo : CLCompileJoined<"Fo">,
 def _SLASH_GX : CLFlag<"GX">,
   HelpText<"Enable exception handling">;
 def _SLASH_GX_ : CLFlag<"GX-">,
-  HelpText<"Enable exception handling">;
+  HelpText<"Disable exception handling">;
 def _SLASH_imsvc : CLJoinedOrSeparate<"imsvc">,
   HelpText<"Add directory to system include search path, as if part of %INCLUDE%">,
   MetaVarName<"<dir>">;