diff mbox series

[4/5] sim: mn10300: drop subdir configure logic

Message ID 20221107162426.26097-4-vapier@gentoo.org
State Committed
Headers
Series [1/5] sim: riscv: drop subdir configure logic |

Commit Message

Mike Frysinger Nov. 7, 2022, 4:24 p.m. UTC 
  We've been using this only to set the default word size to 32.  We
can easily move this into the makefile via a -D compiler flag and
clean up the build logic quite a bit.
---
 sim/Makefile.in          |   18 +-
 sim/configure            |   24 +-
 sim/configure.ac         |    2 +-
 sim/mn10300/Makefile.in  |    4 +-
 sim/mn10300/aclocal.m4   |   16 -
 sim/mn10300/configure    | 2932 --------------------------------------
 sim/mn10300/configure.ac |    7 -
 7 files changed, 34 insertions(+), 2969 deletions(-)
 delete mode 100644 sim/mn10300/aclocal.m4
 delete mode 100755 sim/mn10300/configure
 delete mode 100644 sim/mn10300/configure.ac
diff mbox series

Patch

diff --git a/sim/configure.ac b/sim/configure.ac
index 48bf75e88085..cec89bb94812 100644
--- a/sim/configure.ac
+++ b/sim/configure.ac
@@ -144,7 +144,7 @@  if test "${enable_sim}" != no; then
     SIM_TARGET([mcore-*-*], [mcore])
     SIM_TARGET([microblaze*-*-*], [microblaze])
     SIM_TARGET([mips*-*-*], [mips], [true], [sim_igen=yes])
-    SIM_TARGET([mn10300*-*-*], [mn10300], [true], [sim_igen=yes])
+    SIM_TARGET([mn10300*-*-*], [mn10300], [], [sim_igen=yes])
     SIM_TARGET([moxie-*-*], [moxie])
     SIM_TARGET([msp430*-*-*], [msp430])
     SIM_TARGET([or1k*-*-*], [or1k])
diff --git a/sim/mn10300/Makefile.in b/sim/mn10300/Makefile.in
index f8ac93cdd56e..521f86c644be 100644
--- a/sim/mn10300/Makefile.in
+++ b/sim/mn10300/Makefile.in
@@ -28,6 +28,8 @@  SIM_OBJS = $(MN10300_OBJS) interp.o
 SIM_EXTRA_HW_DEVICES = mn103cpu mn103int mn103tim mn103ser mn103iop
 
 # List of extra flags to always pass to $(CC).
-SIM_EXTRA_CFLAGS = -DPOLL_QUIT_INTERVAL=0x20
+SIM_EXTRA_CFLAGS = \
+	-DPOLL_QUIT_INTERVAL=0x20 \
+	-DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31
 
 ## COMMON_POST_CONFIG_FRAG
diff --git a/sim/mn10300/configure.ac b/sim/mn10300/configure.ac
deleted file mode 100644
index 1fa7c0ef7c9f..000000000000
--- a/sim/mn10300/configure.ac
+++ /dev/null
@@ -1,7 +0,0 @@ 
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(Makefile.in)
-AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
-
-SIM_AC_OPTION_BITSIZE(32,31)
-
-SIM_AC_OUTPUT