From: Mike Frysinger <vapier@gentoo.org>
To: gdb-patches@sourceware.org
Subject: [PATCH 2/2] sim: replace -I$srcroot/bfd include with -I$srcroot
Date: Sun, 1 Jan 2023 23:19:43 -0500 [thread overview]
Message-ID: <20230102041943.6216-2-vapier@gentoo.org> (raw)
In-Reply-To: <20230102041943.6216-1-vapier@gentoo.org>
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
prev parent reply other threads:[~2023-01-02 4:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 4:19 [PATCH 1/2] sim: replace -I$srcroot/opcodes " Mike Frysinger
2023-01-02 4:19 ` Mike Frysinger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230102041943.6216-2-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).