diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ce1caab046e..97076399d2b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-06  Richard Sandiford  <richard@codesourcery.com>
+
+	* config/m68k/m68k.c (m68k_save_reg): Remove special case for
+	leaf functions.
+	(m68k_expand_prologue): Likewise.
+
 2007-03-06  Richard Sandiford  <richard@codesourcery.com>
 
 	* config/m68k/m68k-protos.h (output_sibcall): Declare.
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 8c99d4f30f8..e491beb38fc 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -749,8 +749,6 @@ m68k_save_reg (unsigned int regno, bool interrupt_handler)
     {
       if (current_function_uses_pic_offset_table)
 	return true;
-      if (!current_function_is_leaf && TARGET_ID_SHARED_LIBRARY)
-	return true;
     }
 
   if (current_function_calls_eh_return)
@@ -996,8 +994,7 @@ m68k_expand_prologue (void)
 
   if (flag_pic
       && !TARGET_SEP_DATA
-      && (current_function_uses_pic_offset_table
-	  || (!current_function_is_leaf && TARGET_ID_SHARED_LIBRARY)))
+      && current_function_uses_pic_offset_table)
     {
       insn = emit_insn (gen_load_got (pic_offset_table_rtx));
       REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_MAYBE_DEAD,