X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Famd64-darwin-tdep.c;h=5cf3ff266a4686a5ae5899a78facb7280ac6521c;hb=8677059126a84cb9f71371beb8688138a41014fc;hp=5d21ba755d817092a35904e11c1a3b3d3deff83e;hpb=d55e5aa6b29906346c51ad00e6a9b112590aa294;p=binutils-gdb.git

diff --git a/gdb/amd64-darwin-tdep.c b/gdb/amd64-darwin-tdep.c
index 5d21ba755d8..5cf3ff266a4 100644
--- a/gdb/amd64-darwin-tdep.c
+++ b/gdb/amd64-darwin-tdep.c
@@ -1,5 +1,5 @@
 /* Darwin support for GDB, the GNU debugger.
-   Copyright (C) 1997-2019 Free Software Foundation, Inc.
+   Copyright (C) 1997-2021 Free Software Foundation, Inc.
 
    Contributed by Apple Computer, Inc.
 
@@ -19,25 +19,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-darwin-tdep.h"
-#include "amd64-tdep.h"
-#include "common/x86-xstate.h"
-#include "dwarf2-frame.h"
 #include "frame.h"
-#include "gdbcore.h"
-#include "i386-darwin-tdep.h"
-#include "i387-tdep.h"
 #include "inferior.h"
+#include "gdbcore.h"
+#include "target.h"
+#include "symtab.h"
+#include "regcache.h"
 #include "objfiles.h"
+
+#include "i387-tdep.h"
+#include "gdbsupport/x86-xstate.h"
+#include "amd64-tdep.h"
 #include "osabi.h"
-#include "regcache.h"
-#include "solib-darwin.h"
-#include "solib.h"
-#include "symtab.h"
-#include "target.h"
 #include "ui-out.h"
+#include "amd64-darwin-tdep.h"
+#include "i386-darwin-tdep.h"
+#include "solib.h"
+#include "solib-darwin.h"
+#include "dwarf2/frame.h"
 
 /* Offsets into the struct x86_thread_state64 where we'll find the saved regs.
    From <mach/i386/thread_status.h> and amd64-tdep.h.  */
@@ -98,7 +97,7 @@ amd64_darwin_sigcontext_addr (struct frame_info *this_frame)
 static void
 x86_darwin_init_abi_64 (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
-  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  i386_gdbarch_tdep *tdep = (i386_gdbarch_tdep *) gdbarch_tdep (gdbarch);
 
   amd64_init_abi (info, gdbarch,
 		  amd64_target_description (X86_XSTATE_SSE_MASK, true));
@@ -117,9 +116,10 @@ x86_darwin_init_abi_64 (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_solib_ops (gdbarch, &darwin_so_ops);
 }
 
+void _initialize_amd64_darwin_tdep ();
 void
-_initialize_amd64_darwin_tdep (void)
+_initialize_amd64_darwin_tdep ()
 {
   gdbarch_register_osabi (bfd_arch_i386, bfd_mach_x86_64,
-                          GDB_OSABI_DARWIN, x86_darwin_init_abi_64);
+			  GDB_OSABI_DARWIN, x86_darwin_init_abi_64);
 }