From: Stefan Schulze Frielinghaus <stefansf@gcc.gnu.org>
Date: Wed, 12 Nov 2025 17:03:50 +0000 (+0100)
Subject: s390: Add stack protector guard doc
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39dae0715ffc44554d81589a247794adb08aaf31;p=thirdparty%2Fgcc.git

s390: Add stack protector guard doc

Add documentation for options -mstack-protector-guard= and
-mstack-protector-guard-record which were added in commit
r16-5192-g0cd1f03939d and regenerate .opt.urls.

gcc/ChangeLog:

	* config/i386/i386.opt.urls: Regenerate.
	* config/s390/s390.opt.urls: Ditto.
	* doc/invoke.texi: Add documentation for
	-mstack-protector-guard= and -mstack-protector-guard-record.
---

diff --git a/gcc/config/i386/i386.opt.urls b/gcc/config/i386/i386.opt.urls
index a9bbac0ef9b..a89329b4844 100644
--- a/gcc/config/i386/i386.opt.urls
+++ b/gcc/config/i386/i386.opt.urls
@@ -438,7 +438,7 @@ mpku
 UrlSuffix(gcc/x86-Options.html#index-mpku)
 
 mstack-protector-guard=
-UrlSuffix(gcc/x86-Options.html#index-mstack-protector-guard-4)
+UrlSuffix(gcc/x86-Options.html#index-mstack-protector-guard-5)
 
 mstack-protector-guard-reg=
 UrlSuffix(gcc/x86-Options.html#index-mstack-protector-guard-reg-3)
diff --git a/gcc/config/s390/s390.opt.urls b/gcc/config/s390/s390.opt.urls
index bb53fc9f987..be0904ce1ce 100644
--- a/gcc/config/s390/s390.opt.urls
+++ b/gcc/config/s390/s390.opt.urls
@@ -51,6 +51,12 @@ UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-msoft-float-12)
 mstack-guard=
 UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mstack-guard)
 
+mstack-protector-guard=
+UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mstack-protector-guard-4)
+
+mstack-protector-guard-record
+UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mstack-protector-guard-record)
+
 mstack-size=
 UrlSuffix(gcc/S_002f390-and-zSeries-Options.html#index-mstack-size-2)
 
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index f022dca5640..8bfd03d481b 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -33866,6 +33866,20 @@ If both arguments are zero, hotpatching is disabled.
 
 This option can be overridden for individual functions with the
 @code{hotpatch} attribute.
+
+@opindex mstack-protector-guard
+@opindex mstack-protector-guard-record
+@item -mstack-protector-guard=@var{guard}
+@itemx -mstack-protector-guard-record
+Generate stack protection code using canary at @var{guard}.  Supported
+locations are @var{global} for a global canary or @var{tls} for a per-thread
+canary in the TLS block (the default).
+
+Option @option{-mstack-protector-guard-record} results in the generation of
+section @code{__stack_protector_loc} containing pointers to all instructions
+which load the address of the global guard.  Thus, this option has only an
+effect in conjunction with @option{-mstack-protector-guard=global}.  The
+intended use is for the Linux kernel.
 @end table
 
 @node SH Options