diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 923a1204426..88a7c7319f3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-12  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* function.c (expand_function_end): Set the locator of the prologue on
+	the stack checking insns.
+
 2010-11-12  Richard Henderson  <rth@redhat.com>
 
 	* config.gcc [xtensa] (extra_options): Add fused-madd.opt.
diff --git a/gcc/function.c b/gcc/function.c
index cb6a2b6ce18..18025e3e26f 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -4867,6 +4867,7 @@ expand_function_end (void)
 	      probe_stack_range (STACK_OLD_CHECK_PROTECT, max_frame_size);
 	    seq = get_insns ();
 	    end_sequence ();
+	    set_insn_locators (seq, prologue_locator);
 	    emit_insn_before (seq, stack_check_probe_note);
 	    break;
 	  }