sim: move bfd.h include out of sim-main.h

Not all arches include this in sim-main.h, and the ones that do don't
actually use bfd defines in the sim-main.h header.  Prune it to make
sim-main.h simpler so we can kill it off entirely in the future.

We add the include to the files that utilize e.g. bfd_vma though.

diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
index bdc5019a3033f021c782774a2e6c8a7b0465a496..5ca01eb91c5f2b928392492d0e85fcb06bae7867 100644 (file)
--- a/sim/arm/sim-main.h
+++ b/sim/arm/sim-main.h
@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #undef BIT
 #include "armdefs.h"

diff --git a/sim/common/cgen-trace.h b/sim/common/cgen-trace.h
index 3e2b4a9e9d7e1e0a129323e31cc3524365dfa5bb..f2368578d5ead1b894d80be7c402b94d6f72dd27 100644 (file)
--- a/sim/common/cgen-trace.h
+++ b/sim/common/cgen-trace.h
@@ -21,6 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #define CGEN_TRACE_H
 
 #include "ansidecl.h"
+#include "bfd.h"
 
 void cgen_trace_insn_init (SIM_CPU *, int);
 void cgen_trace_insn_fini (SIM_CPU *, const struct argbuf *, int);

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index 796666d11d5e94d6dc8c454e41876e612211b08e..46bf9050ca5686187cab8514d9ca3f7880cb1194 100644 (file)
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -73,6 +73,8 @@ typedef address_word sim_cia;
 typedef struct _sim_cpu SIM_CPU;
 typedef struct _sim_cpu sim_cpu;
 
+#include "bfd.h"
+
 #include "sim-module.h"
 
 #include "sim-arange.h"

diff --git a/sim/common/sim-trace.h b/sim/common/sim-trace.h
index 8d4ab13081533564a75016d5c42af0b927cbf3b0..d7cba2df4d4c51dce856395124c7a3f2d902c909 100644 (file)
--- a/sim/common/sim-trace.h
+++ b/sim/common/sim-trace.h
@@ -25,6 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdarg.h>
 
 #include "ansidecl.h"
+#include "bfd.h"
 #include "dis-asm.h"
 
 /* Standard traceable entities.  */

diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
index 188c32caa09c575310105dd416f5bdebee78c31b..a54a36559814b2ad94ff179f4ffc36269bc9af9e 100644 (file)
--- a/sim/cr16/sim-main.h
+++ b/sim/cr16/sim-main.h
@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #include "cr16_sim.h"
 

diff --git a/sim/cr16/simops.c b/sim/cr16/simops.c
index d58c0c93395378d3e7e46bce0bcbb1a12fc2a760..6eefe1bff60fcc431cf82bb2d1b0f99c49903916 100644 (file)
--- a/sim/cr16/simops.c
+++ b/sim/cr16/simops.c
@@ -31,6 +31,8 @@
 #include <time.h>
 #include <sys/time.h>
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-signal.h"
 #include "simops.h"

diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
index a6462d8c6a43a0c63060087f27d4d6c6cd001427..4e6771af70fcf11225d54bfc9d3bff08a699c301 100644 (file)
--- a/sim/d10v/sim-main.h
+++ b/sim/d10v/sim-main.h
@@ -21,7 +21,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #include "d10v_sim.h"
 

diff --git a/sim/d10v/simops.c b/sim/d10v/simops.c
index 9883b3f55281aa598c74ef52c13bca2af950913f..a2eb3677e7e28d46c4225eaee2a35768b506f4d8 100644 (file)
--- a/sim/d10v/simops.c
+++ b/sim/d10v/simops.c
@@ -10,6 +10,8 @@
 #endif
 #include <string.h>
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-signal.h"
 #include "simops.h"

diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
index 5fbf94d1f61354df478339038c15d02c23855360..2ad757180021cd181b203d069460be38f87e41be 100644 (file)
--- a/sim/frv/sim-main.h
+++ b/sim/frv/sim-main.h
@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-basics.h"
 #include "cgen-types.h"
 #include "frv-desc.h"
+#include <stdbool.h>
 #include "frv-opc.h"
 #include "arch.h"
 

diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
index e160a12880dd974e6942aa87777e85cb0283a23f..5c84f9e2f2191c42bc30c0e59e009693a4223503 100644 (file)
--- a/sim/ft32/sim-main.h
+++ b/sim/ft32/sim-main.h
@@ -23,7 +23,6 @@
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #include "ft32-sim.h"
 

diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
index 84bb346a9a95eb15f381f990ec3db14f39c1569d..c034699e5c55a9472b55086d76faad37d2703037 100644 (file)
--- a/sim/h8300/sim-main.h
+++ b/sim/h8300/sim-main.h
@@ -1,7 +1,5 @@
 /* Main header for the Hitachi h8/300 architecture.  */
 
-#include "bfd.h"
-
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 

diff --git a/sim/m68hc11/interp.c b/sim/m68hc11/interp.c
index 2620060dca1d8b4d66d8fba3bd435cf74070b049..89c6449dfe1a1e78aaefa02dc3c76dc442c8b191 100644 (file)
--- a/sim/m68hc11/interp.c
+++ b/sim/m68hc11/interp.c
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This must come before any other includes.  */
 #include "defs.h"
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-assert.h"
 #include "sim-hw.h"

diff --git a/sim/m68hc11/interrupts.c b/sim/m68hc11/interrupts.c
index ee65f4375af12602264f99d3df92b7fbe134aecb..5b3d48faa9b4e441e734a806e051303da562a1f2 100644 (file)
--- a/sim/m68hc11/interrupts.c
+++ b/sim/m68hc11/interrupts.c
@@ -20,6 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This must come before any other includes.  */
 #include "defs.h"
 
+#include "bfd.h"
+
 #include "sim-main.h"
 #include "sim-options.h"
 #include "sim-signal.h"

diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
index e47bd83f9b9a5a301b53ca8c52d2ba93c31ce56d..f320bf10b08cff6a983c57528d22f2486a266e75 100644 (file)
--- a/sim/m68hc11/sim-main.h
+++ b/sim/m68hc11/sim-main.h
@@ -23,8 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sim-basics.h"
 #include "sim-base.h"
 
-#include "bfd.h"
-
 #include "opcode/m68hc11.h"
 
 #include "sim/sim.h"

diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
index 7290e02131eca5d1dbeed22a4d876fa7803575dc..684ec39354be8b7ae68c293497d02a968f2afb48 100644 (file)
--- a/sim/mcore/sim-main.h
+++ b/sim/mcore/sim-main.h
@@ -21,7 +21,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 /* The machine state.
    This state is maintained in host byte order.  The

diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
index 9ec6c121b3aae5d865a379a9d82c95b236d6d578..696a1bcf81bdcd1617a7ca5f89a109d3d9c587d2 100644 (file)
--- a/sim/mips/sim-main.h
+++ b/sim/mips/sim-main.h
@@ -25,7 +25,6 @@ mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ER
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 #include "elf-bfd.h"
 #include "elf/mips.h"
 

diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
index c4be80e39d26a9e48b36bca929da5888e697b240..d0df1e927cd16d38ebe9e5bd0200abe3594403dc 100644 (file)
--- a/sim/moxie/sim-main.h
+++ b/sim/moxie/sim-main.h
@@ -22,7 +22,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "sim-basics.h"
 #include "sim-base.h"
-#include "bfd.h"
 
 #define PCIDX 17
 

diff --git a/sim/riscv/interp.c b/sim/riscv/interp.c
index 50b5a514e327eaa1ea9a6a4e3bad5766b15934e9..6bd0bf2a41a68a1adf34d85617305477e6d8a0aa 100644 (file)
--- a/sim/riscv/interp.c
+++ b/sim/riscv/interp.c
@@ -21,6 +21,8 @@
 /* This must come before any other includes.  */
 #include "defs.h"
 
+#include "bfd.h"
+
 #include "sim/callback.h"
 #include "sim-main.h"
 #include "sim-options.h"

diff --git a/sim/rx/gdb-if.c b/sim/rx/gdb-if.c
index caa7ddbcb3257b42370495f85830636d3ab646cf..edc99e6e77d08551b40da8ebb95c437fa569f8a6 100644 (file)
--- a/sim/rx/gdb-if.c
+++ b/sim/rx/gdb-if.c
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <stdlib.h>
 
 #include "ansidecl.h"
+#include "bfd.h"
 #include "libiberty.h"
 #include "sim/callback.h"
 #include "sim/sim.h"

diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
index abf2ed78febc510e3bee27f66c10f26020370423..9d56469d666562c02bec8430e9dd6ca47da833e2 100644 (file)
--- a/sim/v850/sim-main.h
+++ b/sim/v850/sim-main.h
@@ -11,8 +11,6 @@
 #include "sim-base.h"
 
 #include "simops.h"
-#include "bfd.h"
-
 
 typedef uint32_t reg_t;
 typedef uint64_t reg64_t;