diff options
| author | Anatoly Sokolov <aesok@post.ru> | 2011-10-03 23:39:50 +0400 |
|---|---|---|
| committer | Anatoly Sokolov <aesok@gcc.gnu.org> | 2011-10-03 23:39:50 +0400 |
| commit | 586747fca1b7a1faf6df62a0fb749976978fbee0 (patch) | |
| tree | ace9e888732df281517a69d19968a665e59af560 /gcc | |
| parent | cb69db4fe472c6b0a41ad127a950730cd2686836 (diff) | |
| download | gcc-586747fca1b7a1faf6df62a0fb749976978fbee0.zip gcc-586747fca1b7a1faf6df62a0fb749976978fbee0.tar.gz gcc-586747fca1b7a1faf6df62a0fb749976978fbee0.tar.bz2 | |
cris.c (cris_output_addr_const_extra): Make static.
* config/cris/cris.c (cris_output_addr_const_extra): Make static.
(TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define.
* config/cris/cris.h (OUTPUT_ADDR_CONST_EXTRA): Remove.
* config/cris/cris-protos.h (cris_output_addr_const_extra): Remove.
From-SVN: r179476
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/cris/cris-protos.h | 1 | ||||
| -rw-r--r-- | gcc/config/cris/cris.c | 8 | ||||
| -rw-r--r-- | gcc/config/cris/cris.h | 3 |
4 files changed, 14 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 929dcf6..74839b7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,7 +1,14 @@ 2011-10-03 Anatoly Sokolov <aesok@post.ru> + * config/cris/cris.c (cris_output_addr_const_extra): Make static. + (TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA): Define. + * config/cris/cris.h (OUTPUT_ADDR_CONST_EXTRA): Remove. + * config/cris/cris-protos.h (cris_output_addr_const_extra): Remove. + +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. + (TARGET_ASM_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. diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h index ba91de1..f37927e 100644 --- a/gcc/config/cris/cris-protos.h +++ b/gcc/config/cris/cris-protos.h @@ -38,7 +38,6 @@ extern bool cris_valid_pic_const (rtx, bool); extern bool cris_store_multiple_op_p (rtx); extern bool cris_movem_load_rest_p (rtx, int); extern void cris_asm_output_symbol_ref (FILE *, rtx); -extern bool cris_output_addr_const_extra (FILE *, rtx); extern int cris_cfun_uses_pic_table (void); extern void cris_asm_output_case_end (FILE *, int, rtx); extern rtx cris_gen_movem_load (rtx, rtx, int); diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index 24cfa5a..b74bbd3 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -113,6 +113,8 @@ static void cris_print_operand_address (FILE *, rtx); static bool cris_print_operand_punct_valid_p (unsigned char code); +static bool cris_output_addr_const_extra (FILE *, rtx); + static void cris_conditional_register_usage (void); static void cris_asm_output_mi_thunk @@ -179,6 +181,8 @@ int cris_cpu_version = CRIS_DEFAULT_CPU_VERSION; #define TARGET_PRINT_OPERAND_ADDRESS cris_print_operand_address #undef TARGET_PRINT_OPERAND_PUNCT_VALID_P #define TARGET_PRINT_OPERAND_PUNCT_VALID_P cris_print_operand_punct_valid_p +#undef TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA +#define TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA cris_output_addr_const_extra #undef TARGET_CONDITIONAL_REGISTER_USAGE #define TARGET_CONDITIONAL_REGISTER_USAGE cris_conditional_register_usage @@ -3608,9 +3612,9 @@ cris_asm_output_label_ref (FILE *file, char *buf) assemble_name (file, buf); } -/* Worker function for OUTPUT_ADDR_CONST_EXTRA. */ +/* Worker function for TARGET_ASM_OUTPUT_ADDR_CONST_EXTRA. */ -bool +static bool cris_output_addr_const_extra (FILE *file, rtx xconst) { switch (GET_CODE (xconst)) diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index 872165e..a18b14e 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -1097,9 +1097,6 @@ enum cris_pic_symbol_type /* Node: Data Output */ -#define OUTPUT_ADDR_CONST_EXTRA(STREAM, X, FAIL) \ - do { if (!cris_output_addr_const_extra (STREAM, X)) goto FAIL; } while (0) - #define IS_ASM_LOGICAL_LINE_SEPARATOR(C, STR) (C) == '@' /* Node: Uninitialized Data */ |