From d3fe0d7bb8a3101df6f052aa54e4cfedcc2fee94 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 28 Mar 2019 22:33:29 +0000 Subject: [PATCH] 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. --- 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/ChangeLog b/sim/common/ChangeLog index 53dde497681..21a247489b6 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2019-03-28 Andrew Burgess + + * sim-base.h: Add 'sim-assert.h' include. + * sim-basics.h: Add 'libiberty.h' include. + 2019-03-28 Stafford Horne * sim-options.c: Include "config.h". 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.30.2