defaults.h (STACK_OLD_CHECK_PROTECT): Adjust for -fno-exceptions.

	* defaults.h (STACK_OLD_CHECK_PROTECT): Adjust for -fno-exceptions.
	Bump to 4KB for SJLJ exceptions.
	(STACK_CHECK_PROTECT): Likewise.  Bump to 8KB for SJLJ exceptions.
	* doc/tm.texi.in (STACK_CHECK_PROTECT): Adjust.
	* doc/tm.texi: Regenerate.

From-SVN: r227799

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6f60273a86d8b37f73dfd0e6b6a898ca27368f5d..0305ca80d736fb5f2b7a8705df48c791f09729d0 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-09-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * defaults.h (STACK_OLD_CHECK_PROTECT): Adjust for -fno-exceptions.
+       Bump to 4KB for SJLJ exceptions.
+       (STACK_CHECK_PROTECT): Likewise.  Bump to 8KB for SJLJ exceptions.
+       * doc/tm.texi.in (STACK_CHECK_PROTECT): Adjust.
+       * doc/tm.texi: Regenerate.
+
 2015-09-15  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/arm/arm.c (arm_gen_constant): Use HOST_WIDE_INT_M1U instead

diff --git a/gcc/defaults.h b/gcc/defaults.h
index d4d3a565c17314bcdba5c12b9b892b9bb09975e2..9ca9df2e117dcf4bf9071a8753cd6a9701bf389c 100644 (file)
--- a/gcc/defaults.h
+++ b/gcc/defaults.h
@@ -1406,9 +1406,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define STACK_OLD_CHECK_PROTECT STACK_CHECK_PROTECT
 #else
 #define STACK_OLD_CHECK_PROTECT                                                \
- (targetm_common.except_unwind_info (&global_options) == UI_SJLJ       \
+ (!global_options.x_flag_exceptions                                    \
   ? 75 * UNITS_PER_WORD                                                        \
-  : 8 * 1024)
+  : targetm_common.except_unwind_info (&global_options) == UI_SJLJ     \
+    ? 4 * 1024                                                         \
+    : 8 * 1024)
 #endif
 
 /* Minimum amount of stack required to recover from an anticipated stack
@@ -1416,9 +1418,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
    of stack required to propagate an exception.  */
 #ifndef STACK_CHECK_PROTECT
 #define STACK_CHECK_PROTECT                                            \
- (targetm_common.except_unwind_info (&global_options) == UI_SJLJ       \
-  ? 75 * UNITS_PER_WORD                                                        \
-  : 12 * 1024)
+ (!global_options.x_flag_exceptions                                    \
+  ? 4 * 1024                                                           \
+  : targetm_common.except_unwind_info (&global_options) == UI_SJLJ     \
+    ? 8 * 1024                                                         \
+    : 12 * 1024)
 #endif
 
 /* Make the maximum frame size be the largest we can and still only need

diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index d548d96b234737664a3293b23d19451524521c74..65fb8656a180c30f0f843f15a50185b6bae551c4 100644 (file)
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -3360,10 +3360,10 @@ default value of this macro is zero.
 
 @defmac STACK_CHECK_PROTECT
 The number of bytes of stack needed to recover from a stack overflow, for
-languages where such a recovery is supported.  The default value of 75 words
+languages where such a recovery is supported.  The default value of 4KB/8KB
 with the @code{setjmp}/@code{longjmp}-based exception handling mechanism and
-8192 bytes with other exception handling mechanisms should be adequate for
-most machines.
+8KB/12KB with other exception handling mechanisms should be adequate for most
+architectures and operating systems.
 @end defmac
 
 The following macros are relevant only if neither STACK_CHECK_BUILTIN

diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in
index 9bef4a59bed252a58c77f9e02eae9da59739ebc7..8fe193c4f2560727956605e4fb5ed418f49d9853 100644 (file)
--- a/gcc/doc/tm.texi.in
+++ b/gcc/doc/tm.texi.in
@@ -2946,10 +2946,10 @@ default value of this macro is zero.
 
 @defmac STACK_CHECK_PROTECT
 The number of bytes of stack needed to recover from a stack overflow, for
-languages where such a recovery is supported.  The default value of 75 words
+languages where such a recovery is supported.  The default value of 4KB/8KB
 with the @code{setjmp}/@code{longjmp}-based exception handling mechanism and
-8192 bytes with other exception handling mechanisms should be adequate for
-most machines.
+8KB/12KB with other exception handling mechanisms should be adequate for most
+architectures and operating systems.
 @end defmac
 
 The following macros are relevant only if neither STACK_CHECK_BUILTIN