From: Uros Bizjak <ubizjak@gmail.com>
Date: Tue, 16 Apr 2013 16:13:35 +0000 (+0200)
Subject: invoke.texi (i386 Option): Reword -mstack-protector-guard description.
X-Git-Tag: releases/gcc-4.9.0~6411
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e8e2af44b799830fa85976c874a38ed6b0b364c;p=thirdparty%2Fgcc.git

invoke.texi (i386 Option): Reword -mstack-protector-guard description.

	* doc/invoke.texi (i386 Option): Reword -mstack-protector-guard
	description.

From-SVN: r198002
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60f941e5f929..98e170ef4759 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Uros Bizjak  <ubizjak@gmail.com>
+
+	* doc/invoke.texi (i386 Option): Reword -mstack-protector-guard
+	description.
+
 2013-04-16  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/56756
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index e136c9d19f9f..782b5695472a 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -14596,9 +14596,9 @@ Split 32-byte AVX unaligned load and store.
 @item -mstack-protector-guard=@var{guard}
 @opindex mstack-protector-guard=@var{guard}
 Generate stack protection code using canary at @var{guard}.  Supported
-locations are @samp{global} or @samp{tls} per thread at %gs:20 (the default).
-This option has effect only when @option{-fstack-protector}
-or @option{-fstack-protector-all} is also specified.
+locations are @samp{global} for global canary or @samp{tls} for per-thread
+canary in the TLS block (the default).  This option has effect only when
+@option{-fstack-protector} or @option{-fstack-protector-all} is specified.
 
 @end table