m68k.c (m68k_output_addr_const_extra): Make static.

	* config/m68k/m68k.c (m68k_output_addr_const_extra): Make static.
	(TARGET_OUTPUT_ADDR_CONST_EXTRA): Define.
	* config/m68k/m68k.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
	* config/m68k/m68k-protos.h (m68k_output_addr_const_extra): Remove.

From-SVN: r179474

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c41afd7611319d6533316fac5410acac937b1cc..929dcf6b646dccd65ff891b9ff9dd14e5b70a061 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-10-03  Anatoly Sokolov  <aesok@post.ru>
+
+       * config/m68k/m68k.c (m68k_output_addr_const_extra): Make static.
+       (TARGET_OUTPUT_ADDR_CONST_EXTRA): Define.
+       * config/m68k/m68k.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
+       * config/m68k/m68k-protos.h (m68k_output_addr_const_extra): Remove.
+
 2011-10-03  Steve Ellcey  <sje@cup.hp.com>
 
        PR target/49967

diff --git a/gcc/config/m68k/m68k-protos.h b/gcc/config/m68k/m68k-protos.h
index 8017cf25ed03c740198270c69a35be38ebb0e3d0..df1888628cc82c88b9ed257cd1f8743d47403477 100644 (file)
--- a/gcc/config/m68k/m68k-protos.h
+++ b/gcc/config/m68k/m68k-protos.h
@@ -51,7 +51,6 @@ extern bool strict_low_part_peephole_ok (enum machine_mode mode, rtx first_insn,
 extern int standard_68881_constant_p (rtx);
 extern void print_operand_address (FILE *, rtx);
 extern void print_operand (FILE *, rtx, int);
-extern bool m68k_output_addr_const_extra (FILE *, rtx);
 extern void notice_update_cc (rtx, rtx);
 extern bool m68k_legitimate_base_reg_p (rtx, bool);
 extern bool m68k_legitimate_index_reg_p (rtx, bool);

diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 71df1410394ddf8fa94ea16a22d33a37e4245589..e447708d239bacc81854e29ac8b4f40e0820717a 100644 (file)
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -163,6 +163,7 @@ static void m68k_function_arg_advance (cumulative_args_t, enum machine_mode,
 static rtx m68k_function_arg (cumulative_args_t, enum machine_mode,
                              const_tree, bool);
 static bool m68k_cannot_force_const_mem (enum machine_mode mode, rtx x);
+static bool m68k_output_addr_const_extra (FILE *, rtx);
 \f
 /* Initialize the GCC target structure.  */
 
@@ -297,6 +298,9 @@ static bool m68k_cannot_force_const_mem (enum machine_mode mode, rtx x);
 #undef TARGET_LEGITIMATE_CONSTANT_P
 #define TARGET_LEGITIMATE_CONSTANT_P m68k_legitimate_constant_p
 
+#undef TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA
+#define TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA m68k_output_addr_const_extra
+
 static const struct attribute_spec m68k_attribute_table[] =
 {
   /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler,
@@ -4540,9 +4544,9 @@ m68k_get_reloc_decoration (enum m68k_reloc reloc)
     }
 }
 
-/* m68k implementation of OUTPUT_ADDR_CONST_EXTRA.  */
+/* m68k implementation of TARGET_OUTPUT_ADDR_CONST_EXTRA.  */
 
-bool
+static bool
 m68k_output_addr_const_extra (FILE *file, rtx x)
 {
   if (GET_CODE (x) == UNSPEC)

diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h
index e69e164e71c1b264f8a324bb0eeed00730e6cd0f..c8bd3eee1222f434e20ff4faacdec70d5cc20a6a 100644 (file)
--- a/gcc/config/m68k/m68k.h
+++ b/gcc/config/m68k/m68k.h
@@ -935,12 +935,6 @@ do { if (cc_prev_status.flags & CC_IN_68881)                       \
 
 #define PRINT_OPERAND_ADDRESS(FILE, ADDR) print_operand_address (FILE, ADDR)
 
-#define OUTPUT_ADDR_CONST_EXTRA(FILE, X, FAIL)         \
-do {                                                   \
-  if (! m68k_output_addr_const_extra (FILE, (X)))      \
-    goto FAIL;                                         \
-} while (0);
-
 #include "config/m68k/m68k-opts.h"
 
 enum fpu_type