sim: fix all sim builds

This commit:

  commit ef9866970ce6683d40465fb7c3168f87a1dcd1b7
  Date:   Thu Mar 28 06:40:30 2019 +0900

      sim/common: convert sim-arange to use sim-inline

broke many simulator targets.  I fixed aarch64 in a previous commit
without realising how many other target were also broken.

This commit adds the missing includes (sim-assert.h and libiberty.h),
which seem to be needed by many simulator targets, in a central
location, this should fix most builds.

sim/common/ChangeLog:

	* sim-base.h: Add 'sim-assert.h' include.
	* sim-basics.h: Add 'libiberty.h' include.

diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 53dde497681c4f0f9972618d9a56150f145101fa..21a247489b66e2a3269bb924346ea26024d6e550 100644 (file)
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2019-03-28  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * sim-base.h: Add 'sim-assert.h' include.
+       * sim-basics.h: Add 'libiberty.h' include.
+
 2019-03-28  Stafford Horne  <shorne@gmail.com>
 
        * sim-options.c: Include "config.h".

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index d07ff2168c35c4332b5fd60edbc5005c924f87f7..60072d334d8e18f9f8691a7bf52f74961bb701d6 100644 (file)
--- a/sim/common/sim-base.h
+++ b/sim/common/sim-base.h
@@ -93,6 +93,7 @@ typedef struct _sim_cpu sim_cpu;
 #include "sim-watch.h"
 #include "sim-memopt.h"
 #include "sim-cpu.h"
+#include "sim-assert.h"
 
 
 /* We require all sims to dynamically allocate cpus.  See comment up top about

diff --git a/sim/common/sim-basics.h b/sim/common/sim-basics.h
index 5aa76db424930199b59bc3fd8df116c10e952d41..0cf0bd623612b9282fcbee5a3c692aa2c8be2d84 100644 (file)
--- a/sim/common/sim-basics.h
+++ b/sim/common/sim-basics.h
@@ -147,6 +147,8 @@ typedef enum {
 
 #include "sim-utils.h"
 
+#include "libiberty.h"
+
 /* Note: Only the simpler interfaces are defined here.  More heavy
    weight objects, such as core and events, are defined in the more
    serious sim-base.h header. */