Avoid including TCG-specific headers in non-TCG builds.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Message-Id: <[email protected]>
---
target/arm/internals.h | 4 +++-
target/arm/cpu-irq.c | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/target/arm/internals.h b/target/arm/internals.h
index f7a57d3ea70..fcce3804f34 100644
--- a/target/arm/internals.h
+++ b/target/arm/internals.h
@@ -29,9 +29,11 @@
#include "exec/vaddr.h"
#include "exec/breakpoint.h"
#include "exec/memop.h"
+#ifdef CONFIG_TCG
#include "accel/tcg/tb-cpu-state.h"
-#include "hw/core/registerfields.h"
#include "tcg/tcg-gvec-desc.h"
+#endif
+#include "hw/core/registerfields.h"
#include "system/memory.h"
#include "syndrome.h"
#include "cpu-features.h"
diff --git a/target/arm/cpu-irq.c b/target/arm/cpu-irq.c
index fe514cc93af..883e8a176c3 100644
--- a/target/arm/cpu-irq.c
+++ b/target/arm/cpu-irq.c
@@ -8,10 +8,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
-#include "accel/tcg/cpu-ops.h"
#include "internals.h"
#ifdef CONFIG_TCG
+#include "accel/tcg/cpu-ops.h"
+
static inline bool arm_excp_unmasked(CPUState *cs, unsigned int excp_idx,
unsigned int target_el,
unsigned int cur_el, bool secure,
--
2.53.0
