aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAnatoly Sokolov <aesok@post.ru>2011-10-03 23:16:29 +0400
committerAnatoly Sokolov <aesok@gcc.gnu.org>2011-10-03 23:16:29 +0400
commitcb69db4fe472c6b0a41ad127a950730cd2686836 (patch)
treeafd4c32cec0bda90f31ce498cc5cacbc57d3139d /gcc
parent491258e638542266cb7537181d078cc207749e1e (diff)
downloadgcc-cb69db4fe472c6b0a41ad127a950730cd2686836.zip
gcc-cb69db4fe472c6b0a41ad127a950730cd2686836.tar.gz
gcc-cb69db4fe472c6b0a41ad127a950730cd2686836.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/m68k/m68k-protos.h1
-rw-r--r--gcc/config/m68k/m68k.c8
-rw-r--r--gcc/config/m68k/m68k.h6
4 files changed, 13 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4c41afd..929dcf6 100644
--- 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 8017cf2..df18886 100644
--- 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 71df141..e447708 100644
--- 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);
/* 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 e69e164..c8bd3ee 100644
--- 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