diff options
| author | Anatoly Sokolov <aesok@post.ru> | 2010-09-23 20:15:44 +0400 |
|---|---|---|
| committer | Anatoly Sokolov <aesok@gcc.gnu.org> | 2010-09-23 20:15:44 +0400 |
| commit | ffda8a0d87c899045128b80c06522ef65bfb7252 (patch) | |
| tree | 3bc9129a0b31d16c4943087863e08115b077a28e | |
| parent | 17eba94716651dad5794c22ef649c65776c74cb8 (diff) | |
| download | gcc-ffda8a0d87c899045128b80c06522ef65bfb7252.zip gcc-ffda8a0d87c899045128b80c06522ef65bfb7252.tar.gz gcc-ffda8a0d87c899045128b80c06522ef65bfb7252.tar.bz2 | |
arm.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
* config/arm/arm.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
* config/arm/arm-protos.h (arm_output_addr_const_extra): Remove.
* config/arm/arm.c (TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define.
(arm_output_addr_const_extra): Make static.
From-SVN: r164568
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/arm/arm-protos.h | 2 | ||||
| -rw-r--r-- | gcc/config/arm/arm.c | 8 | ||||
| -rw-r--r-- | gcc/config/arm/arm.h | 4 |
4 files changed, 14 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ac4745b..66552a6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2010-09-23 Anatoly Sokolov <aesok@post.ru> + + * config/arm/arm.h (OUTPUT_ADDR_CONST_EXTRA): Remove. + * config/arm/arm-protos.h (arm_output_addr_const_extra): Remove. + * config/arm/arm.c (TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define. + (arm_output_addr_const_extra): Make static. + 2010-09-23 Uros Bizjak <ubizjak@gmail.com> * config/i386/i386.md (UNSPECV_NOPS): Rename from UNSPEC_NOPS and diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 9229afa..c861bb6 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -151,8 +151,6 @@ extern const char *arm_output_memory_barrier (rtx *); extern const char *arm_output_sync_insn (rtx, rtx *); extern unsigned int arm_sync_loop_insns (rtx , rtx *); -extern bool arm_output_addr_const_extra (FILE *, rtx); - #if defined TREE_CODE extern void arm_init_cumulative_args (CUMULATIVE_ARGS *, tree, rtx, tree); extern bool arm_pad_arg_upward (enum machine_mode, const_tree); diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 0701b48..782bc98 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -224,6 +224,7 @@ static bool arm_cannot_copy_insn_p (rtx); static bool arm_tls_symbol_p (rtx x); static int arm_issue_rate (void); static void arm_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED; +static bool arm_output_addr_const_extra (FILE *, rtx); static bool arm_allocate_stack_slots_for_args (void); static const char *arm_invalid_parameter_type (const_tree t); static const char *arm_invalid_return_type (const_tree t); @@ -309,6 +310,9 @@ static const struct attribute_spec arm_attribute_table[] = #undef TARGET_PRINT_OPERAND_PUNCT_VALID_P #define TARGET_PRINT_OPERAND_PUNCT_VALID_P arm_print_operand_punct_valid_p +#undef TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA +#define TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA arm_output_addr_const_extra + #undef TARGET_ASM_FUNCTION_PROLOGUE #define TARGET_ASM_FUNCTION_PROLOGUE arm_output_function_prologue @@ -22451,7 +22455,9 @@ arm_output_dwarf_dtprel (FILE *file, int size, rtx x) fputs ("(tlsldo)", file); } -bool +/* Implement TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA. */ + +static bool arm_output_addr_const_extra (FILE *fp, rtx x) { if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_TLS) diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h index 2252a25..9bd1c69 100644 --- a/gcc/config/arm/arm.h +++ b/gcc/config/arm/arm.h @@ -2419,10 +2419,6 @@ extern int making_const_table; & ~ (unsigned HOST_WIDE_INT) 0xffffffff) \ : 0)))) -#define OUTPUT_ADDR_CONST_EXTRA(file, x, fail) \ - if (arm_output_addr_const_extra (file, x) == FALSE) \ - goto fail - /* A C expression whose value is RTL representing the value of the return address for the frame COUNT steps up from the current frame. */ |