function.c (expand_function_start): Initialize stack_check_probe_note only if the...

	* function.c (expand_function_start): Initialize stack_check_probe_note
	only if the generic stack checking mechanism is used.

From-SVN: r173661

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 09654faf15d75075142d12e88a581c60b76f4755..6db1f29e8ae8d54363abf81fa454e7a98d1e41b6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-11  Eric Botcazou  <ebotcazou@adacore.com>
+
+       * function.c (expand_function_start): Initialize stack_check_probe_note
+       only if the generic stack checking mechanism is used.
+
 2011-05-11  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/15256

diff --git a/gcc/function.c b/gcc/function.c
index ab1ca9ecf52e06416f9ace41050cd0091c865ec9..4b0220117435c385a06c05f7b959603cfdfc7bfe 100644 (file)
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4813,9 +4813,8 @@ expand_function_start (tree subr)
 #endif
     }
 
-  /* After the display initializations is where the stack checking
-     probe should go.  */
-  if(flag_stack_check)
+  /* If we are doing generic stack checking, the probe should go here.  */
+  if (flag_stack_check == GENERIC_STACK_CHECK)
     stack_check_probe_note = emit_note (NOTE_INSN_DELETED);
 
   /* Make sure there is a line number after the function entry setup code.  */