Merge GDB 7.5.1

gdb/rx-tdep.c

Index: gdb/rx-tdep.c
diff --git a/gdb/rx-tdep.c b/gdb/rx-tdep.c
index 9bd73cd10c99cb8c21da07b08af57b4b3842aecc..8637c0c31b1a747c41fd9a731385609ac24a2429 100644
--- a/gdb/rx-tdep.c
+++ b/gdb/rx-tdep.c
@@ -353,7 +353,7 @@ rx_analyze_prologue (CORE_ADDR start_pc,
 static CORE_ADDR
 rx_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  char *name;
+  const char *name;
   CORE_ADDR func_addr, func_end;
   struct rx_prologue p;
 
@@ -702,7 +702,7 @@ rx_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
 /* Implement the "return_value" gdbarch method.  */
 static enum return_value_convention
 rx_return_value (struct gdbarch *gdbarch,
-		 struct type *func_type,
+		 struct value *function,
 		 struct type *valtype,
 		 struct regcache *regcache,
 		 gdb_byte *readbuf, const gdb_byte *writebuf)
@@ -756,7 +756,7 @@ rx_return_value (struct gdbarch *gdbarch,
 }
 
 /* Implement the "breakpoint_from_pc" gdbarch method.  */
-const gdb_byte *
+static const gdb_byte *
 rx_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr)
 {
   static gdb_byte breakpoint[] = { 0x00 };
@@ -859,7 +859,11 @@ rx_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   return gdbarch;
 }
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_rx_tdep;
+
 /* Register the above initialization routine.  */
+
 void
 _initialize_rx_tdep (void)
 {