Merge GDB 7.5.1

gdb/arm-symbian-tdep.c

 /* ARM Symbian OS target support.
 
    Copyright (C) 2008-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 11 matching lines @@
 #include "objfiles.h"
 #include "osabi.h"
 #include "solib.h"
 #include "solib-target.h"
 #include "target.h"
 #include "elf-bfd.h"
 
 /* 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;
   enum bfd_endian byte_order;
   ULONGEST insn;
   CORE_ADDR dest;
   gdb_byte buf[4];
 
   if (!in_plt_section (pc, NULL))
     return 0;
@@ skipping 39 matching lines @@
   set_gdbarch_has_dos_based_file_system (gdbarch, 1);
 
   set_solib_ops (gdbarch, &solib_target_so_ops);
 }
 
 /* Recognize Symbian object files.  */
 
 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;
 
   /* Symbian executables are always shared objects (ET_DYN).  */
   if (elf_elfheader (abfd)->e_type == ET_EXEC)
     return GDB_OSABI_UNKNOWN;
 
   if (elf_elfheader (abfd)->e_ident[EI_OSABI] != ELFOSABI_NONE)
     return GDB_OSABI_UNKNOWN;
 
@@ skipping 11 matching lines @@
     return GDB_OSABI_UNKNOWN;
 
   for (i = 0; i < num_phdrs; i++)
     if (phdrs[i].p_type == PT_LOAD && phdrs[i].p_offset == 0)
       return GDB_OSABI_UNKNOWN;
 
   /* Looks like a Symbian binary.  */
   return GDB_OSABI_SYMBIAN;
 }
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_arm_symbian_tdep;
+
 void
 _initialize_arm_symbian_tdep (void)
 {
   gdbarch_register_osabi_sniffer (bfd_arch_arm,
                                   bfd_target_elf_flavour,
                                   arm_symbian_osabi_sniffer);
 
   gdbarch_register_osabi (bfd_arch_arm, 0, GDB_OSABI_SYMBIAN,
                           arm_symbian_init_abi);
 }