diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 86d0705286b..20c88a7c1c1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb  8 01:39:45 2000  Hans-Peter Nilsson  <hp@bitrange.com>
+
+	* function.c (emit_return_into_block): Wrap in #ifdef HAVE_return.
+
 2000-02-07  Mark Mitchell  <mark@codesourcery.com>
 
 	* cpplib.c (cpp_get_token): Call CPP_BUMP_LINE after reading a
diff --git a/gcc/function.c b/gcc/function.c
index 6945b6b53e0..8f383f067c2 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -271,7 +271,9 @@ static int all_blocks		PARAMS ((tree, tree *));
    can always export `prologue_epilogue_contains'.  */
 static int *record_insns	PARAMS ((rtx)) ATTRIBUTE_UNUSED;
 static int contains		PARAMS ((rtx, int *));
+#ifdef HAVE_return
 static void emit_return_into_block PARAMS ((basic_block));
+#endif
 static void put_addressof_into_stack PARAMS ((rtx, struct hash_table *));
 static boolean purge_addressof_1 PARAMS ((rtx *, rtx, int, int, 
 					  struct hash_table *));
@@ -6581,6 +6583,7 @@ prologue_epilogue_contains (insn)
   return 0;
 }
 
+#ifdef HAVE_return
 /* Insert gen_return at the end of block BB.  This also means updating
    block_for_insn appropriately.  */
 
@@ -6601,6 +6604,7 @@ emit_return_into_block (bb)
     }
   bb->end = end;
 }
+#endif /* HAVE_return */
 
 /* Generate the prologue and epilogue RTL if the machine supports it.  Thread
    this into place with notes indicating where the prologue ends and where