This commit was generated by cvs2svn to compensate for changes in r132718,

which included commits to RCS files with non-trunk default branches.

1 files changed, 142 insertions, 36 deletions

diff --git a/contrib/gcc/hooks.c b/contrib/gcc/hooks.c
index 3f212ef..a8cd665 100644
--- a/contrib/gcc/hooks.c
+++ b/contrib/gcc/hooks.c
@@ -1,5 +1,5 @@
 /* General-purpose hooks.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -24,100 +24,206 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "hooks.h"
 
 /* Generic hook that does absolutely zappo.  */
 void
-hook_void_void ()
+hook_void_void (void)
 {
 }
 
 /* Generic hook that takes no arguments and returns false.  */
 bool
-hook_bool_void_false ()
+hook_bool_void_false (void)
 {
   return false;
 }
 
+/* The same, but formally returning NO_REGS.  */
+int
+hook_int_void_no_regs (void)
+{
+  return NO_REGS;
+}
+
+/* Generic hook that takes (bool) and returns false.  */
+bool
+hook_bool_bool_false (bool a ATTRIBUTE_UNUSED)
+{
+  return false;
+}
+
+
 /* Generic hook that takes (tree, int) and does nothing.  */
 void
-hook_void_tree_int (a, b)
-     tree a ATTRIBUTE_UNUSED;
-     int b ATTRIBUTE_UNUSED;
+hook_void_tree_int (tree a ATTRIBUTE_UNUSED, int b ATTRIBUTE_UNUSED)
 {
 }
 
 /* Generic hook that takes (FILE *, const char *) and does nothing.  */
 void
-hook_void_FILEptr_constcharptr (a, b)
-     FILE *a ATTRIBUTE_UNUSED;
-     const char *b ATTRIBUTE_UNUSED;
+hook_void_FILEptr_constcharptr (FILE *a ATTRIBUTE_UNUSED, const char *b ATTRIBUTE_UNUSED)
+{
+}
+
+void
+hook_void_constcharptr (const char *a ATTRIBUTE_UNUSED)
 {
 }
 
 /* Used for the TARGET_ASM_CAN_OUTPUT_MI_THUNK hook.  */
 bool
-hook_bool_tree_hwi_hwi_tree_false (a, b, c, d)
-     tree a ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT b ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT c ATTRIBUTE_UNUSED;
-     tree d ATTRIBUTE_UNUSED;
+hook_bool_tree_hwi_hwi_tree_false (tree a ATTRIBUTE_UNUSED,
+				   HOST_WIDE_INT b ATTRIBUTE_UNUSED,
+				   HOST_WIDE_INT c ATTRIBUTE_UNUSED,
+				   tree d ATTRIBUTE_UNUSED)
 {
   return false;
 }
 
 bool
-hook_bool_tree_hwi_hwi_tree_true (a, b, c, d)
-     tree a ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT b ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT c ATTRIBUTE_UNUSED;
-     tree d ATTRIBUTE_UNUSED;
+hook_bool_tree_hwi_hwi_tree_true (tree a ATTRIBUTE_UNUSED,
+				  HOST_WIDE_INT b ATTRIBUTE_UNUSED,
+				  HOST_WIDE_INT c ATTRIBUTE_UNUSED,
+				  tree d ATTRIBUTE_UNUSED)
 {
   return true;
 }
 
 bool
-default_can_output_mi_thunk_no_vcall (a, b, c, d)
-     tree a ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT b ATTRIBUTE_UNUSED;
-     HOST_WIDE_INT c;
-     tree d ATTRIBUTE_UNUSED;
+hook_bool_constcharptr_size_t_false (const char *a ATTRIBUTE_UNUSED,
+				     size_t b ATTRIBUTE_UNUSED)
+{
+  return false;
+}
+
+bool
+default_can_output_mi_thunk_no_vcall (tree a ATTRIBUTE_UNUSED,
+				      HOST_WIDE_INT b ATTRIBUTE_UNUSED,
+				      HOST_WIDE_INT c,
+				      tree d ATTRIBUTE_UNUSED)
 {
   return c == 0;
 }
 
 /* ??? Used for comp_type_attributes, which ought to return bool.  */
 int
