Merge GDB 7.5.1

gdb/i386-darwin-tdep.c

 /* Darwin support for GDB, the GNU debugger.
    Copyright 1997-2002, 2005, 2008-2012 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, 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
@@ skipping 38 matching lines @@
    2 * 4,   /* ECX */
    3 * 4,   /* EDX */
    1 * 4,   /* EBX */
    7 * 4,   /* ESP */
    6 * 4,   /* EBP */
    5 * 4,   /* ESI */
    4 * 4,   /* EDI */
   10 * 4,   /* EIP */
    9 * 4,   /* EFLAGS */
   11 * 4,   /* CS */
-   8,       /* SS */
+   8 * 4,   /* SS */
   12 * 4,   /* DS */
   13 * 4,   /* ES */
   14 * 4,   /* FS */
   15 * 4    /* GS */
 };
 
 const int i386_darwin_thread_state_num_regs = 
   ARRAY_SIZE (i386_darwin_thread_state_reg_offset);
 
 /* Assuming THIS_FRAME is a Darwin sigtramp routine, return the
@@ skipping 210 matching lines @@
 {
   if (!bfd_check_format (abfd, bfd_object))
     return GDB_OSABI_UNKNOWN;
   
   if (bfd_get_arch (abfd) == bfd_arch_i386)
     return GDB_OSABI_DARWIN;
 
   return GDB_OSABI_UNKNOWN;
 }
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_i386_darwin_tdep;
+
 void
 _initialize_i386_darwin_tdep (void)
 {
   gdbarch_register_osabi_sniffer (bfd_arch_unknown, bfd_target_mach_o_flavour,
                                   i386_mach_o_osabi_sniffer);
 
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_i386_i386,
                           GDB_OSABI_DARWIN, i386_darwin_init_abi);
 }