* sim-d10v.h: Delete file. Moved to include/gdb/.

* sim-d10v.h: New file.  Moved from include/sim-d10v.h.

* Makefile.in (INCLUDE): Add "gdb/sim-d10v.h".
* interp.c: Include "gdb/sim-d10v.h" instead of "sim-d10v.h".

* d10v-tdep.c: Include "gdb/sim-d10v.h" instead of "sim-d10v.h".
* Makefile.in (sim_d10v_h): Update definition.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cbdde24fe80b3a89baa39943909080ebe173520c..b4dfe86085c881b23870c3182df3ae3935b052e3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+       * d10v-tdep.c: Include "gdb/sim-d10v.h" instead of "sim-d10v.h".
+       * Makefile.in (sim_d10v_h): Update definition.
+
 2002-05-24  Andrew Cagney  <cagney@redhat.com>
 
        * d10v-tdep.c (d10v_gdbarch_init): Revert old code included in

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index c050aeb736a4b954b232dbfc29bb03b56eab13a7..da4e25e27b94018005d6b34a281f7fd10be8854b 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -572,7 +572,7 @@ dis_asm_h = $(INCLUDE_DIR)/dis-asm.h
 remote_sim_h = $(INCLUDE_DIR)/remote-sim.h
 demangle_h =    $(INCLUDE_DIR)/demangle.h
 obstack_h =     $(INCLUDE_DIR)/obstack.h
-sim_d10v_h =   $(INCLUDE_DIR)/sim-d10v.h
+sim_d10v_h =   $(INCLUDE_DIR)/gdb/sim-d10v.h
 splay_tree_h =  $(INCLUDE_DIR)/splay-tree.h
 
 readline_headers = \

diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c
index 570fed3b8c6d012728bdb758eeea12949183da82..cd260da80864a3c520373482129aac55651d981b 100644 (file)
--- a/gdb/d10v-tdep.c
+++ b/gdb/d10v-tdep.c
@@ -40,7 +40,7 @@
 #include "regcache.h"
 
 #include "floatformat.h"
-#include "sim-d10v.h"
+#include "gdb/sim-d10v.h"
 
 struct frame_extra_info
   {

diff --git a/include/ChangeLog b/include/ChangeLog
index f59e44757a19cbf03c0aee015781e2f154ae8ebf..e6ff3f17656c58a9c443b462064a7ebe9e6a6229 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+       * sim-d10v.h: Delete file.  Moved to include/gdb/.
+
 2002-05-23  Jakub Jelinek  <jakub@redhat.com>
 
        * elf/common.h (PT_TLS, SHF_TLS, STT_TLS, DF_STATIC_TLS): Define.

diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog
index 96a4a058a3020ffaeb6c1492804f7171105af0f7..e0992c95aba205317777006edfdf649114e4b209 100644 (file)
--- a/include/gdb/ChangeLog
+++ b/include/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+       * sim-d10v.h: New file.  Moved from include/sim-d10v.h.
+
 2002-05-10  Elena Zannoni  <ezannoni@redhat.com>
 
         * sim-sh.h: New file, for sh gdb<->sim interface.

diff --git a/include/sim-d10v.h b/include/gdb/sim-d10v.h
similarity index 100%
rename from include/sim-d10v.h
rename to include/gdb/sim-d10v.h

diff --git a/sim/d10v/ChangeLog b/sim/d10v/ChangeLog
index 5f7ad2e09f1c1e969a537f59a793a380dae53d1f..f798d941a4f7a2db19a185bd6d8951ec433190b7 100644 (file)
--- a/sim/d10v/ChangeLog
+++ b/sim/d10v/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-23  Andrew Cagney  <ac131313@redhat.com>
+
+       * Makefile.in (INCLUDE): Add "gdb/sim-d10v.h".
+       * interp.c: Include "gdb/sim-d10v.h" instead of "sim-d10v.h".
+
 2001-08-01  John R. Moore  <jmoore@redhat.com>
 
        * interp.c (sim_create_inferior): Removed a hack that stated

diff --git a/sim/d10v/Makefile.in b/sim/d10v/Makefile.in
index 82d7e11ceb33476ec7d56f032c850c1b83fa98b8..7ea6059aaad916e882df756c18bb00f6451fa6ac 100644 (file)
--- a/sim/d10v/Makefile.in
+++ b/sim/d10v/Makefile.in
@@ -22,7 +22,8 @@ SIM_OBJS = interp.o table.o simops.o endian.o sim-load.o
 SIM_EXTRA_CLEAN = clean-extra
 SIM_EXTRA_CFLAGS = -DNEED_UI_LOOP_HOOK -DSIM_HAVE_ENVIRONMENT
 
-INCLUDE = d10v_sim.h $(srcroot)/include/callback.h targ-vals.h endian.c
+INCLUDE = d10v_sim.h $(srcroot)/include/callback.h targ-vals.h endian.c \
+       $(srcroot)/include/gdb/sim-d10v.h
 
 # This selects the d10v newlib/libgloss syscall definitions.
 NL_TARGET = -DNL_TARGET_d10v

diff --git a/sim/d10v/interp.c b/sim/d10v/interp.c
index ea1828c3e0ef8f66a07c441460575ffb8cc34811..338305c9c25cd5e2b42d5d9ef1f6e7c1fbe5ce87 100644 (file)
--- a/sim/d10v/interp.c
+++ b/sim/d10v/interp.c
@@ -5,7 +5,7 @@
 #include "remote-sim.h"
 
 #include "d10v_sim.h"
-#include "sim-d10v.h"
+#include "gdb/sim-d10v.h"
 
 enum _leftright { LEFT_FIRST, RIGHT_FIRST };