From df68e12b3b3eb91e54d6d888b73049562566e0b3 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 12 May 2021 00:35:54 -0400
Subject: sim: create header namespace

The gdb/callback.h & gdb/remote-sim.h headers have nothing to do with
gdb and are really definitions for the libsim API under the sim/ tree.
While gdb uses those headers as a client, it's not specific to it.  So
create a new sim/ namespace and move the headers there.
---
 sim/ppc/ChangeLog   | 8 ++++++++
 sim/ppc/Makefile.in | 4 ++--
 sim/ppc/gdb-sim.c   | 4 ++--
 sim/ppc/main.c      | 4 ++--
 sim/ppc/psim.h      | 2 +-
 sim/ppc/sim_calls.c | 4 ++--
 6 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'sim/ppc')

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 5f7f306..e1ed6d6 100644
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,11 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in: Update path.
+	* gdb-sim.c: Update include path.
+	* main.c: Likewise.
+	* psim.h: Likewise.
+	* sim_calls.c: Likewise.
+
 2021-04-22  Tom Tromey  <tom@tromey.com>
 
 	* mon.c: Update includes.
diff --git a/sim/ppc/Makefile.in b/sim/ppc/Makefile.in
index 7686937..63b957d 100644
--- a/sim/ppc/Makefile.in
+++ b/sim/ppc/Makefile.in
@@ -168,8 +168,8 @@ all:	run $(TARGETLIB) $(GDB_OBJ)
 # Headers outside sim/ppc.
 ANSIDECL_H = $(srcroot)/include/ansidecl.h
 BFD_H = ../../bfd/bfd.h
-GDB_CALLBACK_H = $(srcroot)/include/gdb/callback.h
-GDB_REMOTE_SIM_H = $(srcroot)/include/gdb/remote-sim.h
+GDB_CALLBACK_H = $(srcroot)/include/sim/callback.h
+GDB_REMOTE_SIM_H = $(srcroot)/include/sim/sim.h
 GDB_SIM_PPC_H = $(srcroot)/include/gdb/sim-ppc.h
 COMMON_SIM_BASE_H = $(srcroot)/sim/common/sim-base.h
 COMMON_SIM_BASICS_H = $(srcroot)/sim/common/sim-basics.h
diff --git a/sim/ppc/gdb-sim.c b/sim/ppc/gdb-sim.c
index 8b4e5e3..7217d9c 100644
--- a/sim/ppc/gdb-sim.c
+++ b/sim/ppc/gdb-sim.c
@@ -24,8 +24,8 @@
 
 #include "ansidecl.h"
 #include "sim_callbacks.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "gdb/sim-ppc.h"
 
 /* Return the register name for the supplied SPR if any, or NULL if
diff --git a/sim/ppc/main.c b/sim/ppc/main.c
index 1e73444..f3f2e9e 100644
--- a/sim/ppc/main.c
+++ b/sim/ppc/main.c
@@ -30,8 +30,8 @@
 #include "events.h" /* FIXME: psim should provide the interface */
 
 #include "bfd.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
diff --git a/sim/ppc/psim.h b/sim/ppc/psim.h
index 07852c2..c38b03d 100644
--- a/sim/ppc/psim.h
+++ b/sim/ppc/psim.h
@@ -23,7 +23,7 @@
 
 #include "basics.h"
 
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 /* the system object */
 /* typedef struct _psim psim; */
diff --git a/sim/ppc/sim_calls.c b/sim/ppc/sim_calls.c
index c8364f0..ce4464a 100644
--- a/sim/ppc/sim_calls.c
+++ b/sim/ppc/sim_calls.c
@@ -32,8 +32,8 @@
 
 #include "libiberty.h"
 #include "bfd.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "gdb/signals.h"
 
 /* Define the rate at which the simulator should poll the host
-- 
cgit v1.1