diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c3c558eb0bf182cdc4472b5738be93204901c0a..3baa40e342bcfe9636153e3b6d9cbd192c9f8329 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2004-02-19  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* hooks.c (hook_void_tree_int): Remove.
+	(hook_void_constcharptr): Likewise.
+	(hook_int_void_0): Likewise.
+	* hooks.h: Remove the prototypes for the above three
+	functions.
+	* targhooks.c (hook_bool_machine_mode_true): Remove.
+	* targhooks.h: Remove the prototype for
+	hook_bool_machine_mode_true.
+
 2004-02-19  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* emit-rtl.c (subreg_realpart_p): Remove.
diff --git a/gcc/hooks.c b/gcc/hooks.c
index a8cd665a45faf6a3224de4f8a0bb2c6e41978981..090a45aba290e83a98f0c27bfbaa6d21df6b870f 100644
--- a/gcc/hooks.c
+++ b/gcc/hooks.c
@@ -55,24 +55,12 @@ hook_bool_bool_false (bool a ATTRIBUTE_UNUSED)
   return false;
 }
 
-
-/* Generic hook that takes (tree, int) and does nothing.  */
-void
-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 (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 (tree a ATTRIBUTE_UNUSED,
@@ -121,12 +109,6 @@ 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,
diff --git a/gcc/hooks.h b/gcc/hooks.h
index 583b504bffe23ff86287760bc864884d624780eb..60355f5f169326938aa69f698b7cee4799395a22 100644
--- a/gcc/hooks.h
+++ b/gcc/hooks.h
@@ -35,16 +35,13 @@ extern bool hook_bool_uintp_uintp_false (unsigned int *, unsigned int *);
 extern bool hook_bool_rtx_int_int_intp_false (rtx, int, int, int *);
 extern bool hook_bool_constcharptr_size_t_false (const char *, size_t);
 
-extern void hook_void_tree_int (tree, int);
 extern void hook_void_void (void);
 extern void hook_void_FILEptr_constcharptr (FILE *, const char *);
 extern void hook_void_tree (tree);
 extern void hook_void_tree_treeptr (tree, tree *);
-extern void hook_void_constcharptr (const char *);
 
 extern int hook_int_tree_tree_1 (tree, tree);
 extern int hook_int_rtx_0 (rtx);
-extern int hook_int_void_0 (void);
 extern int hook_int_size_t_constcharptr_int_0 (size_t, const char *, int);
 extern int hook_int_void_no_regs (void);
 
diff --git a/gcc/targhooks.c b/gcc/targhooks.c
index a2c8273a517857135f6f8e4c2c4978879dc1f79f..03735a64edaf480831d4282a2046cbd59e082b24 100644
--- a/gcc/targhooks.c
+++ b/gcc/targhooks.c
@@ -126,11 +126,3 @@ hook_bool_CUMULATIVE_ARGS_true (CUMULATIVE_ARGS * a ATTRIBUTE_UNUSED)
 {
   return true;
 }
-
-/* Generic hook that takes a machine mode and returns true.  */
-
-bool
-hook_bool_machine_mode_true (enum machine_mode a ATTRIBUTE_UNUSED)
-{
-  return true;
-}
diff --git a/gcc/targhooks.h b/gcc/targhooks.h
index cbe0f6abb8af229cca22bec96c9ad699644a2a12..f755b0f19b543756a8bbbb10ba46536c729ae4d7 100644
--- a/gcc/targhooks.h
+++ b/gcc/targhooks.h
@@ -31,4 +31,3 @@ extern bool hook_bool_CUMULATIVE_ARGS_false (CUMULATIVE_ARGS *);
 extern bool default_pretend_outgoing_varargs_named (CUMULATIVE_ARGS *);
 
 extern bool hook_bool_CUMULATIVE_ARGS_true (CUMULATIVE_ARGS *);
-extern bool hook_bool_machine_mode_true (enum machine_mode);