From 5cec9f5974ed8ab0788179b2afd48eb484f39acb Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 10 Jul 2009 01:03:01 -0400 Subject: [PATCH] targhooks.c (default_target_can_inline_p): Rename from default_target_option_can_inline_p. * targhooks.c (default_target_can_inline_p): Rename from default_target_option_can_inline_p. * targhooks.h (default_target_can_inline_p): Likewise. * target-def.h (TARGET_CAN_INLINE_P): Rename from TARGET_OPTION_CAN_INLINE_P. * config/i386/i386.c (TARGET_CAN_INLINE_P): Likewise. * config/mep/mep.c (TARGET_CAN_INLINE_P): Likewise. (mep_target_can_inline_p): Rename from mep_target_option_can_inline_p. From-SVN: r149457 --- gcc/ChangeLog | 11 +++++++++++ gcc/config/i386/i386.c | 4 ++-- gcc/config/mep/mep.c | 8 ++++---- gcc/target-def.h | 6 +++--- gcc/targhooks.c | 2 +- gcc/targhooks.h | 2 +- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6ec87f37c318..253b5dedf579 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,16 @@ 2009-07-09 DJ Delorie + * targhooks.c (default_target_can_inline_p): Rename from + default_target_option_can_inline_p. + * targhooks.h (default_target_can_inline_p): Likewise. + * target-def.h (TARGET_CAN_INLINE_P): Rename from + TARGET_OPTION_CAN_INLINE_P. + * config/i386/i386.c (TARGET_CAN_INLINE_P): Likewise. + * config/mep/mep.c (TARGET_CAN_INLINE_P): Likewise. + (mep_target_can_inline_p): Rename from + mep_target_option_can_inline_p. + + PR target/40626 * config/mep/mep.h (FUNCTION_ARG_REGNO_P): Add coprocessor registers used to pass vectors. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 6bc23fc75714..684403136ced 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -30589,8 +30589,8 @@ ix86_enum_va_list (int idx, const char **pname, tree *ptree) #undef TARGET_OPTION_PRINT #define TARGET_OPTION_PRINT ix86_function_specific_print -#undef TARGET_OPTION_CAN_INLINE_P -#define TARGET_OPTION_CAN_INLINE_P ix86_can_inline_p +#undef TARGET_CAN_INLINE_P +#define TARGET_CAN_INLINE_P ix86_can_inline_p #undef TARGET_EXPAND_TO_RTL_HOOK #define TARGET_EXPAND_TO_RTL_HOOK ix86_maybe_switch_abi diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c index 71755a34e194..59dbb8895cd8 100644 --- a/gcc/config/mep/mep.c +++ b/gcc/config/mep/mep.c @@ -170,7 +170,7 @@ static tree mep_validate_interrupt (tree *, tree, tree, int, bool *); static tree mep_validate_io_cb (tree *, tree, tree, int, bool *); static tree mep_validate_vliw (tree *, tree, tree, int, bool *); static bool mep_function_attribute_inlinable_p (const_tree); -static bool mep_option_can_inline_p (tree, tree); +static bool mep_can_inline_p (tree, tree); static bool mep_lookup_pragma_disinterrupt (const char *); static int mep_multiple_address_regions (tree, bool); static int mep_attrlist_to_encoding (tree, tree); @@ -236,8 +236,8 @@ static tree mep_gimplify_va_arg_expr (tree, tree, tree *, tree *); #define TARGET_INSERT_ATTRIBUTES mep_insert_attributes #undef TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P #define TARGET_FUNCTION_ATTRIBUTE_INLINABLE_P mep_function_attribute_inlinable_p -#undef TARGET_OPTION_CAN_INLINE_P -#define TARGET_OPTION_CAN_INLINE_P mep_option_can_inline_p +#undef TARGET_CAN_INLINE_P +#define TARGET_CAN_INLINE_P mep_can_inline_p #undef TARGET_SECTION_TYPE_FLAGS #define TARGET_SECTION_TYPE_FLAGS mep_section_type_flags #undef TARGET_ASM_NAMED_SECTION @@ -4110,7 +4110,7 @@ mep_function_attribute_inlinable_p (const_tree callee) } static bool -mep_option_can_inline_p (tree caller, tree callee) +mep_can_inline_p (tree caller, tree callee) { if (TREE_CODE (callee) == ADDR_EXPR) callee = TREE_OPERAND (callee, 0); diff --git a/gcc/target-def.h b/gcc/target-def.h index ddf3e0adc4f4..54060f5395c0 100644 --- a/gcc/target-def.h +++ b/gcc/target-def.h @@ -827,8 +827,8 @@ #define TARGET_OPTION_PRAGMA_PARSE default_target_option_pragma_parse #endif -#ifndef TARGET_OPTION_CAN_INLINE_P -#define TARGET_OPTION_CAN_INLINE_P default_target_option_can_inline_p +#ifndef TARGET_CAN_INLINE_P +#define TARGET_CAN_INLINE_P default_target_can_inline_p #endif #define TARGET_OPTION_HOOKS \ @@ -838,7 +838,7 @@ TARGET_OPTION_RESTORE, \ TARGET_OPTION_PRINT, \ TARGET_OPTION_PRAGMA_PARSE, \ - TARGET_OPTION_CAN_INLINE_P, \ + TARGET_CAN_INLINE_P, \ } /* The whole shebang. */ diff --git a/gcc/targhooks.c b/gcc/targhooks.c index 50a82f47fafd..7d5a09233c75 100644 --- a/gcc/targhooks.c +++ b/gcc/targhooks.c @@ -771,7 +771,7 @@ default_target_option_pragma_parse (tree ARG_UNUSED (args), } bool -default_target_option_can_inline_p (tree caller, tree callee) +default_target_can_inline_p (tree caller, tree callee) { bool ret = false; tree callee_opts = DECL_FUNCTION_SPECIFIC_TARGET (callee); diff --git a/gcc/targhooks.h b/gcc/targhooks.h index 5d77ce5854b5..839f1c323601 100644 --- a/gcc/targhooks.h +++ b/gcc/targhooks.h @@ -107,5 +107,5 @@ extern tree default_emutls_var_init (tree, tree, tree); extern bool default_hard_regno_scratch_ok (unsigned int); extern bool default_target_option_valid_attribute_p (tree, tree, tree, int); extern bool default_target_option_pragma_parse (tree, tree); -extern bool default_target_option_can_inline_p (tree, tree); +extern bool default_target_can_inline_p (tree, tree); extern unsigned int default_case_values_threshold (void);