[2/2] sim: replace -I$srcroot/bfd include with -I$srcroot
Commit Message
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(-)
@@ -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"
@@ -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)
@@ -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"
@@ -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);
@@ -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"
@@ -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
@@ -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 */
@@ -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
@@ -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"
@@ -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