[PATCH 1/2] sim: replace -I$srcroot/opcodes include with -I$srcroot

public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed

* [PATCH 1/2] sim: replace -I$srcroot/opcodes include with -I$srcroot
@ 2023-01-02  4:19 Mike Frysinger
  2023-01-02  4:19 ` [PATCH 2/2] sim: replace -I$srcroot/bfd " Mike Frysinger
  0 siblings, 1 reply; 2+ messages in thread
From: Mike Frysinger @ 2023-01-02  4:19 UTC (permalink / raw)
  To: gdb-patches

Clean up includes a bit by making ports include opcodes/ headers
explicitly.  This matches other projects, and makes it more clear
where these headers are coming from.
---
 sim/bpf/sim-main.h          | 4 ++--
 sim/common/Make-common.in   | 2 +-
 sim/cris/sim-main.h         | 4 ++--
 sim/frv/profile.h           | 2 +-
 sim/frv/sim-main.h          | 4 ++--
 sim/iq2000/sim-main.h       | 4 ++--
 sim/lm32/sim-main.h         | 4 ++--
 sim/m32c/trace.c            | 2 +-
 sim/m32r/sim-main.h         | 4 ++--
 sim/microblaze/interp.c     | 2 +-
 sim/microblaze/microblaze.h | 2 +-
 sim/or1k/sim-main.h         | 4 ++--
 12 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sim/bpf/sim-main.h b/sim/bpf/sim-main.h
index 812ab7e165d4..d1d68d12e761 100644
--- a/sim/bpf/sim-main.h
+++ b/sim/bpf/sim-main.h
@@ -20,8 +20,8 @@
 #define SIM_MAIN_H
 
 #include "sim-basics.h"
-#include "bpf-desc.h"
-#include "bpf-opc.h"
+#include "opcodes/bpf-desc.h"
+#include "opcodes/bpf-opc.h"
 #include "arch.h"
 #include "sim-base.h"
 #include "cgen-sim.h"
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 8d9585287c7c..2aeb97d7c443 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -119,7 +119,7 @@ CONFIG_CFLAGS = \
 CSEARCH = -I. -I$(srcdir) -I$(srccom) \
   -I$(srcroot)/include \
   -I../../bfd -I$(srcroot)/bfd \
-  -I$(srcroot)/opcodes \
+  -I$(srcroot) \
   -I../..
 ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS)
 BUILD_CFLAGS = $(CFLAGS_FOR_BUILD) $(CSEARCH)
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
index a56005ae3a30..abebe2bafc1f 100644
--- a/sim/cris/sim-main.h
+++ b/sim/cris/sim-main.h
@@ -30,8 +30,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define WITH_SCACHE_PBB 1
 
 #include "sim-basics.h"
-#include "cris-desc.h"
-#include "cris-opc.h"
+#include "opcodes/cris-desc.h"
+#include "opcodes/cris-opc.h"
 #include "arch.h"
 #include "sim-base.h"
 #include "cgen-sim.h"
diff --git a/sim/frv/profile.h b/sim/frv/profile.h
index 051b01542722..8c29ed722ac4 100644
--- a/sim/frv/profile.h
+++ b/sim/frv/profile.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef PROFILE_H
 #define PROFILE_H
 
-#include "frv-desc.h"
+#include "opcodes/frv-desc.h"
 
 /* This struct defines the state of profiling.  All fields are of general
    use to all machines.  */
diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index c292c6407a39..f2fbcce2b214 100644
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -28,9 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define WITH_SCACHE_PBB 0
 
 #include "sim-basics.h"
-#include "frv-desc.h"
+#include "opcodes/frv-desc.h"
 #include <stdbool.h>
-#include "frv-opc.h"
+#include "opcodes/frv-opc.h"
 #include "arch.h"
 
 #define SIM_ENGINE_HALT_HOOK(SD, LAST_CPU, CIA) \
diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
index 2398e30b9a10..dcd7ed4682f8 100644
--- a/sim/iq2000/sim-main.h
+++ b/sim/iq2000/sim-main.h
@@ -10,8 +10,8 @@
 #define WITH_SCACHE_PBB 1
 
 #include "sim-basics.h"
-#include "iq2000-desc.h"
-#include "iq2000-opc.h"
+#include "opcodes/iq2000-desc.h"
+#include "opcodes/iq2000-opc.h"
 #include "arch.h"
 
 /* Pull in IQ2000_{DATA,INSN}_{MASK,VALUE}.  */
diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
index d7590e4fbd72..82e81988ce54 100644
--- a/sim/lm32/sim-main.h
+++ b/sim/lm32/sim-main.h
@@ -26,8 +26,8 @@
 #define WITH_SCACHE_PBB 1
 
 #include "sim-basics.h"
-#include "lm32-desc.h"
-#include "lm32-opc.h"
+#include "opcodes/lm32-desc.h"
+#include "opcodes/lm32-opc.h"
 #include "arch.h"
 #include "sim-base.h"
 #include "cgen-sim.h"
diff --git a/sim/m32c/trace.c b/sim/m32c/trace.c
index e9ea424c0fe8..be796b147edb 100644
--- a/sim/m32c/trace.c
+++ b/sim/m32c/trace.c
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "bfd.h"
 #include "dis-asm.h"
-#include "m32c-desc.h"
+#include "opcodes/m32c-desc.h"
 
 #include "cpu.h"
 #include "mem.h"
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
index 9a52563f25a2..89502f2240e3 100644
--- a/sim/m32r/sim-main.h
+++ b/sim/m32r/sim-main.h
@@ -9,8 +9,8 @@
 #define WITH_SCACHE_PBB 1
 
 #include "sim-basics.h"
-#include "m32r-desc.h"
-#include "m32r-opc.h"
+#include "opcodes/m32r-desc.h"
+#include "opcodes/m32r-opc.h"
 #include "arch.h"
 #include "sim-base.h"
 #include "cgen-sim.h"
diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c
index 7bd06d513399..a4f505e77a8d 100644
--- a/sim/microblaze/interp.c
+++ b/sim/microblaze/interp.c
@@ -34,7 +34,7 @@
 #include "sim-syscall.h"
 
 #include "microblaze-sim.h"
-#include "microblaze-dis.h"
+#include "opcodes/microblaze-dis.h"
 
 #define target_big_endian (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
 
diff --git a/sim/microblaze/microblaze.h b/sim/microblaze/microblaze.h
index a09a1697fc2d..328e8253168f 100644
--- a/sim/microblaze/microblaze.h
+++ b/sim/microblaze/microblaze.h
@@ -18,7 +18,7 @@
    You should have received a copy of the GNU General Public License
    along with this program; if not, see <http://www.gnu.org/licenses/>.  */
 
-#include "../../opcodes/microblaze-opcm.h"
+#include "opcodes/microblaze-opcm.h"
 
 #define GET_RD	((inst & RD_MASK) >> RD_LOW)
 #define GET_RA	((inst & RA_MASK) >> RA_LOW)
diff --git a/sim/or1k/sim-main.h b/sim/or1k/sim-main.h
index 8b340c587daf..326bc079f700 100644
--- a/sim/or1k/sim-main.h
+++ b/sim/or1k/sim-main.h
@@ -21,8 +21,8 @@
 
 #define WITH_SCACHE_PBB 1
 
-#include "or1k-desc.h"
-#include "or1k-opc.h"
+#include "opcodes/or1k-desc.h"
+#include "opcodes/or1k-opc.h"
 #include "sim-basics.h"
 #include "arch.h"
 #include "sim-base.h"
-- 
2.39.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 2/2] sim: replace -I$srcroot/bfd include with -I$srcroot
  2023-01-02  4:19 [PATCH 1/2] sim: replace -I$srcroot/opcodes include with -I$srcroot Mike Frysinger
@ 2023-01-02  4:19 ` Mike Frysinger
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger @ 2023-01-02  4:19 UTC (permalink / raw)
  To: gdb-patches

