提交: 1527df58b0d95af6401662040b3209d532f574c0 - gcc_os216 (git)

GCC with patches for OS216

Commit MetaInfo

• 修訂: 1527df58b0d95af6401662040b3209d532f574c0 (tree)
• 時間: 2018-03-21 07:22:28
• 作者: David H. Gutteridge <dhgutteridge@symp...>
• Commiter: Jeff Law

Log Message

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

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

From-SVN: r258694

Change Summary

• modified: gcc/ChangeLog
• modified: gcc/doc/invoke.texi

差異

--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
[phone]  David H. Gutteridge  <[e-mail]>
+
+	PR target/84838
+	* Minor grammar fixes for x86 options.
+
 2018-03-20  Jakub Jelinek  <[e-mail]>
 
 	PR debug/84875

--- 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