diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2563bd1e1695..d3162be53c2a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-04  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+	* function.c (thread_prologue_and_epilogue_insns): Do not crash
+	on empty epilogue sequences.
+
 2011-01-04  Joseph Myers  <joseph@codesourcery.com>
 
 	* config/vxworks.opt (Bdynamic, Bstatic, Xbind-lazy, Xbind-now,
diff --git a/gcc/function.c b/gcc/function.c
index 0c4d5f82464d..73e59f98ba50 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -5461,7 +5461,8 @@ thread_prologue_and_epilogue_insns (void)
       start_sequence ();
       epilogue_end = emit_note (NOTE_INSN_EPILOGUE_BEG);
       seq = gen_epilogue ();
-      emit_jump_insn (seq);
+      if (seq)
+	emit_jump_insn (seq);
 
       /* Retain a map of the epilogue insns.  */
       record_insns (seq, NULL, &epilogue_insn_hash);