diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4b8c9a16e5aaab9ee583d7d593d46a43a15a52d1..af48a1cb5c5960e27f86126c805083f18462a66d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-16  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* config/xtensa/xtensa.c (function_arg_boundary): Really rename to...
+	(xtensa_function_arg_boundary): ...this.
+	* config/picochip/pichochip.c (picochip_function_arg_boundary): Fix
+	thinko in declaration.
+	(picochip_function_arg, picochip_arg_partial_bytes): Pass proper
+	number of parameters to picochip_function_arg_boundary.
+	(picochip_arg_advance): Likewise.
+
 2010-11-16  Nathan Froyd  <froydnj@codesourcery.com>
 
 	PR target/46512
diff --git a/gcc/config/picochip/picochip.c b/gcc/config/picochip/picochip.c
index f7c5baf9b94f3ad209985a5ae6d24cae2e4211bc..8550285bd0467380fa5ae34178a0625881071e31 100644
--- a/gcc/config/picochip/picochip.c
+++ b/gcc/config/picochip/picochip.c
@@ -89,8 +89,8 @@ rtx picochip_incoming_function_arg (CUMULATIVE_ARGS * p_cum,
 				    const_tree type, bool named);
 void picochip_arg_advance (CUMULATIVE_ARGS * p_cum, enum machine_mode mode,
 			   const_tree type, bool named);
-unsigned int picochip_function_boundary (enum machine_mode mode,
-					 const_tree type);
+unsigned int picochip_function_arg_boundary (enum machine_mode mode,
+					     const_tree type);
 
 int picochip_sched_lookahead (void);
 int picochip_sched_issue_rate (void);
@@ -856,7 +856,7 @@ picochip_function_arg (CUMULATIVE_ARGS *cum, enum machine_mode mode,
 
   /* Compute the alignment and size of the parameter. */
   type_align_in_units =
-    picochip_function_arg_boundary (mode) / BITS_PER_UNIT;
+    picochip_function_arg_boundary (mode, type) / BITS_PER_UNIT;
   type_size_in_units = picochip_compute_arg_size (type, mode);
 
   /* Compute the correct offset (i.e., ensure that the offset meets
@@ -989,7 +989,7 @@ picochip_arg_partial_bytes (CUMULATIVE_ARGS * p_cum, enum machine_mode mode,
 
   /* Compute the alignment and size of the parameter. */
   type_align_in_units =
-    picochip_function_arg_boundary (mode) / BITS_PER_UNIT;
+    picochip_function_arg_boundary (mode, type) / BITS_PER_UNIT;
   type_size_in_units = picochip_compute_arg_size (type, mode);
 
   /* Compute the correct offset (i.e., ensure that the offset meets
@@ -1043,7 +1043,7 @@ picochip_arg_advance (CUMULATIVE_ARGS *cum, enum machine_mode mode,
 
   /* Compute the alignment and size of the parameter. */
   type_align_in_units =
-    picochip_function_arg_boundary (mode) / BITS_PER_UNIT;
+    picochip_function_arg_boundary (mode, type) / BITS_PER_UNIT;
   type_size_in_units = picochip_compute_arg_size (type, mode);
 
   /* Compute the correct offset (i.e., ensure that the offset meets
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
index 9e7c612c01f0f2d33bf096d315d400dc53caf846..67d367caa851c49e337b7cc979349533b3743860 100644
--- a/gcc/config/xtensa/xtensa.c
+++ b/gcc/config/xtensa/xtensa.c
@@ -2098,7 +2098,7 @@ xtensa_function_incoming_arg (CUMULATIVE_ARGS *cum, enum machine_mode mode,
 }
 
 static unsigned int
-function_arg_boundary (enum machine_mode mode, const_tree type)
+xtensa_function_arg_boundary (enum machine_mode mode, const_tree type)
 {
   unsigned int alignment;