aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2013-04-16 18:13:35 +0200
committerUros Bizjak <uros@gcc.gnu.org>2013-04-16 18:13:35 +0200
commit5e8e2af44b799830fa85976c874a38ed6b0b364c (patch)
treedf8dfa673e1e004d860c8cbad7abe0fc924e5100
parent9fd9ccf7150c486685430557b5c1865f464201ab (diff)
downloadgcc-5e8e2af44b799830fa85976c874a38ed6b0b364c.zip
gcc-5e8e2af44b799830fa85976c874a38ed6b0b364c.tar.gz
gcc-5e8e2af44b799830fa85976c874a38ed6b0b364c.tar.bz2
invoke.texi (i386 Option): Reword -mstack-protector-guard description.
* doc/invoke.texi (i386 Option): Reword -mstack-protector-guard description. From-SVN: r198002
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/doc/invoke.texi6
2 files changed, 8 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 60f941e..98e170e 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 e136c9d..782b569 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