X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fax-general.c;h=4144233e962f0a3884902bf1e1dd2959a2f15016;hb=f4ec508eaed65ad7555858498c1cbbf420bce90a;hp=c8499324f462d387b5c4dad6db0b796661df80fb;hpb=d55e5aa6b29906346c51ad00e6a9b112590aa294;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/ax-general.c b/gdb/ax-general.c
index c8499324f4..4144233e96 100644
--- a/gdb/ax-general.c
+++ b/gdb/ax-general.c
@@ -1,5 +1,5 @@
 /* Functions for manipulating expressions designed to be executed on the agent
-   Copyright (C) 1998-2019 Free Software Foundation, Inc.
+   Copyright (C) 1998-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -22,11 +22,11 @@
    outside of GDB (test suites, the stub, etc.)  */
 
 #include "defs.h"
-
-/* Local non-gdb includes.  */
 #include "ax.h"
-#include "user-regs.h"
+#include "gdbarch.h"
+
 #include "value.h"
+#include "user-regs.h"
 
 static void grow_expr (struct agent_expr *x, int n);
 
@@ -354,7 +354,7 @@ struct aop_map aop_map[] =
   {0, 0, 0, 0, 0}
 #define DEFOP(NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED, VALUE) \
   , { # NAME, SIZE, DATA_SIZE, CONSUMED, PRODUCED }
-#include "common/ax.def"
+#include "gdbsupport/ax.def"
 #undef DEFOP
 };