diff mbox

sim: fix all sim builds

Message ID 20190328224133.15558-1-andrew.burgess@embecosm.com
State New
Headers show

Commit Message

Andrew Burgess March 28, 2019, 10:41 p.m. UTC
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.
---
 sim/common/ChangeLog    | 5 +++++
 sim/common/sim-base.h   | 1 +
 sim/common/sim-basics.h | 2 ++
 3 files changed, 8 insertions(+)

Comments

Andrew Burgess March 28, 2019, 10:48 p.m. UTC | #1
* Andrew Burgess <andrew.burgess@embecosm.com> [2019-03-28 22:41:33 +0000]:

> 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.

I should have said - I pushed this already.

Thanks,
Andrew



> ---
>  sim/common/ChangeLog    | 5 +++++
>  sim/common/sim-base.h   | 1 +
>  sim/common/sim-basics.h | 2 ++
>  3 files changed, 8 insertions(+)
> 
> diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
> index d07ff2168c3..60072d334d8 100644
> --- 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 5aa76db4249..0cf0bd62361 100644
> --- 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. */
> -- 
> 2.14.5
>
diff mbox

Patch

diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
index d07ff2168c3..60072d334d8 100644
--- 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 5aa76db4249..0cf0bd62361 100644
--- 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. */