diff options
| author | Richard Henderson <rth@redhat.com> | 2009-09-22 08:14:04 -0700 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2009-09-22 08:14:04 -0700 |
| commit | 87138d8d59f45e4d537f081fedbe5ad19948b9b4 (patch) | |
| tree | 64effb3fb9e63d1e50df7819a073b4a2bc8811c0 | |
| parent | 71e0af3ce5714c6cefa9e160eb37f35bd5fdad72 (diff) | |
| download | gcc-87138d8d59f45e4d537f081fedbe5ad19948b9b4.zip gcc-87138d8d59f45e4d537f081fedbe5ad19948b9b4.tar.gz gcc-87138d8d59f45e4d537f081fedbe5ad19948b9b4.tar.bz2 | |
mep.h (INITIALIZE_TRAMPOLINE): Remove.
* config/mep/mep.h (INITIALIZE_TRAMPOLINE): Remove.
* config/mep/mep.c (TARGET_TRAMPOLINE_INIT): New.
(mep_trampoline_init): Rename from mep_init_trampoline; make static;
update for hook parameters.
* config/mep/mep-protos.h (mep_init_trampoline): Remove.
From-SVN: r152000
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/mep/mep-protos.h | 1 | ||||
| -rw-r--r-- | gcc/config/mep/mep.c | 12 | ||||
| -rw-r--r-- | gcc/config/mep/mep.h | 4 |
4 files changed, 15 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index db118ae..14de92a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -149,6 +149,12 @@ to mcore_asm_trampoline_template. (INITIALIZE_TRAMPOLINE): Move code to mcore_trampoline_init. + * config/mep/mep.h (INITIALIZE_TRAMPOLINE): Remove. + * config/mep/mep.c (TARGET_TRAMPOLINE_INIT): New. + (mep_trampoline_init): Rename from mep_init_trampoline; make static; + update for hook parameters. + * config/mep/mep-protos.h (mep_init_trampoline): Remove. + 2009-09-22 Jakub Jelinek <jakub@redhat.com> * config/rs6000/rs6000.c (bdesc_2arg): Fix CODE_FOR_vector_gt* codes diff --git a/gcc/config/mep/mep-protos.h b/gcc/config/mep/mep-protos.h index e53ca79..82be465 100644 --- a/gcc/config/mep/mep-protos.h +++ b/gcc/config/mep/mep-protos.h @@ -89,7 +89,6 @@ extern void mep_file_cleanups (void); extern const char *mep_strip_name_encoding (const char *); extern void mep_output_aligned_common (FILE *, tree, const char *, int, int, int); -extern void mep_init_trampoline (rtx, rtx, rtx); extern void mep_emit_doloop (rtx *, int); extern bool mep_vliw_function_p (tree); extern bool mep_store_data_bypass_p (rtx, rtx); diff --git a/gcc/config/mep/mep.c b/gcc/config/mep/mep.c index 4c37d38..dcf5362 100644 --- a/gcc/config/mep/mep.c +++ b/gcc/config/mep/mep.c @@ -229,6 +229,7 @@ static tree mep_build_builtin_va_list (void); static void mep_expand_va_start (tree, rtx); static tree mep_gimplify_va_arg_expr (tree, tree, tree *, tree *); static bool mep_can_eliminate (const int, const int); +static void mep_trampoline_init (rtx, tree, rtx); /* Initialize the GCC target structure. */ @@ -300,8 +301,10 @@ static bool mep_can_eliminate (const int, const int); #define TARGET_EXPAND_BUILTIN_VA_START mep_expand_va_start #undef TARGET_GIMPLIFY_VA_ARG_EXPR #define TARGET_GIMPLIFY_VA_ARG_EXPR mep_gimplify_va_arg_expr -#undef TARGET_CAN_ELIMINATE +#undef TARGET_CAN_ELIMINATE #define TARGET_CAN_ELIMINATE mep_can_eliminate +#undef TARGET_TRAMPOLINE_INIT +#define TARGET_TRAMPOLINE_INIT mep_trampoline_init struct gcc_target targetm = TARGET_INITIALIZER; @@ -4922,9 +4925,12 @@ mep_output_aligned_common (FILE *stream, tree decl, const char *name, /* Trampolines. */ -void -mep_init_trampoline (rtx addr, rtx fnaddr, rtx static_chain) +static void +mep_trampoline_init (rtx m_tramp, tree fndecl, rtx static_chain) { + rtx addr = XEXP (m_tramp, 0); + rtx fnaddr = XEXP (DECL_RTL (fndecl), 0); + emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__mep_trampoline_helper"), LCT_NORMAL, VOIDmode, 3, addr, Pmode, diff --git a/gcc/config/mep/mep.h b/gcc/config/mep/mep.h index fff7962..8b00a44 100644 --- a/gcc/config/mep/mep.h +++ b/gcc/config/mep/mep.h @@ -565,10 +565,6 @@ typedef struct run-time also. */ #define TRAMPOLINE_SIZE 20 - -#define INITIALIZE_TRAMPOLINE(ADDR, FNADDR, STATIC_CHAIN) \ - mep_init_trampoline (ADDR, FNADDR, STATIC_CHAIN) - #define CONSTANT_ADDRESS_P(X) CONSTANT_P (X) |