From 6cbb891faa7c5c9f8c4d7bc2d816b0c7863ff4ea Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 28 Nov 2021 00:23:38 -0500 Subject: [PATCH] sim: mcore: switch to new target-newlib-syscall Use the new target-newlib-syscall module. This is needed to merge all the architectures into a single build, and mcore has a custom syscall table for its newlib/libgloss port. --- sim/mcore/Makefile.in | 3 --- sim/mcore/interp.c | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in index 45cf634d06a..8f625839723 100644 --- a/sim/mcore/Makefile.in +++ b/sim/mcore/Makefile.in @@ -15,9 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# This selects the bfin newlib/libgloss syscall definitions. -NL_TARGET = -DNL_TARGET_mcore - ## COMMON_PRE_CONFIG_FRAG SIM_OBJS = \ diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index e8a45202219..bc33cc0d450 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -36,6 +36,8 @@ along with this program. If not, see . */ #include "sim-syscall.h" #include "sim-options.h" +#include "target-newlib-syscall.h" + #define target_big_endian (CURRENT_TARGET_BYTE_ORDER == BIG_ENDIAN) @@ -1350,6 +1352,9 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb, SIM_DESC sd = sim_state_alloc (kind, cb); SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); + /* Set default options before parsing user options. */ + cb->syscall_map = cb_mcore_syscall_map; + /* The cpu data is kept in a separately allocated chunk of memory. */ if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK) { -- 2.30.2