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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c94628c5c9b3aa9ebc0b01f2bda3635e8d4a4bb4..172886923311444fd8847141d15467aa252ddf91 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * remote-sim.c: Change gdb/callback.h & gdb/remote-sim.h includes to
+       sim/callback.h & sim/sim.h.
+
 2021-05-13  Mike Frysinger  <vapier@gentoo.org>
 
        * lm32-tdep.c: Delete gdb/callback.h, gdb/remote-sim.h, and

diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index f2cf8dbd7117985c3e5b94f9b9389c2c8cdc295b..5bedc04011d4831f5ec075156cb4055b24378dac 100644 (file)
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -33,8 +33,8 @@
 #include "target.h"
 #include "process-stratum-target.h"
 #include "gdbcore.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "command.h"
 #include "regcache.h"
 #include "sim-regno.h"

diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index 32a0928a78619e21ecdc7c8b168bfa21f14a7de6..17d9cb61264ae5aeb642d66853e5d19aa96d4ab4 100644 (file)
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * callback.h: Moved to ../sim/callback.h.
+       * remote-sim.h: Moved to ../sim/sim.h.
+
 2021-02-04  Mike Frysinger  <vapier@gentoo.org>
 
        * sim-riscv.h: New file.

diff --git a/include/sim/ChangeLog b/include/sim/ChangeLog
new file mode 100644 (file)
index 0000000..f2aba1e
--- /dev/null
+++ b/include/sim/ChangeLog
@@ -0,0 +1,4 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * callback.h: Moved from ../gdb/callback.h.
+       * sim.h: Moved from ../gdb/remote-sim.h.

diff --git a/include/gdb/callback.h b/include/sim/callback.h
similarity index 99%
rename from include/gdb/callback.h
rename to include/sim/callback.h
index a2e02631628ec50f98992f9a7f701cf823f4e93e..f021f4d6e4d08f55ecb2d5e276a3a31c85b15227 100644 (file)
--- a/include/gdb/callback.h
+++ b/include/sim/callback.h
@@ -42,8 +42,8 @@
    is ENVIRONMENT_OPERATING.
 */
 
-#ifndef CALLBACK_H
-#define CALLBACK_H
+#ifndef SIM_CALLBACK_H
+#define SIM_CALLBACK_H
 
 /* ??? The reason why we check for va_start here should be documented.  */
 

diff --git a/include/gdb/remote-sim.h b/include/sim/sim.h
similarity index 99%
rename from include/gdb/remote-sim.h
rename to include/sim/sim.h
index a3ba3aa36cd2ec1fe310c629d2035da97cc92780..72d0a619aaf444d7c7a512e84630782afd40a3dc 100644 (file)
--- a/include/gdb/remote-sim.h
+++ b/include/sim/sim.h
@@ -17,8 +17,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#if !defined (REMOTE_SIM_H)
-#define REMOTE_SIM_H 1
+#ifndef SIM_SIM_H
+#define SIM_SIM_H 1
 
 #ifdef __cplusplus
 extern "C" {
@@ -296,4 +296,4 @@ char **sim_complete_command (SIM_DESC sd, const char *text, const char *word);
 }
 #endif
 
-#endif /* !defined (REMOTE_SIM_H) */
+#endif /* !defined (SIM_SIM_H) */

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 236b156c6961acfe836b7f6e31662e217311affb..61bb0f4e030b6b4a48a40fde632a0b7bce09a239 100644 (file)
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * README-HACKING: Update callback.h path.
+
 2021-05-12  Mike Frysinger  <vapier@gentoo.org>
 
        * README-HACKING: Delete mention of SIM_AC_OPTION_ENVIRONMENT.

diff --git a/sim/README-HACKING b/sim/README-HACKING
index 69d08ff1ecfcb77014cbc706777263cf61cc892c..d4867c9e79e48797d543a132812b480d92b7d2f0 100644 (file)
--- a/sim/README-HACKING
+++ b/sim/README-HACKING
@@ -294,7 +294,7 @@ Userspace System Calls
 By default, the libgloss userspace is simulated.  That means the system call
 numbers and calling convention matches that of libgloss.  Simulating other
 userspaces (such as Linux) is pretty straightforward, but let's first focus
