diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c3dbb552593..665435746ee 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2004-02-06  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* config/frv/frv-protos.h: Remove the prototype for
+	frv_setup_incoming_varargs.
+	* config/frv/frv.c (TARGET_SETUP_INCOMING_VARARGS): New.
+	(frv_setup_incoming_varargs): Make it static.
+	* config/frv/frv.h (SETUP_INCOMING_VARARGS): Remove.
+
 2004-02-06  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/fr30/fr30-protos.h: Remove the prototype for
diff --git a/gcc/config/frv/frv-protos.h b/gcc/config/frv/frv-protos.h
index ff720331fbe..af35ca859f2 100644
--- a/gcc/config/frv/frv-protos.h
+++ b/gcc/config/frv/frv-protos.h
@@ -92,10 +92,6 @@ extern int frv_function_arg_callee_copies	(CUMULATIVE_ARGS *,
 						 enum machine_mode,
 						 tree, int);
 
-extern void frv_setup_incoming_varargs		(CUMULATIVE_ARGS *,
-						 enum machine_mode,
-						 tree, int *, int);
-
 extern void frv_expand_builtin_va_start		(tree, rtx);
 extern rtx frv_expand_builtin_va_arg		(tree, tree);
 #endif /* TREE_CODE */
diff --git a/gcc/config/frv/frv.c b/gcc/config/frv/frv.c
index 32c2d27d6e3..1773a825d6a 100644
--- a/gcc/config/frv/frv.c
+++ b/gcc/config/frv/frv.c
@@ -263,6 +263,9 @@ static void frv_init_libfuncs			(void);
 static bool frv_in_small_data_p			(tree);
 static void frv_asm_output_mi_thunk
   (FILE *, tree, HOST_WIDE_INT, HOST_WIDE_INT, tree);
+static void frv_setup_incoming_varargs		(CUMULATIVE_ARGS *,
+						 enum machine_mode,
+						 tree, int *, int);
 static rtx frv_expand_builtin_saveregs		(void);
 static bool frv_rtx_costs			(rtx, int, int, int*);
 static void frv_asm_out_constructor		(rtx, int);
@@ -306,6 +309,8 @@ static rtx frv_struct_value_rtx			(tree, int);
 
 #undef TARGET_EXPAND_BUILTIN_SAVEREGS
 #define TARGET_EXPAND_BUILTIN_SAVEREGS frv_expand_builtin_saveregs
+#undef TARGET_SETUP_INCOMING_VARARGS
+#define TARGET_SETUP_INCOMING_VARARGS frv_setup_incoming_varargs
 
 struct gcc_target targetm = TARGET_INITIALIZER;
 
@@ -1906,9 +1911,9 @@ frv_initial_elimination_offset (int from, int to)
 }
 
 
-/* Worker function for SETUP_INCOMING_VARARGS.  */
+/* Worker function for TARGET_SETUP_INCOMING_VARARGS.  */
 
-void
+static void
 frv_setup_incoming_varargs (CUMULATIVE_ARGS *cum,
                             enum machine_mode mode,
                             tree type ATTRIBUTE_UNUSED,
diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h
index 7a0e0475778..df5ae079372 100644
--- a/gcc/config/frv/frv.h
+++ b/gcc/config/frv/frv.h
@@ -2077,10 +2077,6 @@ struct machine_function GTY(())
 
 /* Implementing the Varargs Macros.  */
 
-#define SETUP_INCOMING_VARARGS(ARGS_SO_FAR, MODE, TYPE, PRETEND_ARGS_SIZE, SECOND_TIME) \
-  frv_setup_incoming_varargs (& ARGS_SO_FAR, (int) MODE, TYPE, 	\
-			      & PRETEND_ARGS_SIZE, SECOND_TIME)
-
 /* Implement the stdarg/varargs va_start macro.  STDARG_P is nonzero if this
    is stdarg.h instead of varargs.h.  VALIST is the tree of the va_list
    variable to initialize.  NEXTARG is the machine independent notion of the