* system.h (TRAMPOLINE_TEMPLATE, INITIALIZE_TRAMPOLINE): Poison.

        (TRAMPOLINE_ADJUST_ADDRESS): Poison.
        * target-def.h (TARGET_ASM_TRAMPOLINE_TEMPLATE): Don't conditionalize
        on TRAMPOLINE_TEMPLATE.
        (TARGET_TRAMPOLINE_ADJUST_ADDRESS): Don't conditionalize on
        TRAMPOLINE_ADJUST_ADDRESS.
        * targhooks.c (default_asm_trampoline_template): Remove.
        (default_trampoline_adjust_address): Remove.
        (default_trampoline_init): Don't handle INITIALIZE_TRAMPOLINE.
        * targhooks.h: Update decls.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@152042 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2da2d44..0c3a0b6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2009-09-22  Richard Henderson  <rth@redhat.com>
+
+       * system.h (TRAMPOLINE_TEMPLATE, INITIALIZE_TRAMPOLINE): Poison.
+       (TRAMPOLINE_ADJUST_ADDRESS): Poison.
+       * target-def.h (TARGET_ASM_TRAMPOLINE_TEMPLATE): Don't conditionalize
+       on TRAMPOLINE_TEMPLATE.
+       (TARGET_TRAMPOLINE_ADJUST_ADDRESS): Don't conditionalize on
+       TRAMPOLINE_ADJUST_ADDRESS.
+       * targhooks.c (default_asm_trampoline_template): Remove.
+       (default_trampoline_adjust_address): Remove.
+       (default_trampoline_init): Don't handle INITIALIZE_TRAMPOLINE.
+       * targhooks.h: Update decls.
+
 2009-09-22  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * config/i386/cygming.h (TARGET_USE_JCR_SECTION): Enable.

diff --git a/gcc/system.h b/gcc/system.h
index 1b36ddf..37fbdc1 100644 (file)
--- a/gcc/system.h
+++ b/gcc/system.h
@@ -707,7 +707,8 @@ extern void fancy_abort (const char *, int, const char *) ATTRIBUTE_NORETURN;
         VECTOR_MODE_SUPPORTED_P TARGET_SUPPORTS_HIDDEN                         \
        FUNCTION_ARG_PARTIAL_NREGS ASM_OUTPUT_DWARF_DTPREL              \
        ALLOCATE_INITIAL_VALUE LEGITIMIZE_ADDRESS FRAME_POINTER_REQUIRED \
-       CAN_ELIMINATE
+       CAN_ELIMINATE TRAMPOLINE_TEMPLATE INITIALIZE_TRAMPOLINE         \
+       TRAMPOLINE_ADJUST_ADDRESS
 
 /* Other obsolete target macros, or macros that used to be in target
    headers and were not used, and may be obsolete or may never have

diff --git a/gcc/target-def.h b/gcc/target-def.h
index 2ccdc66..45b7ab7 100644 (file)
--- a/gcc/target-def.h
+++ b/gcc/target-def.h
@@ -247,11 +247,7 @@
 #define TARGET_ASM_RECORD_GCC_SWITCHES_SECTION ".GCC.command.line"
 #endif
 
-#ifdef TRAMPOLINE_TEMPLATE
-# define TARGET_ASM_TRAMPOLINE_TEMPLATE default_asm_trampoline_template
-#else
-# define TARGET_ASM_TRAMPOLINE_TEMPLATE NULL
-#endif
+#define TARGET_ASM_TRAMPOLINE_TEMPLATE NULL
 
 #define TARGET_ASM_ALIGNED_INT_OP                              \
                       {TARGET_ASM_ALIGNED_HI_OP,               \
@@ -616,12 +612,7 @@
 #define TARGET_ALLOCATE_STACK_SLOTS_FOR_ARGS hook_bool_void_true
 #define TARGET_STATIC_CHAIN default_static_chain
 #define TARGET_TRAMPOLINE_INIT default_trampoline_init
-
-#ifdef TRAMPOLINE_ADJUST_ADDRESS
-# define TARGET_TRAMPOLINE_ADJUST_ADDRESS default_trampoline_adjust_address
-#else
-# define TARGET_TRAMPOLINE_ADJUST_ADDRESS NULL
-#endif
+#define TARGET_TRAMPOLINE_ADJUST_ADDRESS NULL
 
 #define TARGET_CALLS {                                         \
    TARGET_PROMOTE_FUNCTION_MODE,                               \

diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index 48401fb..16f481e 100644 (file)
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -654,41 +654,11 @@ default_static_chain (const_tree fndecl, bool incoming_p)
   gcc_unreachable ();
 }
 
-#ifdef TRAMPOLINE_TEMPLATE
-void
-default_asm_trampoline_template (FILE *f)
-{
-  TRAMPOLINE_TEMPLATE (f);
-}
-#endif
-
 void
 default_trampoline_init (rtx ARG_UNUSED (m_tramp), tree ARG_UNUSED (t_func),
                         rtx ARG_UNUSED (r_chain))
 {
-#ifdef INITIALIZE_TRAMPOLINE
-  rtx r_tramp, r_func;
-
-  if (targetm.asm_out.trampoline_template)
-    emit_block_move (m_tramp, assemble_trampoline_template (),
-                    GEN_INT (TRAMPOLINE_SIZE), BLOCK_OP_NORMAL);
-
-  r_func = XEXP (DECL_RTL (t_func), 0);
-  r_tramp = XEXP (m_tramp, 0);
-
-  INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
-#else
   sorry ("nested function trampolines not supported on this target");
-#endif
-}
-
-rtx
-default_trampoline_adjust_address (rtx addr)
-{
-#ifdef TRAMPOLINE_ADJUST_ADDRESS
-  TRAMPOLINE_ADJUST_ADDRESS (addr);
-#endif
-  return addr;
 }
 
 enum reg_class

diff --git a/gcc/targhooks.h b/gcc/targhooks.h
index 1a0dc56..490d4ce 100644 (file)
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -101,9 +101,7 @@ extern rtx default_function_value (const_tree, const_tree, bool);
 extern rtx default_libcall_value (enum machine_mode, rtx);
 extern rtx default_internal_arg_pointer (void);
 extern rtx default_static_chain (const_tree, bool);
-extern void default_asm_trampoline_template (FILE *);
 extern void default_trampoline_init (rtx, tree, rtx);
-extern rtx default_trampoline_adjust_address (rtx);
 extern enum reg_class default_branch_target_register_class (void);
 #ifdef IRA_COVER_CLASSES
 extern const enum reg_class *default_ira_cover_classes (void);