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/cr16/ChangeLog   | 6 ++++++
 sim/cr16/Makefile.in | 2 +-
 sim/cr16/cr16_sim.h  | 4 ++--
 sim/cr16/interp.c    | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'sim/cr16')

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 886ce9b..ae43ba1 100644
--- a/sim/cr16/ChangeLog
+++ b/sim/cr16/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+	* Makefile.in: Update path.
+	* cr16_sim.h: Update include path.
+	* interp.c: Likewise.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure: Regenerate.
diff --git a/sim/cr16/Makefile.in b/sim/cr16/Makefile.in
index 8cfe3ea..6d6555a 100644
--- a/sim/cr16/Makefile.in
+++ b/sim/cr16/Makefile.in
@@ -27,7 +27,7 @@ SIM_EXTRA_CLEAN = clean-extra
 
 SIM_EXTRA_DEPS = simops.h
 
-INCLUDE = cr16_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h \
+INCLUDE = cr16_sim.h $(srcroot)/include/sim/callback.h targ-vals.h \
 	$(srcroot)/include/gdb/sim-cr16.h
 
 # This selects the cr16 newlib/libgloss syscall definitions.
diff --git a/sim/cr16/cr16_sim.h b/sim/cr16/cr16_sim.h
index 8232f07..c3d590d 100644
--- a/sim/cr16/cr16_sim.h
+++ b/sim/cr16/cr16_sim.h
@@ -23,7 +23,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include "ansidecl.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "opcode/cr16.h"
 #include "bfd.h"
 
@@ -41,7 +41,7 @@
 
 extern int cr16_debug;
 
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 #include "sim-config.h"
 #include "sim-types.h"
 
diff --git a/sim/cr16/interp.c b/sim/cr16/interp.c
index 8f7fafa..7db7f56 100644
--- a/sim/cr16/interp.c
+++ b/sim/cr16/interp.c
@@ -23,8 +23,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "bfd.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 
 #include "sim-main.h"
 #include "sim-options.h"
-- 
cgit v1.1