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.

diff --git a/sim/mcore/Makefile.in b/sim/mcore/Makefile.in
index 45cf634d06a1364de00591601d1c49b2f24be6d8..8f625839723aeb247358e1760690bc9dc3e16a53 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
-# 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 e8a452022192091b9cda8f95d637e5717e7026d9..bc33cc0d450c0857381328cbb07d0af2573147a5 100644 (file)
--- a/sim/mcore/interp.c
+++ b/sim/mcore/interp.c
@@ -36,6 +36,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #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)
     {