diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d95624c9b49e4198afef4e20fbc20a1292fbf4f..bea01b052976ed9f2fd3fa28181b9625bbe5074c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-18  Kazu Hirata  <kazu@codesourcery.com>
+
+	* config/m68k/m68k-protos.h (use_return_insn): Rename to...
+	(m68k_use_return_insn): ...this.
+	* config/m68k/m68k.h (USE_RETURN_INSN): Delete.
+	* config/m68k/m68k.c (use_return_insn): Rename to...
+	(m68k_use_return_insn): ...this.
+	* config/m68k/m68k.md (return): Use m68k_use_return_insn instead
+	of USE_RETURN_INSN.
+
 2007-01-18  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* config/m68k/fpgnulib.c (__truncdfsf2): Implement round to
diff --git a/gcc/config/m68k/m68k-protos.h b/gcc/config/m68k/m68k-protos.h
index 30d25b75510705bf25ca9b4878665c1da9521fbe..0818900ef9a917c43ec435d4c30b7f3a1450d059 100644
--- a/gcc/config/m68k/m68k-protos.h
+++ b/gcc/config/m68k/m68k-protos.h
@@ -59,7 +59,7 @@ extern int emit_move_sequence (rtx *, enum machine_mode, rtx);
 
 extern bool m68k_regno_mode_ok (int, enum machine_mode);
 extern int flags_in_68881 (void);
-extern bool use_return_insn (void);
+extern bool m68k_use_return_insn (void);
 extern void override_options (void);
 extern const char *m68k_cpp_cpu_ident (const char *);
 extern const char *m68k_cpp_cpu_family (const char *);
diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index aa91b72df00dcc91812d4479e18996c84e64cfd1..1bfa6867cd50961b4649ffb54b930571d57af8c5 100644
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -1022,7 +1022,7 @@ m68k_output_function_prologue (FILE *stream,
 /* Return true if this function's epilogue can be output as RTL.  */
 
 bool
-use_return_insn (void)
+m68k_use_return_insn (void)
 {
   if (!reload_completed || frame_pointer_needed || get_frame_size () != 0)
     return false;
diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index 2b72781bc1b37bd54e9800cde02557ba6c4d10f7..5f0808d7f0b6d67f5b847a93b8d5f58ca2977dbb 100644
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -648,12 +648,6 @@ extern enum reg_class regno_reg_class[];
 
 #define EXIT_IGNORE_STACK 1
 
-/* Determine if the epilogue should be output as RTL.
-   You should override this if you define FUNCTION_EXTRA_EPILOGUE.
-
-   XXX This macro is m68k-specific and only used in m68k.md.  */
-#define USE_RETURN_INSN use_return_insn ()
-
 /* Output assembler code for a block containing the constant parts
    of a trampoline, leaving space for the variable parts.
 
diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md
index 35f944c790bec9289865289f51b4ee702d191f1e..b14b3c95f10608b3ba8ee666e156778db49b39af 100644
--- a/gcc/config/m68k/m68k.md
+++ b/gcc/config/m68k/m68k.md
@@ -6455,7 +6455,7 @@
 ;; Used for frameless functions which save no regs and allocate no locals.
 (define_insn "return"
   [(return)]
-  "USE_RETURN_INSN"
+  "m68k_use_return_insn ()"
 {
   if (current_function_pops_args == 0)
     return "rts";