From: David H. Gutteridge <dhgutteridge@sympatico.ca>
Date: Tue, 20 Mar 2018 22:22:28 +0000 (+0000)
Subject: re PR target/84838 (Minor grammar fixes for x86 options)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1527df58b0d95af6401662040b3209d532f574c0;p=gcc.git

re PR target/84838 (Minor grammar fixes for x86 options)

	PR target/84838
	* Minor grammar fixes for x86 options.

From-SVN: r258694
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f604631205c..53224b1895e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-03-20  David H. Gutteridge  <dhgutteridge@sympatico.ca>
+
+	PR target/84838
+	* Minor grammar fixes for x86 options.
+
 2018-03-20  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/84875
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index aca9c8dcebe..feacd569ef3 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -27893,9 +27893,9 @@ You can control this behavior for a specific function by using the
 function attribute @code{indirect_branch}.  @xref{Function Attributes}.
 
 Note that @option{-mcmodel=large} is incompatible with
-@option{-mindirect-branch=thunk} nor
+@option{-mindirect-branch=thunk} and
 @option{-mindirect-branch=thunk-extern} since the thunk function may
-not be reachable in large code model.
+not be reachable in the large code model.
 
 Note that @option{-mindirect-branch=thunk-extern} is incompatible with
 @option{-fcf-protection=branch} and @option{-fcheck-pointer-bounds}
@@ -27914,9 +27914,9 @@ using the function attribute @code{function_return}.
 @xref{Function Attributes}.
 
 Note that @option{-mcmodel=large} is incompatible with
-@option{-mfunction-return=thunk} nor
+@option{-mfunction-return=thunk} and
 @option{-mfunction-return=thunk-extern} since the thunk function may
-not be reachable in large code model.
+not be reachable in the large code model.
 
 
 @item -mindirect-branch-register