Clean up includes a bit by making ports include bfd/ headers
explicitly.  This matches other projects, and makes it more clear
where these headers are coming from.
---
 sim/bfin/interp.c         | 2 +-
 sim/common/Make-common.in | 2 +-
 sim/configure             | 4 ++--
 sim/cris/sim-if.c         | 2 +-
 sim/frv/sim-if.c          | 2 +-
 sim/m68hc11/interp.c      | 2 +-
 sim/mips/acinclude.m4     | 4 ++--
 sim/mips/interp.c         | 2 +-
 sim/mips/sim-main.h       | 2 +-
 sim/rl78/load.c           | 2 +-
 sim/rx/load.c             | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c
index 40b730a51f35..02920dec62d7 100644
--- a/sim/bfin/interp.c
+++ b/sim/bfin/interp.c
@@ -71,7 +71,7 @@
 #include "elf/external.h"
 #include "elf/internal.h"
 #include "elf/bfin.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 
 #include "dv-bfin_cec.h"
 #include "dv-bfin_mmu.h"
diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in
index 2aeb97d7c443..ab9b3a3985ff 100644
--- a/sim/common/Make-common.in
+++ b/sim/common/Make-common.in
@@ -118,7 +118,7 @@ CONFIG_CFLAGS = \
 	$(SIM_WERROR_CFLAGS)
 CSEARCH = -I. -I$(srcdir) -I$(srccom) \
   -I$(srcroot)/include \
