diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7d4ef0aa56..102078dcb5d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-18  Kazu Hirata  <kazu@codesourcery.com>
+
+	* config/m68k/m68k.c (m68k_output_function_epilogue): Don't
+	output a NOP for empty epilogues.
+
 2007-01-18  Richard Sandiford  <richard@codesourcery.com>
 
 	* config/m68k/m68k.c (m68k_use_return_insn): Update comments
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index a2f9f015c87..41f61c74b2c 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -1055,12 +1055,7 @@ m68k_output_function_epilogue (FILE *stream,
   if (GET_CODE (insn) == NOTE)
     insn = prev_nonnote_insn (insn);
   if (insn && GET_CODE (insn) == BARRIER)
-    {
-      /* Output just a no-op so that debuggers don't get confused
-	 about which function the pc is in at this address.  */
-      fprintf (stream, "\tnop\n");
-      return;
-    }
+    return;
 
 #ifdef FUNCTION_EXTRA_EPILOGUE
   FUNCTION_EXTRA_EPILOGUE (stream, size);