From b38bcc540149be54dca4bb75f8b066661df5c8d7 Mon Sep 17 00:00:00 2001
From: rsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 18 Jan 2007 19:50:48 +0000
Subject: [PATCH] gcc/ 200x-xx-xx 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120926 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 10 ++++++++++
gcc/config/m68k/m68k-protos.h | 2 +-
gcc/config/m68k/m68k.c | 2 +-
gcc/config/m68k/m68k.h | 6 ------
gcc/config/m68k/m68k.md | 2 +-
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4d95624c9b49..bea01b052976 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 30d25b755107..0818900ef9a9 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 aa91b72df00d..1bfa6867cd50 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 2b72781bc1b3..5f0808d7f0b6 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 35f944c790be..b14b3c95f106 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";
--
GitLab