-hook_int_tree_tree_1 (a, b)
-     tree a ATTRIBUTE_UNUSED;
-     tree b ATTRIBUTE_UNUSED;
+hook_int_tree_tree_1 (tree a ATTRIBUTE_UNUSED, tree b ATTRIBUTE_UNUSED)
 {
   return 1;
 }
 
+int
+hook_int_rtx_0 (rtx a ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+int
+hook_int_void_0 (void)
+{
+  return 0;
+}
+
+int
+hook_int_size_t_constcharptr_int_0 (size_t a ATTRIBUTE_UNUSED,
+				    const char *b ATTRIBUTE_UNUSED,
+				    int c ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
+unsigned int
+hook_uint_uint_constcharptrptr_0 (unsigned int a ATTRIBUTE_UNUSED,
+				  const char **b ATTRIBUTE_UNUSED)
+{
+  return 0;
+}
+
 void
-hook_void_tree (a)
-     tree a ATTRIBUTE_UNUSED;
+hook_void_tree (tree a ATTRIBUTE_UNUSED)
 {
 }
 
 void
-hook_void_tree_treeptr (a, b)
-     tree a ATTRIBUTE_UNUSED;
-     tree *b ATTRIBUTE_UNUSED;
+hook_void_tree_treeptr (tree a ATTRIBUTE_UNUSED, tree *b ATTRIBUTE_UNUSED)
 {
 }
 
 bool
-hook_bool_tree_false (a)
-     tree a ATTRIBUTE_UNUSED;
+hook_bool_tree_false (tree a ATTRIBUTE_UNUSED)
 {
   return false;
 }
 
 bool
-hook_bool_rtx_false (a)
-     rtx a ATTRIBUTE_UNUSED;
+hook_bool_tree_true (tree a ATTRIBUTE_UNUSED)
+{
+  return true;
+}
+
+bool
+hook_bool_tree_tree_false (tree a ATTRIBUTE_UNUSED, tree b ATTRIBUTE_UNUSED)
+{
+  return false;
+}
+
+bool
+hook_bool_rtx_false (rtx a ATTRIBUTE_UNUSED)
+{
+  return false;
+}
+
+bool
+hook_bool_uintp_uintp_false (unsigned int *a ATTRIBUTE_UNUSED,
+			     unsigned int *b ATTRIBUTE_UNUSED)
+{
+  return false;
+}
+
+bool
+hook_bool_rtx_int_int_intp_false (rtx a ATTRIBUTE_UNUSED,
+				  int b ATTRIBUTE_UNUSED,
+				  int c ATTRIBUTE_UNUSED,
+				  int *d ATTRIBUTE_UNUSED)
+{
+  return false;
+}
+
+/* Generic hook that takes an rtx and returns it.  */
+rtx
+hook_rtx_rtx_identity (rtx x)
+{
+  return x;
+}
+
+/* Generic hook that takes an rtx and returns NULL_RTX.  */
+rtx
+hook_rtx_rtx_null (rtx x ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+/* Generic hook that takes a tree and an int and returns NULL_RTX.  */
+rtx
+hook_rtx_tree_int_null (tree a ATTRIBUTE_UNUSED, int b ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+/* Generic hook that takes a size_t and returns NULL.  */
+void *
+hook_voidp_size_t_null (size_t a ATTRIBUTE_UNUSED)
+{
+  return NULL;
+}
+
+/* Generic hook that takes a size_t and a pointer and returns false.  */
+bool
+hook_bool_voidp_size_t_false (void * a ATTRIBUTE_UNUSED,
+			      size_t b ATTRIBUTE_UNUSED)
 {
   return false;
 }