From 2283c41652ec7e7721622d4b4057d93d57a464b8 Mon Sep 17 00:00:00 2001 From: Anatoly Sokolov Date: Sat, 19 Nov 2011 01:23:08 +0400 Subject: [PATCH] cris.c (cris_function_value_regno_p): Make static. * config/cris/cris.c (cris_function_value_regno_p): Make static. (TARGET_FUNCTION_VALUE_REGNO_P): Define. * config/cris/cris.h (FUNCTION_VALUE_REGNO_P): Remove. * config/cris/cris-protos.h (cris_function_value_regno_p): Remove. From-SVN: r181493 --- gcc/ChangeLog | 7 +++++++ gcc/config/cris/cris-protos.h | 2 -- gcc/config/cris/cris.c | 5 ++++- gcc/config/cris/cris.h | 6 ------ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2d5091df6fb..71f7bc4f194 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-11-18 Anatoly Sokolov + + * config/cris/cris.c (cris_function_value_regno_p): Make static. + (TARGET_FUNCTION_VALUE_REGNO_P): Define. + * config/cris/cris.h (FUNCTION_VALUE_REGNO_P): Remove. + * config/cris/cris-protos.h (cris_function_value_regno_p): Remove. + 2011-11-18 H.J. Lu PR target/33944 diff --git a/gcc/config/cris/cris-protos.h b/gcc/config/cris/cris-protos.h index 291981d5707..545f821ac0f 100644 --- a/gcc/config/cris/cris-protos.h +++ b/gcc/config/cris/cris-protos.h @@ -65,5 +65,3 @@ extern int cris_fatal (char *); extern int cris_initial_elimination_offset (int, int); extern void cris_init_expanders (void); - -extern bool cris_function_value_regno_p (const unsigned int); diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index 06568023051..de9e26984ea 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -153,6 +153,7 @@ static void cris_trampoline_init (rtx, tree, rtx); static rtx cris_function_value(const_tree, const_tree, bool); static rtx cris_libcall_value (enum machine_mode, const_rtx); +static bool cris_function_value_regno_p (const unsigned int); /* This is the parsed result of the "-max-stack-stackframe=" option. If it (still) is zero, then there was no such option given. */ @@ -252,6 +253,8 @@ int cris_cpu_version = CRIS_DEFAULT_CPU_VERSION; #define TARGET_FUNCTION_VALUE cris_function_value #undef TARGET_LIBCALL_VALUE #define TARGET_LIBCALL_VALUE cris_libcall_value +#undef TARGET_FUNCTION_VALUE_REGNO_P +#define TARGET_FUNCTION_VALUE_REGNO_P cris_function_value_regno_p struct gcc_target targetm = TARGET_INITIALIZER; @@ -3931,7 +3934,7 @@ cris_libcall_value (enum machine_mode mode, /* Let's assume all functions return in r[CRIS_FIRST_ARG_REG] for the time being. */ -bool +static bool cris_function_value_regno_p (const unsigned int regno) { return (regno == CRIS_FIRST_ARG_REG); diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index 5a6ebda2e48..ff0be0041f0 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -712,12 +712,6 @@ struct cum_args {int regs;}; && (REGNO) < CRIS_FIRST_ARG_REG + (CRIS_MAX_ARGS_IN_REGS)) -/* Node: Scalar Return */ - -#define FUNCTION_VALUE_REGNO_P(N) cris_function_value_regno_p (N) - - - /* Node: Aggregate Return */ #define CRIS_STRUCT_VALUE_REGNUM ((CRIS_FIRST_ARG_REG) - 1) -- 2.30.2