Kito's 5-part patch set to improve .insn support.

[deliverable/binutils-gdb.git] / gdb / aarch64-linux-tdep.c

diff --git a/gdb/aarch64-linux-tdep.c b/gdb/aarch64-linux-tdep.c
index 5a126b0c83c03b28da7feecbf63065c1a368897d..831e62fb863248e5cde9985cc8dfa91457597e3d 100644 (file)
--- a/gdb/aarch64-linux-tdep.c
+++ b/gdb/aarch64-linux-tdep.c
@@ -20,33 +20,33 @@
 
 #include "defs.h"
 
-/* Standard C includes.  */
-#include <ctype.h>
-
-/* Local non-gdb includes.  */
-#include "aarch64-linux-tdep.h"
-#include "aarch64-tdep.h"
-#include "arch-utils.h"
-#include "auxv.h"
-#include "cli/cli-utils.h"
-#include "elf/common.h"
 #include "gdbarch.h"
+#include "arch-utils.h"
 #include "glibc-tdep.h"
-#include "inferior.h"
-#include "linux-record.h"
 #include "linux-tdep.h"
+#include "aarch64-tdep.h"
+#include "aarch64-linux-tdep.h"
 #include "osabi.h"
-#include "parser-defs.h"
-#include "record-full.h"
-#include "regcache.h"
-#include "regset.h"
 #include "solib-svr4.h"
-#include "stap-probe.h"
 #include "symtab.h"
-#include "trad-frame.h"
 #include "tramp-frame.h"
+#include "trad-frame.h"
+
+#include "inferior.h"
+#include "regcache.h"
+#include "regset.h"
+
+#include "cli/cli-utils.h"
+#include "stap-probe.h"
+#include "parser-defs.h"
 #include "user-regs.h"
 #include "xml-syscall.h"
+#include <ctype.h>
+
+#include "record-full.h"
+#include "linux-record.h"
+#include "auxv.h"
+#include "elf/common.h"
 
 /* Signal frame handling.
 
@@ -1658,7 +1658,7 @@ aarch64_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_get_syscall_number (gdbarch, aarch64_linux_get_syscall_number);
 
   /* Displaced stepping.  */
-  set_gdbarch_max_insn_length (gdbarch, 4 * DISPLACED_MODIFIED_INSNS);
+  set_gdbarch_max_insn_length (gdbarch, 4 * AARCH64_DISPLACED_MODIFIED_INSNS);
   set_gdbarch_displaced_step_copy_insn (gdbarch,
                                        aarch64_displaced_step_copy_insn);
   set_gdbarch_displaced_step_fixup (gdbarch, aarch64_displaced_step_fixup);