diff -urpN src/gdb/arch-utils.c dev2/gdb/arch-utils.c
--- src/gdb/arch-utils.c	2007-11-07 07:58:31.000000000 +0100
+++ dev2/gdb/arch-utils.c	2007-11-09 09:17:59.000000000 +0100
@@ -162,7 +162,8 @@ legacy_virtual_frame_pointer (struct gdb
 
 
 int
-generic_convert_register_p (int regnum, struct type *type)
+generic_convert_register_p (struct gdbarch *gdbarch, int regnum,
+			    struct type *type)
 {
   return 0;
 }
diff -urpN src/gdb/arch-utils.h dev2/gdb/arch-utils.h
--- src/gdb/arch-utils.h	2007-10-13 02:06:52.000000000 +0200
+++ dev2/gdb/arch-utils.h	2007-11-09 09:18:19.000000000 +0100
@@ -73,7 +73,8 @@ extern int generic_in_solib_return_tramp
 extern int generic_in_function_epilogue_p (struct gdbarch *gdbarch, CORE_ADDR pc);
 
 /* By default, registers are not convertible.  */
-extern int generic_convert_register_p (int regnum, struct type *type);
+extern int generic_convert_register_p (struct gdbarch *gdbarch, int regnum,
+				       struct type *type);
 
 extern int default_stabs_argument_has_addr (struct gdbarch *gdbarch,
 					    struct type *type);