aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid H. Gutteridge <dhgutteridge@sympatico.ca>2018-03-20 22:22:28 +0000
committerJeff Law <law@gcc.gnu.org>2018-03-20 16:22:28 -0600
commit1527df58b0d95af6401662040b3209d532f574c0 (patch)
treee6ed248f2d579b48e0369894da57372ceb85f3f3
parent5dfb5e5be885ef50cf5a80aec09f9d8390ddc499 (diff)
downloadgcc-1527df58b0d95af6401662040b3209d532f574c0.zip
gcc-1527df58b0d95af6401662040b3209d532f574c0.tar.gz
gcc-1527df58b0d95af6401662040b3209d532f574c0.tar.bz2
re PR target/84838 (Minor grammar fixes for x86 options)
PR target/84838 * Minor grammar fixes for x86 options. From-SVN: r258694
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/doc/invoke.texi8
2 files changed, 9 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f604631..53224b1 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 aca9c8d..feacd56 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