diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d5c60c03cf53..d9f6157cb48d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-19  Jan Hubicka  <jh@suse.cz>
+
+	* builtins.c (expand_builtin_nonlocal_goto): Stabilize r_sp before
+	clobbering framepointer.
+
 2008-06-19  Jan Hubicka  <jh@suse.cz>
 
 	* tree-optimize.c (execute_early_local_optimizations): Set
diff --git a/gcc/builtins.c b/gcc/builtins.c
index 57d9379983bb..cdc5ab313752 100644
--- a/gcc/builtins.c
+++ b/gcc/builtins.c
@@ -887,6 +887,7 @@ expand_builtin_nonlocal_goto (tree exp)
 #endif
     {
       r_label = copy_to_reg (r_label);
+      r_sp = copy_to_reg (r_sp);
 
       emit_clobber (gen_rtx_MEM (BLKmode, gen_rtx_SCRATCH (VOIDmode)));
       emit_clobber (gen_rtx_MEM (BLKmode, hard_frame_pointer_rtx));