From 1fef66b0dcc09c9114100e782ea54594550e8fb7 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 13 Jun 2021 23:16:32 -0400
Subject: sim: split sim-signal.h include out

The sim-basics.h is too big and includes too many things.  This leads
to some arch's sim-main.h having circular loop issues with defs, and
makes it hard to separate out common objects from arch-specific defs.
By splitting up sim-basics.h and killing off sim-main.h, it'll make
it easier to separate out the two.
---
 sim/mn10300/ChangeLog     | 6 ++++++
 sim/mn10300/interp.c      | 1 +
 sim/mn10300/mn10300_sim.h | 1 +
 sim/mn10300/op_utils.c    | 1 +
 sim/mn10300/sim-main.h    | 1 -
 5 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'sim/mn10300')

diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog
index 6f6dced..6bdb23e 100644
--- a/sim/mn10300/ChangeLog
+++ b/sim/mn10300/ChangeLog
@@ -1,3 +1,9 @@
+2021-06-18  Mike Frysinger  <vapier@gentoo.org>
+
+	* interp.c: Include sim-signal.h.
+	* op_utils.c, sim-main.h: Likewise.
+	* mn10300_sim.h: Delete sim-signal.h include.
+
 2021-06-17  Mike Frysinger  <vapier@gentoo.org>
 
 	* configure.ac: Delete SIM_AC_OPTION_ENDIAN call.
diff --git a/sim/mn10300/interp.c b/sim/mn10300/interp.c
index b793d3c..f16a756 100644
--- a/sim/mn10300/interp.c
+++ b/sim/mn10300/interp.c
@@ -9,6 +9,7 @@
 
 #include "bfd.h"
 #include "sim-assert.h"
+#include "sim-signal.h"
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/sim/mn10300/mn10300_sim.h b/sim/mn10300/mn10300_sim.h
index 1f696d5..f3e43a7 100644
--- a/sim/mn10300/mn10300_sim.h
+++ b/sim/mn10300/mn10300_sim.h
@@ -7,6 +7,7 @@
 #include "sim/sim.h"
 #include "bfd.h"
 #include "sim-fpu.h"
+#include "sim-signal.h"
 
 extern SIM_DESC simulator;
 
diff --git a/sim/mn10300/op_utils.c b/sim/mn10300/op_utils.c
index cd0f1a6..df95be3 100644
--- a/sim/mn10300/op_utils.c
+++ b/sim/mn10300/op_utils.c
@@ -2,6 +2,7 @@
 #include "defs.h"
 
 #include "sim-main.h"
+#include "sim-signal.h"
 #include "sim-syscall.h"
 #include "targ-vals.h"
 
diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
index 8750729..101586e 100644
--- a/sim/mn10300/sim-main.h
+++ b/sim/mn10300/sim-main.h
@@ -25,7 +25,6 @@
 #define SIM_ENGINE_HALT_HOOK(SD,LAST_CPU,CIA) /* disable this hook */
 
 #include "sim-basics.h"
-#include "sim-signal.h"
 
 #include <signal.h> /* For kill() in insns:do_trap */
 
-- 
cgit v1.1