aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2023-01-01 09:55:07 -0500
committerMike Frysinger <vapier@gentoo.org>2023-01-01 23:14:19 -0500
commit60a1031181a972a199fc64abddbdf9bcac20193a (patch)
tree8e8a6382b253ff67f63fcb3b2937f4d87006b289
parent3002e78a7d3dba2cf2776cebfd5f2a9e53071b3e (diff)
downloadgdb-60a1031181a972a199fc64abddbdf9bcac20193a.zip
gdb-60a1031181a972a199fc64abddbdf9bcac20193a.tar.gz
gdb-60a1031181a972a199fc64abddbdf9bcac20193a.tar.bz2
sim: replace -I$srcroot/opcodes include with -I$srcroot
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.
-rw-r--r--sim/bpf/sim-main.h4
-rw-r--r--sim/common/Make-common.in2
-rw-r--r--sim/cris/sim-main.h4
-rw-r--r--sim/frv/profile.h2
-rw-r--r--sim/frv/sim-main.h4
-rw-r--r--sim/iq2000/sim-main.h4
-rw-r--r--sim/lm32/sim-main.h4
-rw-r--r--sim/m32c/trace.c2
-rw-r--r--sim/m32r/sim-main.h4
-rw-r--r--sim/microblaze/interp.c2
-rw-r--r--sim/microblaze/microblaze.h2
-rw-r--r--sim/or1k/sim-main.h4
12 files changed, 19 insertions, 19 deletions
diff --git a/sim/bpf/sim-main.h b/sim/bpf/sim-main.h
index 812ab7e..d1d68d1 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 8d95852..2aeb97d 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 a56005a..abebe2b 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 051b015..8c29ed7 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 c292c64..f2fbcce 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 2398e30..dcd7ed4 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 d7590e4..82e8198 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 e9ea424..be796b1 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 9a52563..89502f2 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 7bd06d5..a4f505e 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 a09a169..328e825 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 8b340c5..326bc07 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"