[llvm-branch-commits] [cfe-branch] r329625 - Merging r329052:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Mon Apr  9 14:30:20 2018
New Revision: 329625

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

------------------------------------------------------------------------
r329052 | hans | 2018-04-03 02:28:21 -0700 (Tue, 03 Apr 2018) | 1 line

UsersManual.rst: update text for /GX- to match r328708
------------------------------------------------------------------------

Modified:
    cfe/branches/release_60/docs/UsersManual.rst

Modified: cfe/branches/release_60/docs/UsersManual.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/docs/UsersManual.rst?rev=329625&r1=329624&r2=329625&view=diff
==============================================================================
--- cfe/branches/release_60/docs/UsersManual.rst (original)
+++ cfe/branches/release_60/docs/UsersManual.rst Mon Apr  9 14:30:20 2018
@@ -2741,7 +2741,7 @@ Execute ``clang-cl /?`` to see a list of
       /Gv                     Set __vectorcall as a default calling convention
       /Gw-                    Don't put each data item in its own section
       /Gw                     Put each data item in its own section
-      /GX-                    Enable exception handling
+      /GX-                    Disable exception handling
       /GX                     Enable exception handling
       /Gy-                    Don't put each function in its own section
       /Gy                     Put each function in its own section