diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c4b86c99f4..8e9aa41b378 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-14  Nick Clifton  <nickc@redhat.com>
+
+	PR target/49403
+	* config/v850/v850.c (v850_memory_move_cost): Add reg_class_t parameter.
+
+	PR target/49402
+	* config.gcc(v850*-*-*): Avoid duplication of v850.opt.
+
 2011-06-14  Jakub Jelinek  <jakub@redhat.com>
 
 	PR fortran/49103
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 5d88d1bf60d..b5a5638d271 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2584,7 +2584,7 @@ v850*-*-*)
 	md_file=v850/v850.md
 	extra_modes=v850/v850-modes.def
 	out_file=v850/v850.c
-	extra_options="${extra_options} v850/v850.opt"
+	extra_options="v850/v850.opt"
 	if test x$stabs = xyes
 	then
 		tm_file="${tm_file} dbx.h"
diff --git a/gcc/config/v850/v850.c b/gcc/config/v850/v850.c
index cb31f9aa381..18e8a4e0374 100644
--- a/gcc/config/v850/v850.c
+++ b/gcc/config/v850/v850.c
@@ -3141,7 +3141,9 @@ v850_legitimate_constant_p (enum machine_mode mode ATTRIBUTE_UNUSED, rtx x)
 }
 
 static int
-v850_memory_move_cost (enum machine_mode mode, bool in)
+v850_memory_move_cost (enum machine_mode mode,
+		       reg_class_t reg_class ATTRIBUTE_UNUSED,
+		       bool in)
 {
   switch (GET_MODE_SIZE (mode))
     {