Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / gdb / amd64-nbsd-tdep.c

diff --git a/gdb/amd64-nbsd-tdep.c b/gdb/amd64-nbsd-tdep.c
index 99b172205458d2c6d120364fdda8c39a52cc51c8..65f587cf827d9aecdc558f3cdc13b0ea50fede62 100644 (file)
--- a/gdb/amd64-nbsd-tdep.c
+++ b/gdb/amd64-nbsd-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for NetBSD/amd64.
 
-   Copyright (C) 2003-2019 Free Software Foundation, Inc.
+   Copyright (C) 2003-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -18,18 +18,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
-#include "amd64-tdep.h"
 #include "arch-utils.h"
-#include "common/x86-xstate.h"
 #include "frame.h"
 #include "gdbcore.h"
-#include "nbsd-tdep.h"
 #include "osabi.h"
-#include "solib-svr4.h"
 #include "symtab.h"
 
+#include "amd64-tdep.h"
+#include "gdbsupport/x86-xstate.h"
+#include "nbsd-tdep.h"
+#include "solib-svr4.h"
+
 /* Support for signal handlers.  */
 
 /* Return whether THIS_FRAME corresponds to a NetBSD sigtramp