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 40b730a51f35600a85e50561ea0266fcc91c8384..02920dec62d7a1baa9c2314a925999d9643d4422 100644 (file)
--- 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 2aeb97d7c44382df3861cad8b0ba116afc73fdc6..ab9b3a3985ff83e294b6d7914c4d0430210b9859 100644 (file)
--- 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 dcfa28559f94caab3587bd9d102af4049cb66770..053830c9c1938060e202f2c9441030009b106a1f 100755 (executable)
--- 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 f16f959e54c83e499521ce2f31dc197bc31de246..5c220ffa3f5c2dab33de24fe6af7d7d3914b181c 100644 (file)
--- 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 ed1427c8e5ef6a20d8054c29be9da04f5913b81a..cd24f35a5f13cd4a3f313eb1417cdf50352e0d34 100644 (file)
--- 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 f6bbb1e9b24378ec34d67ac21c8fb037fb12308e..323ae21448f6f6042f8c1317fd196d73fff6f071 100644 (file)
--- 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 44219cb0591cfee4dee73587674b15073616a105..f2dd97f3dc44ade440d450f4f8e1f72f0e8ee45d 100644 (file)
--- 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 d44c474ae1d686044ebca468ce0af9771db72c8a..e521963a902fa2ef83a9ad01641ea5d3416f77b7 100644 (file)
--- 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 3be37739b53241c57fd51f1e486292cd427547b7..d5a0dc81b628c15bc1e7a07f6a39aedf39aa9d68 100644 (file)
--- 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 36864da6493bbd60b2ce274eb2545dcb13064d71..85d0fcf952ff662b55c6972c55a0244de9613952 100644 (file)
--- 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 abbb2678ab8c00f4c1f7800f9b432a57edeb6173..237809431018590193f3dfa80b18fd7923418c76 100644 (file)
--- 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