-  -I../../bfd -I$(srcroot)/bfd \
+  -I../../bfd \
   -I$(srcroot) \
   -I../..
 ALL_CFLAGS = $(CONFIG_CFLAGS) $(CSEARCH) $(INCGNU) $(SIM_EXTRA_CFLAGS) $(CFLAGS)
diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c
index f16f959e54c8..5c220ffa3f5c 100644
--- a/sim/cris/sim-if.c
+++ b/sim/cris/sim-if.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "libiberty.h"
 #include "bfd.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 
 #include "sim/callback.h"
 #include "sim-main.h"
diff --git a/sim/frv/sim-if.c b/sim/frv/sim-if.c
index ed1427c8e5ef..cd24f35a5f13 100644
--- a/sim/frv/sim-if.c
+++ b/sim/frv/sim-if.c
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-options.h"
 #include "libiberty.h"
 #include "bfd.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 
 static void free_state (SIM_DESC);
 \f
diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c
index f6bbb1e9b243..323ae21448f6 100644
--- a/sim/m68hc11/interp.c
+++ b/sim/m68hc11/interp.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "hw-tree.h"
 #include "hw-device.h"
 #include "hw-ports.h"
-#include "elf32-m68hc1x.h"
+#include "bfd/elf32-m68hc1x.h"
 
 #include "m68hc11-sim.h"
 
diff --git a/sim/mips/acinclude.m4 b/sim/mips/acinclude.m4
index 44219cb0591c..f2dd97f3dc44 100644
--- a/sim/mips/acinclude.m4
+++ b/sim/mips/acinclude.m4
@@ -190,8 +190,8 @@ AS_VAR_IF([SIM_MIPS_GEN], ["MULTI"], [dnl
 
 #include "sim-main.h"
 #include "multi-include.h"
-#include "elf-bfd.h"
-#include "elfxx-mips.h"
+#include "bfd/elf-bfd.h"
+#include "bfd/elfxx-mips.h"
 #include "elf/mips.h"
 
 #define SD sd
diff --git a/sim/mips/interp.c b/sim/mips/interp.c
index d44c474ae1d6..e521963a902f 100644
--- a/sim/mips/interp.c
+++ b/sim/mips/interp.c
@@ -47,7 +47,7 @@ code on the hardware.
 #include "getopt.h"
 #include "libiberty.h"
 #include "bfd.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 #include "sim/callback.h"   /* GDB simulator callback interface */
 #include "sim/sim.h" /* GDB simulator interface */
 #include "sim-syscall.h"   /* Simulator system call support */
diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 3be37739b532..d5a0dc81b628 100644
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -25,7 +25,7 @@ mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ER
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 #include "elf/mips.h"
 
 /* Deprecated macros and types for manipulating 64bit values.  Use
diff --git a/sim/rl78/load.c b/sim/rl78/load.c
index 36864da6493b..85d0fcf952ff 100644
--- a/sim/rl78/load.c
+++ b/sim/rl78/load.c
@@ -28,7 +28,7 @@
 
 #include "libiberty.h"
 #include "bfd.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 #include "elf/rl78.h"
 #include "cpu.h"
 #include "mem.h"
diff --git a/sim/rx/load.c b/sim/rx/load.c
index abbb2678ab8c..237809431018 100644
--- a/sim/rx/load.c
+++ b/sim/rx/load.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cpu.h"
 #include "mem.h"
 #include "load.h"
-#include "elf-bfd.h"
+#include "bfd/elf-bfd.h"
 
 /* Helper function for invoking a GDB-specified printf.  */
 static void
-- 
2.39.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-01-02  4:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-02  4:19 [PATCH 1/2] sim: replace -I$srcroot/opcodes include with -I$srcroot Mike Frysinger
2023-01-02  4:19 ` [PATCH 2/2] sim: replace -I$srcroot/bfd " Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).