sim: unify sim-signal.o building

Message ID 20230119003534.21437-1-vapier@gentoo.org
State Committed
Headers
Series sim: unify sim-signal.o building |

Commit Message

Mike Frysinger Jan. 19, 2023, 12:35 a.m. UTC
  Now that sim-main.h has been reduced significantly, we can remove it
from sim-signal.c and unify it across all boards since it compiles to
the same code.
---
 sim/Makefile.in         | 17 +++++++++++------
 sim/common/local.mk     |  2 +-
 sim/common/sim-signal.c |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)
  

Patch

diff --git a/sim/common/local.mk b/sim/common/local.mk
index 89843ead03be..5d0992fbd9e6 100644
--- a/sim/common/local.mk
+++ b/sim/common/local.mk
@@ -31,6 +31,7 @@  noinst_LIBRARIES += %D%/libcommon.a
 	%D%/callback.c \
 	%D%/portability.c \
 	%D%/sim-load.c \
+	%D%/sim-signal.c \
 	%D%/syscall.c \
 	%D%/target-newlib-errno.c \
 	%D%/target-newlib-open.c \
@@ -95,7 +96,6 @@  SIM_NEW_COMMON_OBJS = \
 	sim-profile.o \
 	sim-reason.o \
 	sim-reg.o \
-	sim-signal.o \
 	sim-stop.o \
 	sim-syscall.o \
 	sim-trace.o \
diff --git a/sim/common/sim-signal.c b/sim/common/sim-signal.c
index 9c4e261fa216..36ebbdfe969e 100644
--- a/sim/common/sim-signal.c
+++ b/sim/common/sim-signal.c
@@ -22,7 +22,8 @@  along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <signal.h>
 
-#include "sim-main.h"
+#include "sim/sim.h"
+#include "sim-io.h"
 #include "sim-signal.h"
 
 /* Convert SIM_SIGFOO to SIGFOO.