-on the basics.  The basic API is covered in include/gdb/callback.h.
+on the basics.  The basic API is covered in include/sim/callback.h.
 
 When an instruction is simulated that invokes the system call method (such as
 forcing a hardware trap or exception), your simulator code should set up the

diff --git a/sim/aarch64/ChangeLog b/sim/aarch64/ChangeLog
index fba3984299d3b3642e69cb52252bac878a3e2757..085aea6dfb6eabbfc0b5488d2fc1fb2961f5ba69 100644 (file)
--- a/sim/aarch64/ChangeLog
+++ b/sim/aarch64/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * cpustate.h: Update include path.
+       * interp.c: Likewise.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/aarch64/cpustate.h b/sim/aarch64/cpustate.h
index 00b62e1a6f5e83fa48a64064b43b36a0fb61e43a..c3f26376f492a411411b5267237ac40809ead172 100644 (file)
--- a/sim/aarch64/cpustate.h
+++ b/sim/aarch64/cpustate.h
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <inttypes.h>
 
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 /* Symbolic names used to identify general registers which also match
    the registers indices in machine code.

diff --git a/sim/aarch64/interp.c b/sim/aarch64/interp.c
index fae2b7a06bbd953bacf2aeade9ecdb8ff00aa036..cc3cf6add3435ecec05703f7e4ac1e9f91af4875 100644 (file)
--- a/sim/aarch64/interp.c
+++ b/sim/aarch64/interp.c
@@ -29,8 +29,8 @@
 
 #include "ansidecl.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"
 #include "gdb/sim-aarch64.h"
 

diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 27f651a9d5dd87268518347bf6ebc9b0cbb75934..7124a6d0a3250241f4a6118368335b50b4fb8b80 100644 (file)
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * armos.c: Update include path.
+       * wrapper.c: Likewise.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/arm/armos.c b/sim/arm/armos.c
index 2ce7051a44ceeb92fa34233402b459ccf758e12c..77b256fd5b3afb3c916fd96073227bf0166710ee 100644 (file)
--- a/sim/arm/armos.c
+++ b/sim/arm/armos.c
@@ -54,7 +54,7 @@
 /* For RDIError_BreakpointReached.  */
 #include "dbg_rdi.h"
 
-#include "gdb/callback.h"
+#include "sim/callback.h"
 extern host_callback *sim_callback;
 
 extern unsigned ARMul_OSInit       (ARMul_State *);

diff --git a/sim/arm/wrapper.c b/sim/arm/wrapper.c
index 54a04f424284632a577ae315eb1cffdeb699f7d8..d25184afa09cedc5b0ef595f265775b7df3f6d29 100644 (file)
--- a/sim/arm/wrapper.c
+++ b/sim/arm/wrapper.c
@@ -27,8 +27,8 @@
 #include <string.h>
 #include <bfd.h>
 #include <signal.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"
 #include "armemu.h"

diff --git a/sim/avr/ChangeLog b/sim/avr/ChangeLog
index 646f318b8940980631fdd55e71013ec47a89bdf0..128d14bfb5b9cebb1a418db75397761dcaa65959 100644 (file)
--- a/sim/avr/ChangeLog
+++ b/sim/avr/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index c806f4c46eba330e58f2d538c2b759f068f30c9b..df1f6e55401f3d3913c0e20a5aefc348278fe2dd 100644 (file)
--- a/sim/avr/interp.c
+++ b/sim/avr/interp.c
@@ -23,7 +23,7 @@
 
 #include "bfd.h"
 #include "libiberty.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 #include "sim-main.h"
 #include "sim-base.h"

diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
index b5f70d2bb68800e2199feed203a790f84c7827bd..3dff4ed2976f6e1c2cc05d1208c5916d6cad1f04 100644 (file)
--- a/sim/bfin/ChangeLog
+++ b/sim/bfin/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c
index a4333daa44dd5514b4ebc034505006e502fa57cb..aa5c245c829ed12cdba29dd4d18ee38a234e9714 100644 (file)
--- a/sim/bfin/interp.c
+++ b/sim/bfin/interp.c
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "gdb/signals.h"
 #include "sim-main.h"
 #include "sim-syscall.h"

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 4fb31af3b18222e92e458633a2c9df4a2000ae21..fb0f8a851c6157cee5419a5e838eaa113b22e4c7 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,15 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * Make-common.in (callback_h, remote_sim_h): Update path.
+       * callback.c: Update include path.
+       * gentmap.c (gen_targ_map_c): Likewise.
+       * sim-basics.h: Likewise.
+       * sim-close.c: Likewise.
+       * sim-core.c: Likewise.
+       * sim-load.c: Likewise.
+       * sim-module.h: Likewise.
+       * syscall.c: Likewise.
+
 2021-05-08  Mike Frysinger  <vapier@gentoo.org>
 
        * Make-common.in (modules.c): Touch $@ at the end.

diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 56b36b235721978ff7c030a664fb63de77e92832..d38c849c40d1fa9eb76c25127a1ef660b8d641e4 100644 (file)
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -258,8 +258,8 @@ LINK_FOR_BUILD = $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
 
 RUNTESTFLAGS =
 
-callback_h = $(srcroot)/include/gdb/callback.h
-remote_sim_h = $(srcroot)/include/gdb/remote-sim.h
+callback_h = $(srcroot)/include/sim/callback.h
+remote_sim_h = $(srcroot)/include/sim/sim.h
 
 all: libsim.a run$(EXEEXT) .gdbinit
 

diff --git a/sim/common/callback.c b/sim/common/callback.c
index 55280abb04b9c7fd28ba5f8742a7017145bfcbb0..9e6d456e537a51976629da5a9917c98230f3cab3 100644 (file)
--- a/sim/common/callback.c
+++ b/sim/common/callback.c
@@ -35,7 +35,7 @@
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "targ-vals.h"
 /* For xmalloc.  */
 #include "libiberty.h"

diff --git a/sim/common/gentmap.c b/sim/common/gentmap.c
index a606fad0e4ff9f1699d4ae52e2413e784051b741..8085c3576ac8f63919eaa7be693373266bfbeda4 100644 (file)
--- a/sim/common/gentmap.c
+++ b/sim/common/gentmap.c
@@ -71,7 +71,7 @@ gen_targ_map_c (void)
   printf ("#include <errno.h>\n");
   printf ("#include <fcntl.h>\n");
   printf ("#include \"ansidecl.h\"\n");
-  printf ("#include \"gdb/callback.h\"\n");
+  printf ("#include \"sim/callback.h\"\n");
   printf ("#include \"targ-vals.h\"\n");
   printf ("\n");
 

diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
index e822fb2eb818a64a58c2c6fb43158185cf3785b0..7d9c831da5116d59eb4cf38f252641f3af61a2ce 100644 (file)
--- a/sim/common/sim-basics.h
+++ b/sim/common/sim-basics.h
@@ -119,8 +119,8 @@ typedef enum {
 /* Basic definitions - ordered so that nothing calls what comes after it.  */
 
 #include "ansidecl.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 
 #include "sim-config.h"
 

diff --git a/sim/common/sim-close.c b/sim/common/sim-close.c
index 6878dfcbf31255fd2ea849af5a3ce6405e6a10ec..e64d59e6361648241082e9bfda078dc60c036a31 100644 (file)
--- a/sim/common/sim-close.c
+++ b/sim/common/sim-close.c
@@ -20,7 +20,7 @@
 
 #include "sim-main.h"
 #include "sim-module.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 /* Generic implementation of sim_close that works with simulators that use
    sim-module for all custom runtime options.  */

diff --git a/sim/common/sim-core.c b/sim/common/sim-core.c
index 9b1e168321043398f84f142aa443aeb13df42e66..222f9fd8fe988ac42859875868cf38daf3826416 100644 (file)
--- a/sim/common/sim-core.c
+++ b/sim/common/sim-core.c
@@ -454,7 +454,7 @@ sim_core_translate (sim_core_mapping *mapping,
 
 
 #if EXTERN_SIM_CORE_P
-/* See include/gdb/remote-sim.h.  */
+/* See include/sim/sim.h.  */
 char *
 sim_memory_map (SIM_DESC sd)
 {

diff --git a/sim/common/sim-load.c b/sim/common/sim-load.c
index 04681c524a0cd30f3a5319ecd9064925fd986ad7..b9d85ca2fd6dee3cdf6ab811d20748d2e7909297 100644 (file)
--- a/sim/common/sim-load.c
+++ b/sim/common/sim-load.c
@@ -31,8 +31,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "bfd.h"
 #include "sim-utils.h"
 
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 
 static void eprintf (host_callback *, const char *, ...);
 static void xprintf (host_callback *, const char *, ...);

diff --git a/sim/common/sim-module.h b/sim/common/sim-module.h
index dad557194318c8a1ff1c0abaef18ba18b8ed1a95..9c0918fb060c69761cbcb668a9ff78575061d190 100644 (file)
--- a/sim/common/sim-module.h
+++ b/sim/common/sim-module.h
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
    TODO: Add facilities for saving/restoring state to/from a file.  */
 
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 /* Various function types.  */
 

diff --git a/sim/common/syscall.c b/sim/common/syscall.c
index f2883c493acd3a5270c724258e2428ba7b0f9351..258b3d694f4e4e3599e1259b014f68709bc66e40 100644 (file)
--- a/sim/common/syscall.c
+++ b/sim/common/syscall.c
@@ -40,7 +40,7 @@
 #include <time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "targ-vals.h"
 
 #ifndef ENOSYS

diff --git a/sim/cr16/ChangeLog b/sim/cr16/ChangeLog
index 886ce9b469edc05823931450fcdba92d5bf40615..ae43ba170e5a97c478035f7fb77c331d64747e25 100644 (file)
--- 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 8cfe3ea3b2642dee9401d88b631ea2d1f41aac8e..6d6555a32610bf01e35c08bb7964cb30855f84e6 100644 (file)
--- 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 8232f0743f7b9049e0aa9c1b9d4039ca69dd57bb..c3d590d537b92fb4cc629a93346f0026e0faa99c 100644 (file)
--- 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 8f7fafa715e9ff082df382ba69ad86b8cb8d82f8..7db7f56e21ba45904e7f7c2dd6434e148ef2eb8f 100644 (file)
--- 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"

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index cc70f28bc35bd732c6a4e6b20f5e2e35b1380990..0a5c7a76202caa2597312bb7411fba6a00563a99 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in: Update path.
+       * d10v_sim.h: Update include path.
+       * interp.c: Likewise.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 13b902dec5d809932f30bc1c8b2d616b452f2763..67c7efdf32ba40314415c968fc3e725b9d61d3c2 100644 (file)
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -28,7 +28,7 @@ SIM_EXTRA_CLEAN = clean-extra
 
 SIM_EXTRA_DEPS = simops.h
 
-INCLUDE = d10v_sim.h $(srcroot)/include/gdb/callback.h targ-vals.h endian.c \
+INCLUDE = d10v_sim.h $(srcroot)/include/sim/callback.h targ-vals.h endian.c \
        $(srcroot)/include/gdb/sim-d10v.h
 
 # This selects the d10v newlib/libgloss syscall definitions.

diff --git a/sim/d10v/d10v_sim.h b/sim/d10v/d10v_sim.h
index 64f974f01dbcca66dbf55a0a5af34ffd6ef4148f..972402cc4d0561c622aec808e205e3f7cf9bae0b 100644 (file)
--- a/sim/d10v/d10v_sim.h
+++ b/sim/d10v/d10v_sim.h
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include "ansidecl.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "opcode/d10v.h"
 #include "bfd.h"
 
@@ -21,7 +21,7 @@
 
 extern int d10v_debug;
 
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 #include "sim-config.h"
 #include "sim-types.h"
 

diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index 62507760af945bc9918811167085f676ab1a7a4b..a0dc2f596857c0cff16a21c508c4b4ae1143a881 100644 (file)
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -2,8 +2,8 @@
 #include <inttypes.h>
 #include <signal.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"

diff --git a/sim/erc32/ChangeLog b/sim/erc32/ChangeLog
index 67a763bf58b910352e3060613b8254cafaab7f5e..950384a11cd1f6faa2c2407ed86359f11dd6b5f5 100644 (file)
--- a/sim/erc32/ChangeLog
+++ b/sim/erc32/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interf.c: Update include path.
+       * sis.h: Likewise.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/erc32/interf.c b/sim/erc32/interf.c
index c8e025b23e0803913931f8bc305bf9afd9f01d9f..c199dabea37a7d05d2b7def95287aa1f7abcb615 100644 (file)
--- a/sim/erc32/interf.c
+++ b/sim/erc32/interf.c
@@ -28,7 +28,7 @@
 #include <dis-asm.h>
 #include "sim-config.h"
 
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 #include "gdb/signals.h"
 
 #define PSR_CWP 0x7

diff --git a/sim/erc32/sis.h b/sim/erc32/sis.h
index 428a6bdcf151caed362a1c0a852bbf7493ef0eb9..10c500f820afb5c5047a2ee6348d8efe130197df 100644 (file)
--- a/sim/erc32/sis.h
+++ b/sim/erc32/sis.h
@@ -15,8 +15,8 @@
 
 #include "config.h"
 #include "ansidecl.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include <sim-config.h>
 #include <stdint.h>
 

diff --git a/sim/example-synacor/ChangeLog b/sim/example-synacor/ChangeLog
index f790f9232a756d6b3cfd21a9e359e7e5e703fd36..d491f2add179c2cb8993897c5fda49476ae54486 100644 (file)
--- a/sim/example-synacor/ChangeLog
+++ b/sim/example-synacor/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/example-synacor/interp.c b/sim/example-synacor/interp.c
index d2080b6f7f22fa059d830ee5515e6df5182d2903..e613e167828a35e864f4740f1f59c3ae61adafc5 100644 (file)
--- a/sim/example-synacor/interp.c
+++ b/sim/example-synacor/interp.c
@@ -22,8 +22,8 @@
    specific simulator.  Normally this file will be kept small and the target
    details will live in other files.
 
-   For more specific details on these functions, see the gdb/remote-sim.h
-   header file.  */
+   For more specific details on these functions, see the sim/sim.h header
+   file.  */
 
 #include "config.h"
 

diff --git a/sim/ft32/ChangeLog b/sim/ft32/ChangeLog
index 9389818f33c03a7beccad526712651b6f5d1e930..185d16f3db03db0966b888a23e04a73813808b7f 100644 (file)
--- a/sim/ft32/ChangeLog
+++ b/sim/ft32/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/ft32/interp.c b/sim/ft32/interp.c
index ba2297f4078e53862b0f0b4b8520b3055088fb49..6120df179b541daabe62a3f5bac9c96dd2412b9e 100644 (file)
--- a/sim/ft32/interp.c
+++ b/sim/ft32/interp.c
@@ -25,9 +25,9 @@
 #include <stdint.h>
 
 #include "bfd.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "libiberty.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 #include "sim-main.h"
 #include "sim-options.h"

diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index f8842f57af19e5861a6c25866ffc61490251ff71..099d70d1b13c3b14e91fcd5912434522ae1f914b 100644 (file)
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * gdb-if.c: Update include path.
+       * syscalls.c: Likewise.
+
 2021-05-07  Mike Frysinger  <vapier@gentoo.org>
 
        * mem.c: Include errno.h.

diff --git a/sim/m32c/gdb-if.c b/sim/m32c/gdb-if.c
index c2aff064ff0f10057d8c231e8f0c237ae1d47201..369864876732683ac63463a757968885032e3bdd 100644 (file)
--- a/sim/m32c/gdb-if.c
+++ b/sim/m32c/gdb-if.c
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "ansidecl.h"
 #include "libiberty.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "gdb/signals.h"
 #include "gdb/sim-m32c.h"
 

diff --git a/sim/m32c/syscalls.c b/sim/m32c/syscalls.c
index 86695cb4dde7a3df251149ac23e3dd0cb07bebbe..e9400840be93890200d43452adb79c1a1e6cbfd7 100644 (file)
--- a/sim/m32c/syscalls.c
+++ b/sim/m32c/syscalls.c
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "gdb/callback.h"
+#include "sim/callback.h"
 
 #include "cpu.h"
 #include "mem.h"

diff --git a/sim/m68hc11/ChangeLog b/sim/m68hc11/ChangeLog
index e88f12e444d4e14d4d031bc89860dc0e36f706d3..6f2bef52e98661eae712cd6c4cb553c5b396f5f0 100644 (file)
--- a/sim/m68hc11/ChangeLog
+++ b/sim/m68hc11/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * sim-main.h: Update include path.
+
 2021-05-07  Mike Frysinger  <vapier@gentoo.org>
 
        * dv-m68hc11tim.c (cycle_to_string): Increase buf to 128 bytes.

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index f42750f0a5865289b3c6785737a05959fbd7ae1f..9b461ff00428f11bf2db50a80bc7b865c75ad960 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "opcode/m68hc11.h"
 
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "opcode/m68hc11.h"
 #include "sim-types.h"
 

diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog
index 7a0039309847a480e4924494d14eaa585398c102..d165f3c51826c10fbab932acc678fb7fda4b89c7 100644 (file)
--- a/sim/mcore/ChangeLog
+++ b/sim/mcore/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure.ac: Delete SIM_AC_OPTION_WARNINGS call.

diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c
index f726c1e7db772747c270be4eb24f0b38326d742f..5e8ad3b8a2f8475f82c664a56e5a31c5182ca3b5 100644 (file)
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -24,9 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/param.h>
 #include <unistd.h>
 #include "bfd.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "libiberty.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 #include "sim-main.h"
 #include "sim-base.h"

diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog
index c78e896f4c76e304f4a62f3821e55f330076be5b..efedaa53ebba3463f6673224cc3bd84b58afb77f 100644 (file)
--- a/sim/microblaze/ChangeLog
+++ b/sim/microblaze/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c (sim_engine_run): Call TRACE_INSN.

diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index bff73279d2630f6cd2a3fb7a8b52360cab21c756..1b89bb49408492104dc13cc11cc24bab24e9e5f5 100644 (file)
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -22,9 +22,9 @@
 #include <string.h>
 #include <unistd.h>
 #include "bfd.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "libiberty.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 #include "sim-main.h"
 #include "sim-options.h"

diff --git a/sim/mips/ChangeLog b/sim/mips/ChangeLog
index c8cf4e2501e1fd1e24540c8a5265d797a7537c38..963e85ae09213a458ca530e8737c3832aa004582 100644 (file)
--- a/sim/mips/ChangeLog
+++ b/sim/mips/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * dv-tx3904sio.c: Include stdlib.h.

diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index 64259cc3fed433731da95ccf6a096cc268a8591f..49b79f91dbc450cadbda00e5e658180c68091dbe 100644 (file)
--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -48,8 +48,8 @@ code on the hardware.
 #include "libiberty.h"
 #include "bfd.h"
 #include "elf-bfd.h"
-#include "gdb/callback.h"   /* GDB simulator callback interface */
-#include "gdb/remote-sim.h" /* GDB simulator interface */
+#include "sim/callback.h"   /* GDB simulator callback interface */
+#include "sim/sim.h" /* GDB simulator interface */
 #include "sim-syscall.h"   /* Simulator system call support */
 
 char* pr_addr (SIM_ADDR addr);

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index a9ba8d74891f06f83b822c7324c75d8a73392e06..fce17ed96e1af37f5e5852da7a428bd317b88fbc 100644 (file)
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * mn10300_sim.h: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * op_utils.c: Delete sys/times.h include.

diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index f70d486612bce2a2bbd694f748445d2821f5fe3c..c63efaa6c7692d329c9fd8173de8d8910c99b69c 100644 (file)
--- a/sim/mn10300/mn10300_sim.h
+++ b/sim/mn10300/mn10300_sim.h
@@ -1,10 +1,10 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "ansidecl.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "opcode/mn10300.h"
 #include <limits.h>
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 #include "bfd.h"
 #include "sim-fpu.h"
 

diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog
index 26864471b8a7193a9791d2fe3c01bc490e0361a7..20d2ecfc60fdce999e0aacce22c41983f41ec33d 100644 (file)
--- a/sim/moxie/ChangeLog
+++ b/sim/moxie/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * interp.c: Delete sys/times.h include.

diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c
index 4228dd5a466822d01f22822c7746db527281d516..135716386f73296d9ea799f83ff69b0e14947e20 100644 (file)
--- a/sim/moxie/interp.c
+++ b/sim/moxie/interp.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include "bfd.h"
 #include "libiberty.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 
 #include "sim-main.h"
 #include "sim-base.h"

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 5f7f306761264418eca554e7f20749c3639c19ce..e1ed6d624afbc8aa250139188b22ec09f1e6d7ba 100644 (file)
--- 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 7686937f421362f317826a8efaf974153abe7c97..63b957d1b4fc3d1333f71b0031024e8bde41d365 100644 (file)
--- 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 8b4e5e310725d8259a5dcc2f0cf9c6e82cc6f85e..7217d9c9c5276204949078c864c745f81d3bbaab 100644 (file)
--- 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 1e73444ff83266a826ffbff119107cf97c9b02d2..f3f2e9ef338fdadb82023388ff0639b2253c4410 100644 (file)
--- 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 07852c2109b9700b62757ea3a283c166d61bb3bf..c38b03d899477ad1ab0bea6f1c51627b838f22d3 100644 (file)
--- 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 c8364f090046d15aae6e686f6f30d02f9bae0c0b..ce4464aa8eabe25dda37747929a53ba6e61eb26c 100644 (file)
--- 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

diff --git a/sim/pru/ChangeLog b/sim/pru/ChangeLog
index ac947a3ddcc00f4f85acc213a03a0b521df8a6e1..5849e1d5911692629ae7ca30a417a1ea43c157fc 100644 (file)
--- a/sim/pru/ChangeLog
+++ b/sim/pru/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/pru/interp.c b/sim/pru/interp.c
index 8d247f3795f289d0712be123666d2af60c3d67b7..6398c6714f25ed09252d058316840bd24c17bd4a 100644 (file)
--- a/sim/pru/interp.c
+++ b/sim/pru/interp.c
@@ -23,9 +23,9 @@
 #include <stdint.h>
 #include <stddef.h>
 #include "bfd.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 #include "libiberty.h"
-#include "gdb/remote-sim.h"
+#include "sim/sim.h"
 #include "sim-main.h"
 #include "sim-assert.h"
 #include "sim-options.h"

diff --git a/sim/rl78/ChangeLog b/sim/rl78/ChangeLog
index f26d4d7a3ef39c81141a9453525e77b69a25ddd8..8ffa97ccfa4efe26725c18fd933b57461a8b8c7a 100644 (file)
--- a/sim/rl78/ChangeLog
+++ b/sim/rl78/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * Makefile.in: Update path.
+       * gdb-if.c: Update include path.
+       * load.h: Likewise.
+
 2021-05-05  Mike Frysinger  <vapier@gentoo.org>
 
        * gdb-if.c: Include libiberty.h.

diff --git a/sim/rl78/Makefile.in b/sim/rl78/Makefile.in
index 675f87be9b92e9d788158e541d7ac6ea4c90f2b9..a7e5a97b5d205b70debe7c46289683e54b66b697 100644 (file)
--- a/sim/rl78/Makefile.in
+++ b/sim/rl78/Makefile.in
@@ -40,8 +40,8 @@ arch = rl78
 err.o : err.h
 fpu.o : cpu.h fpu.h
 gdb-if.o : cpu.h mem.h load.h \
-           $(srcdir)/../../include/gdb/callback.h \
-          $(srcdir)/../../include/gdb/remote-sim.h \
+           $(srcdir)/../../include/sim/callback.h \
+          $(srcdir)/../../include/sim/sim.h \
           $(srcdir)/../../include/gdb/signals.h \
           $(srcdir)/../../include/gdb/sim-rl78.h
 load.o : ../../bfd/bfd.h cpu.h mem.h

diff --git a/sim/rl78/gdb-if.c b/sim/rl78/gdb-if.c
index f4b6754f58733c97e29deb812cdcf2a23db74593..87e343cdd485e26b7c0d4f4f8d467d7251df7bb7 100644 (file)
--- a/sim/rl78/gdb-if.c
+++ b/sim/rl78/gdb-if.c
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "ansidecl.h"
 #include "libiberty.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "gdb/signals.h"
 #include "gdb/sim-rl78.h"
 

diff --git a/sim/rl78/load.h b/sim/rl78/load.h
index 7461c2162babc8f47c2c57c2a04dc0b5d49d43c3..1eaf045778789c4589f69f7f4fef18d313081c0e 100644 (file)
--- a/sim/rl78/load.h
+++ b/sim/rl78/load.h
@@ -23,7 +23,7 @@
 #define SIM_RL78_LOAD_H_
 
 #include "bfd.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 
 void rl78_load (bfd *, host_callback *callbacks, const char * const simname);
 

diff --git a/sim/rx/ChangeLog b/sim/rx/ChangeLog
index b941cafcd57d5b1a2db6fbb51db853197422b518..cbb3b471d4d57dbb77e1e056f8947b718ae21278 100644 (file)
--- a/sim/rx/ChangeLog
+++ b/sim/rx/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * gdb-if.c: Update include path.
+       * load.h: Likewise.
+       * syscalls.c: Likewise.
+
 2021-05-05  Mike Frysinger  <vapier@gentoo.org>
 
        * gdb-if.c: Include libiberty.h.

diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index ec419109588892aef3c73ef81d7d3ec2e5b0cf9d..4a0f0701a56b650ef5aafe909243b869feadbd31 100644 (file)
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -28,8 +28,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "ansidecl.h"
 #include "libiberty.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "gdb/signals.h"
 #include "gdb/sim-rx.h"
 

diff --git a/sim/rx/load.h b/sim/rx/load.h
index bb227769cac27f09b447995c91072cc5b59cba16..562fa235aebb13e2f6e0fe3b3766ea4dfbde8edd 100644 (file)
--- a/sim/rx/load.h
+++ b/sim/rx/load.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #include "bfd.h"
-#include "gdb/callback.h"
+#include "sim/callback.h"
 
 extern int default_machine;
 

diff --git a/sim/rx/syscalls.c b/sim/rx/syscalls.c
index 0c75c7dcdf8ab10cbaf52ba4209b75ba16231d37..73ca0f2b190e3d23acb7bf4697f4c4731239279d 100644 (file)
--- a/sim/rx/syscalls.c
+++ b/sim/rx/syscalls.c
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "gdb/callback.h"
+#include "sim/callback.h"
 
 #include "cpu.h"
 #include "mem.h"

diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog
index d3c94d981973271f642dea991258f47d3c280c3d..be77f8c351e455e0767fc15b82da26e4e0140e19 100644 (file)
--- a/sim/sh/ChangeLog
+++ b/sim/sh/ChangeLog
@@ -1,3 +1,7 @@
+2021-05-14  Mike Frysinger  <vapier@gentoo.org>
+
+       * interp.c: Update include path.
+
 2021-05-04  Mike Frysinger  <vapier@gentoo.org>
 
        * configure: Regenerate.

diff --git a/sim/sh/interp.c b/sim/sh/interp.c
index fa361bacc2293b135271eb736b65d568bcb3c0ac..5fb6aff02f0dfe5f21d63571c47f876a3ce1fc43 100644 (file)
--- a/sim/sh/interp.c
+++ b/sim/sh/interp.c
@@ -50,8 +50,8 @@
 #endif
 
 #include "bfd.h"
-#include "gdb/callback.h"
-#include "gdb/remote-sim.h"
+#include "sim/callback.h"
+#include "sim/sim.h"
 #include "gdb/sim-sh.h"
 
 #include "sim-main.h"