Merge GDB 7.5.1

gdb/arm-symbian-tdep.c

Index: gdb/arm-symbian-tdep.c
diff --git a/gdb/arm-symbian-tdep.c b/gdb/arm-symbian-tdep.c
index 7994a9cf6400267a51ccb4d094ba2400b6a0559e..69821d33dd3a4f32a049ff5050897cfe0eac34c8 100644
--- a/gdb/arm-symbian-tdep.c
+++ b/gdb/arm-symbian-tdep.c
@@ -29,7 +29,7 @@
 /* If PC is in a DLL import stub, return the address of the `real'
    function belonging to the stub.  */
 
-CORE_ADDR
+static CORE_ADDR
 arm_symbian_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
 {
   struct gdbarch *gdbarch;
@@ -89,7 +89,7 @@ arm_symbian_init_abi (struct gdbarch_info info,
 static enum gdb_osabi
 arm_symbian_osabi_sniffer (bfd *abfd)
 {
-  Elf_Internal_Phdr *phdrs, **segments;
+  Elf_Internal_Phdr *phdrs;
   long phdrs_size;
   int num_phdrs, i;
 
@@ -121,6 +121,9 @@ arm_symbian_osabi_sniffer (bfd *abfd)
   return GDB_OSABI_SYMBIAN;
 }
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_arm_symbian_tdep;
+
 void
 _initialize_arm_symbian_tdep (void)
 {