aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2019-04-30 15:43:21 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-04-30 15:43:21 +0000
commit29162843779552d3d28878cd8031bc032cba421e (patch)
treee04b0eec7789b7d7ac718202752ca393ff46f191 /docs
parent19b4f689c6f58cb2da9377bcec32c79a97d3fb73 (diff)
parent2a3c645b40ebb5149f6e043babccd95469867030 (diff)
downloadtrusted-firmware-a-29162843779552d3d28878cd8031bc032cba421e.tar.gz
Merge changes from topic "lm/stack_protector" into integration
* changes: juno: Add security sources for tsp-juno Add support for default stack-protector flag
Diffstat (limited to 'docs')
-rw-r--r--docs/user-guide.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index b9f08716ac..01cf17a23d 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -460,12 +460,12 @@ Common build options
architecture is AArch32.
- ``ENABLE_STACK_PROTECTOR``: String option to enable the stack protection
- checks in GCC. Allowed values are "all", "strong" and "0" (default).
- "strong" is the recommended stack protection level if this feature is
- desired. 0 disables the stack protection. For all values other than 0, the
- ``plat_get_stack_protector_canary()`` platform hook needs to be implemented.
- The value is passed as the last component of the option
- ``-fstack-protector-$ENABLE_STACK_PROTECTOR``.
+ checks in GCC. Allowed values are "all", "strong", "default" and "none". The
+ default value is set to "none". "strong" is the recommended stack protection
+ level if this feature is desired. "none" disables the stack protection. For
+ all values other than "none", the ``plat_get_stack_protector_canary()``
+ platform hook needs to be implemented. The value is passed as the last
+ component of the option ``-fstack-protector-$ENABLE_STACK_PROTECTOR``.
- ``ERROR_DEPRECATED``: This option decides whether to treat the usage of
deprecated platform APIs, helper functions or drivers within Trusted