From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 1 Jan 2023 15:07:28 +0000 (-0500)
Subject: sim: replace -I$srcroot/bfd include with -I$srcroot
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c217e3d54e17e2dcf6b02d109e219a1718ac130e;p=binutils-gdb.git

sim: replace -I$srcroot/bfd include with -I$srcroot

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.
---

diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c
index 40b730a51f3..02920dec62d 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 2aeb97d7c44..ab9b3a3985f 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/configure b/sim/configure
index dcfa28559f9..053830c9c19 100755
--- a/sim/configure
+++ b/sim/configure
@@ -16505,8 +16505,8 @@ fi
 
 #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/cris/sim-if.c b/sim/cris/sim-if.c
index f16f959e54c..5c220ffa3f5 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 ed1427c8e5e..cd24f35a5f1 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);
 
diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c
index f6bbb1e9b24..323ae21448f 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 44219cb0591..f2dd97f3dc4 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 d44c474ae1d..e521963a902 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 3be37739b53..d5a0dc81b62 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 36864da6493..85d0fcf952f 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 abbb2678ab8..23780943101 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