Merge GDB 7.5.1

gdb/amd64-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 66 matching lines @@
 
 /* Assuming THIS_FRAME is a Darwin sigtramp routine, return the
    address of the associated sigcontext structure.  */
 
 static CORE_ADDR
 amd64_darwin_sigcontext_addr (struct frame_info *this_frame)
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   CORE_ADDR rbx;
-  CORE_ADDR si;
   gdb_byte buf[8];
 
   /* A pointer to the ucontext is passed as the fourth argument
      to the signal handler, which is saved in rbx.  */
   get_frame_register (this_frame, AMD64_RBX_REGNUM, buf);
   rbx = extract_unsigned_integer (buf, 8, byte_order);
 
   /* The pointer to mcontext is at offset 48.  */
   read_memory (rbx + 48, buf, 8);
 
@@ skipping 10 matching lines @@
 
   tdep->struct_return = reg_struct_return;
 
   dwarf2_frame_set_signal_frame_p (gdbarch, darwin_dwarf_signal_frame_p);
 
   tdep->sigtramp_p = i386_sigtramp_p;
   tdep->sigcontext_addr = amd64_darwin_sigcontext_addr;
   tdep->sc_reg_offset = amd64_darwin_thread_state_reg_offset;
   tdep->sc_num_regs = amd64_darwin_thread_state_num_regs;
 
-  tdep->jb_pc_offset = 148;
+  tdep->jb_pc_offset = 56;
 
   set_solib_ops (gdbarch, &darwin_so_ops);
 }
 
+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_amd64_darwin_tdep;
+
 void
 _initialize_amd64_darwin_tdep (void)
 {
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
                           GDB_OSABI_DARWIN, x86_darwin_init_abi_64);
 }