From 3342c0ef8196d2c80e4cfc8332daf9468ef9154d Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 27 Dec 2023 00:18:12 -0500
Subject: libgloss: merge xstormy16 into top-level Makefile

Avoid a recursive make to speed things up a bit.
A xstormy16-elf build shows installed objects & libs produce same code.
---
 libgloss/Makefile.am            |   4 +
 libgloss/Makefile.in            | 341 ++++++++++++++++++++++++++++++++--------
 libgloss/configure              |  19 ++-
 libgloss/configure.ac           |   5 +-
 libgloss/xstormy16/Makefile.in  | 131 ---------------
 libgloss/xstormy16/Makefile.inc |  48 ++++++
 6 files changed, 341 insertions(+), 207 deletions(-)
 delete mode 100644 libgloss/xstormy16/Makefile.in
 create mode 100644 libgloss/xstormy16/Makefile.inc

(limited to 'libgloss')

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 0029e663e..b2605f1c2 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -17,6 +17,7 @@ tooldir = $(exec_prefix)/$(target_alias)
 multilibtooldir = $(tooldir)/lib$(MULTISUBDIR)
 multilibtool_DATA =
 multilibtool_LIBRARIES =
+multilibtool_PROGRAMS =
 
 includetooldir = $(tooldir)/include
 includetool_DATA =
@@ -145,6 +146,9 @@ endif
 if CONFIG_WINCE
 include wince/Makefile.inc
 endif
+if CONFIG_XSTORMY16
+include xstormy16/Makefile.inc
+endif
 if CONFIG_XTENSA
 include xtensa/Makefile.inc
 endif
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 3f26735ea..797bc189f 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -93,6 +93,7 @@ target_triplet = @target@
 bin_PROGRAMS = $(am__EXEEXT_1)
 check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
 	$(am__EXEEXT_5)
+multilibtool_PROGRAMS = $(am__EXEEXT_6)
 @HAVE_DOC_TRUE@am__append_1 = doc/porting.texi
 @CONFIG_AARCH64_TRUE@am__append_2 = aarch64/librdimon.a
 @CONFIG_AARCH64_TRUE@am__append_3 = \
@@ -272,8 +273,23 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
 @CONFIG_V850_TRUE@am__append_73 = v850/libsim.a
 @CONFIG_WINCE_TRUE@am__append_74 = $(gdbdir)
 @CONFIG_WINCE_TRUE@am__append_75 = wince/stub.exe
-@CONFIG_XTENSA_TRUE@am__append_76 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
-@CONFIG_XTENSA_TRUE@am__append_77 = \
+@CONFIG_XSTORMY16_TRUE@am__append_76 = xstormy16/crt0.o \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crti.o xstormy16/crtn.o \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/sim_high.ld \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/sim_rom.ld \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/eva_app.ld \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/eva_stub.hex
+@CONFIG_XSTORMY16_TRUE@am__append_77 = \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crt0.s \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crti.s \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crtn.s
+
+@CONFIG_XSTORMY16_TRUE@am__append_78 = xstormy16/libsim.a \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/libeva_app.a
+@CONFIG_XSTORMY16_TRUE@am__append_79 = xstormy16/eva_stub.elf
+@CONFIG_XSTORMY16_TRUE@am__append_80 = xstormy16/eva_stub.hex
+@CONFIG_XTENSA_TRUE@am__append_81 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
+@CONFIG_XTENSA_TRUE@am__append_82 = \
 @CONFIG_XTENSA_TRUE@	xtensa/default.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/nano.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/sim.elf.specs \
@@ -282,27 +298,27 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \
 @CONFIG_XTENSA_TRUE@	xtensa/sys.openocd.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/crt0.o
 
-@CONFIG_XTENSA_TRUE@am__append_78 = \
+@CONFIG_XTENSA_TRUE@am__append_83 = \
 @CONFIG_XTENSA_TRUE@	xtensa/crt0.S \
 @CONFIG_XTENSA_TRUE@	xtensa/crt1-sim.S \
 @CONFIG_XTENSA_TRUE@	xtensa/crt1-boards.S
 
-@CONFIG_XTENSA_TRUE@am__append_79 = xtensa/libgloss.a
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_80 = \
+@CONFIG_XTENSA_TRUE@am__append_84 = xtensa/libgloss.a
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_85 = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/app.elf.ld \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/crt1-sim.o \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/crt1-boards.o
 
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_81 = xtensa/libsys_qemu.a \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_86 = xtensa/libsys_qemu.a \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/libsys_openocd.a
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_82 = xtensa/boards/esp32/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_83 = xtensa/boards/esp32/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_84 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_85 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_86 = xtensa/boards/esp32s3/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_87 = xtensa/boards/esp32s3/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_88 = -I$(srcdir)/xtensa/boards/esp32s3/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_89 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_87 = xtensa/boards/esp32/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_88 = xtensa/boards/esp32/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_89 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_90 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_91 = xtensa/boards/esp32s3/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_92 = xtensa/boards/esp32s3/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_93 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_94 = -I$(srcdir)/xtensa/boards/esp32s3/include
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -332,8 +348,8 @@ CONFIG_CLEAN_FILES = epiphany/Makefile m32r/Makefile m68hc11/Makefile \
 	mips/Makefile rs6000/Makefile cr16/Makefile cris/Makefile \
 	crx/Makefile fr30/Makefile ft32/Makefile mep/Makefile \
 	microblaze/Makefile mt/Makefile visium/Makefile xc16x/Makefile \
-	xstormy16/Makefile m32c/Makefile rl78/Makefile rx/Makefile \
-	spu/Makefile tic6x/Makefile or1k/Makefile pru/Makefile \
+	m32c/Makefile rl78/Makefile rx/Makefile spu/Makefile \
+	tic6x/Makefile or1k/Makefile pru/Makefile \
 	sparc/libsys/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -364,7 +380,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(infodir)" \
+	"$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(infodir)" \
 	"$(DESTDIR)$(aarch64_cpu_initcpuinitdir)" \
 	"$(DESTDIR)$(arm_cpu_initcpuinitdir)" \
 	"$(DESTDIR)$(includemachinetooldir)" \
@@ -573,7 +589,10 @@ libobjs_a_LIBADD =
 @CONFIG_NDS32_TRUE@am__objects_15 = nds32/crt0.$(OBJEXT) \
 @CONFIG_NDS32_TRUE@	nds32/crt1.$(OBJEXT)
 @CONFIG_V850_TRUE@am__objects_16 = v850/crt0.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@am__objects_17 = xtensa/crt0.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@am__objects_17 = xstormy16/crt0.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crti.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crtn.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@am__objects_18 = xtensa/crt0.$(OBJEXT) \
 @CONFIG_XTENSA_TRUE@	xtensa/crt1-sim.$(OBJEXT) \
 @CONFIG_XTENSA_TRUE@	xtensa/crt1-boards.$(OBJEXT)
 am_libobjs_a_OBJECTS = $(am__objects_3) $(am__objects_4) \
@@ -581,7 +600,7 @@ am_libobjs_a_OBJECTS = $(am__objects_3) $(am__objects_4) \
 	$(am__objects_8) $(am__objects_9) $(am__objects_10) \
 	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
 	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
-	$(am__objects_17)
+	$(am__objects_17) $(am__objects_18)
 libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS)
 lm32_libgloss_a_AR = $(AR) $(ARFLAGS)
 lm32_libgloss_a_LIBADD =
@@ -590,7 +609,7 @@ lm32_libgloss_a_LIBADD =
 lm32_libgloss_a_OBJECTS = $(am_lm32_libgloss_a_OBJECTS)
 mcore_libcmb_a_AR = $(AR) $(ARFLAGS)
 mcore_libcmb_a_LIBADD =
-@CONFIG_MCORE_TRUE@am__objects_18 = mcore/fstat.$(OBJEXT) \
+@CONFIG_MCORE_TRUE@am__objects_19 = mcore/fstat.$(OBJEXT) \
 @CONFIG_MCORE_TRUE@	mcore/getpid.$(OBJEXT) isatty.$(OBJEXT) \
 @CONFIG_MCORE_TRUE@	mcore/kill.$(OBJEXT) mcore/raise.$(OBJEXT) \
 @CONFIG_MCORE_TRUE@	mcore/putnum.$(OBJEXT) mcore/stat.$(OBJEXT) \
@@ -602,12 +621,12 @@ mcore_libcmb_a_LIBADD =
 @CONFIG_MCORE_TRUE@	mcore/cmb-exit.$(OBJEXT) \
 @CONFIG_MCORE_TRUE@	mcore/cmb-inbyte.$(OBJEXT) \
 @CONFIG_MCORE_TRUE@	mcore/cmb-outbyte.$(OBJEXT) \
-@CONFIG_MCORE_TRUE@	$(am__objects_18)
+@CONFIG_MCORE_TRUE@	$(am__objects_19)
 mcore_libcmb_a_OBJECTS = $(am_mcore_libcmb_a_OBJECTS)
 mcore_libsim_a_AR = $(AR) $(ARFLAGS)
 mcore_libsim_a_LIBADD =
 @CONFIG_MCORE_TRUE@am_mcore_libsim_a_OBJECTS =  \
-@CONFIG_MCORE_TRUE@	mcore/syscalls.$(OBJEXT) $(am__objects_18)
+@CONFIG_MCORE_TRUE@	mcore/syscalls.$(OBJEXT) $(am__objects_19)
 mcore_libsim_a_OBJECTS = $(am_mcore_libsim_a_OBJECTS)
 mn10200_libeval_a_AR = $(AR) $(ARFLAGS)
 mn10200_libeval_a_LIBADD =
@@ -634,7 +653,7 @@ mn10200_libeval_a_LIBADD =
 mn10200_libeval_a_OBJECTS = $(am_mn10200_libeval_a_OBJECTS)
 mn10300_libcygmon_a_AR = $(AR) $(ARFLAGS)
 mn10300_libcygmon_a_LIBADD =
-@CONFIG_MN10300_TRUE@am__objects_19 = mn10300/_exit.$(OBJEXT) \
+@CONFIG_MN10300_TRUE@am__objects_20 = mn10300/_exit.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/access.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/chmod.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/close.$(OBJEXT) \
@@ -653,12 +672,12 @@ mn10300_libcygmon_a_LIBADD =
 @CONFIG_MN10300_TRUE@	mn10300/unlink.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/utime.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/write.$(OBJEXT)
-@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am_mn10300_libcygmon_a_OBJECTS = $(am__objects_19) \
+@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am_mn10300_libcygmon_a_OBJECTS = $(am__objects_20) \
 @CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@	mn10300/cygmon.$(OBJEXT)
 mn10300_libcygmon_a_OBJECTS = $(am_mn10300_libcygmon_a_OBJECTS)
 mn10300_libeval_a_AR = $(AR) $(ARFLAGS)
 mn10300_libeval_a_LIBADD =
-@CONFIG_MN10300_TRUE@am_mn10300_libeval_a_OBJECTS = $(am__objects_19) \
+@CONFIG_MN10300_TRUE@am_mn10300_libeval_a_OBJECTS = $(am__objects_20) \
 @CONFIG_MN10300_TRUE@	mn10300/trap.$(OBJEXT)
 mn10300_libeval_a_OBJECTS = $(am_mn10300_libeval_a_OBJECTS)
 moxie_libqemu_a_AR = $(AR) $(ARFLAGS)
@@ -843,7 +862,7 @@ riscv_libsemihost_a_LIBADD =
 riscv_libsemihost_a_OBJECTS = $(am_riscv_libsemihost_a_OBJECTS)
 riscv_libsim_a_AR = $(AR) $(ARFLAGS)
 riscv_libsim_a_LIBADD =
-@CONFIG_RISCV_TRUE@am__objects_20 =  \
+@CONFIG_RISCV_TRUE@am__objects_21 =  \
 @CONFIG_RISCV_TRUE@	riscv/riscv_libsim_a-sys_access.$(OBJEXT) \
 @CONFIG_RISCV_TRUE@	riscv/riscv_libsim_a-sys_chdir.$(OBJEXT) \
 @CONFIG_RISCV_TRUE@	riscv/riscv_libsim_a-sys_chmod.$(OBJEXT) \
@@ -876,7 +895,7 @@ riscv_libsim_a_LIBADD =
 @CONFIG_RISCV_TRUE@	riscv/riscv_libsim_a-sys_utime.$(OBJEXT) \
 @CONFIG_RISCV_TRUE@	riscv/riscv_libsim_a-sys_wait.$(OBJEXT) \
 @CONFIG_RISCV_TRUE@	riscv/riscv_libsim_a-sys_write.$(OBJEXT)
-@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_20)
+@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_21)
 riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS)
 v850_libsim_a_AR = $(AR) $(ARFLAGS)
 v850_libsim_a_LIBADD =
@@ -896,15 +915,36 @@ v850_libsim_a_LIBADD =
 @CONFIG_V850_TRUE@	v850/unlink.$(OBJEXT) v850/utime.$(OBJEXT) \
 @CONFIG_V850_TRUE@	v850/wait.$(OBJEXT) v850/write.$(OBJEXT)
 v850_libsim_a_OBJECTS = $(am_v850_libsim_a_OBJECTS)
+xstormy16_libeva_app_a_AR = $(AR) $(ARFLAGS)
+xstormy16_libeva_app_a_LIBADD =
+@CONFIG_XSTORMY16_TRUE@am_xstormy16_libeva_app_a_OBJECTS =  \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/close.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/fstat.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/getpid.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/kill.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/lseek.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/open.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/stat.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/unlink.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/eva_app.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/isatty.$(OBJEXT)
+xstormy16_libeva_app_a_OBJECTS = $(am_xstormy16_libeva_app_a_OBJECTS)
+xstormy16_libsim_a_AR = $(AR) $(ARFLAGS)
+xstormy16_libsim_a_LIBADD =
+@CONFIG_XSTORMY16_TRUE@am_xstormy16_libsim_a_OBJECTS =  \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/syscalls.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/sim_malloc_start.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/isatty.$(OBJEXT)
+xstormy16_libsim_a_OBJECTS = $(am_xstormy16_libsim_a_OBJECTS)
 xtensa_libgloss_a_AR = $(AR) $(ARFLAGS)
 xtensa_libgloss_a_LIBADD =
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_21 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_22 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_22 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_23 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am_xtensa_libgloss_a_OBJECTS = xtensa/xtensa_libgloss_a-sleep.$(OBJEXT) \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/xtensa_libgloss_a-syscalls.$(OBJEXT) \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/xtensa_libgloss_a-window-vectors.$(OBJEXT) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_21) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_22)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_22) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_23)
 xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS)
 xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS)
 xtensa_libsys_openocd_a_LIBADD =
@@ -922,7 +962,8 @@ xtensa_libsys_qemu_a_OBJECTS = $(am_xtensa_libsys_qemu_a_OBJECTS)
 @CONFIG_IQ2000_TRUE@am__EXEEXT_3 = iq2000/test$(EXEEXT)
 @CONFIG_MN10200_TRUE@am__EXEEXT_4 = mn10200/test$(EXEEXT)
 @CONFIG_MN10300_TRUE@am__EXEEXT_5 = mn10300/test$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
+@CONFIG_XSTORMY16_TRUE@am__EXEEXT_6 = xstormy16/eva_stub.elf$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS) $(multilibtool_PROGRAMS)
 bfin_sim_test_SOURCES = bfin/sim-test.c
 bfin_sim_test_OBJECTS = bfin/sim-test.$(OBJEXT)
 bfin_sim_test_LDADD = $(LDADD)
@@ -943,6 +984,13 @@ mn10300_test_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 @CONFIG_WINCE_TRUE@	wince_stub_exe-wince-stub.$(OBJEXT)
 wince_stub_exe_OBJECTS = $(am_wince_stub_exe_OBJECTS)
 wince_stub_exe_DEPENDENCIES =
+@CONFIG_XSTORMY16_TRUE@am_xstormy16_eva_stub_elf_OBJECTS =  \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/xstormy16_stub.$(OBJEXT) \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crt0_stub.$(OBJEXT)
+xstormy16_eva_stub_elf_OBJECTS = $(am_xstormy16_eva_stub_elf_OBJECTS)
+xstormy16_eva_stub_elf_LDADD = $(LDADD)
+xstormy16_eva_stub_elf_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(xstormy16_eva_stub_elf_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -981,6 +1029,11 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
+CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
+AM_V_CCAS = $(am__v_CCAS_@AM_V@)
+am__v_CCAS_ = $(am__v_CCAS_@AM_DEFAULT_V@)
+am__v_CCAS_0 = @echo "  CCAS    " $@;
+am__v_CCAS_1 = 
 SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_a_SOURCES) \
 	$(arm_libgloss_linux_a_SOURCES) $(arm_librdimon_v2m_a_SOURCES) \
 	$(arm_librdimon_a_SOURCES) $(arm_librdpmon_a_SOURCES) \
@@ -997,10 +1050,12 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_a_SOURCES) \
 	$(msp430_libsim_a_SOURCES) $(nds32_libgloss_a_SOURCES) \
 	$(nios2_libnios2_a_SOURCES) $(riscv_libgloss_a_SOURCES) \
 	$(riscv_libsemihost_a_SOURCES) $(riscv_libsim_a_SOURCES) \
-	$(v850_libsim_a_SOURCES) $(xtensa_libgloss_a_SOURCES) \
+	$(v850_libsim_a_SOURCES) $(xstormy16_libeva_app_a_SOURCES) \
+	$(xstormy16_libsim_a_SOURCES) $(xtensa_libgloss_a_SOURCES) \
 	$(xtensa_libsys_openocd_a_SOURCES) \
 	$(xtensa_libsys_qemu_a_SOURCES) bfin/sim-test.c iq2000/test.c \
-	mn10200/test.c mn10300/test.c $(wince_stub_exe_SOURCES)
+	mn10200/test.c mn10300/test.c $(wince_stub_exe_SOURCES) \
+	$(xstormy16_eva_stub_elf_SOURCES)
 AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
 am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
 am__v_DVIPS_0 = @echo "  DVIPS   " $@;
@@ -1105,7 +1160,7 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(am__append_76)
+CPPFLAGS = @CPPFLAGS@ $(am__append_81)
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -1213,7 +1268,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 info_TEXINFOS = $(am__append_1)
-CLEANFILES = $(am__append_4) $(am__append_10)
+CLEANFILES = $(am__append_4) $(am__append_10) $(am__append_80)
 PHONY = 
 SUBDIRS = @subdirs@ .
 srcroot = $(top_srcdir)/..
@@ -1228,8 +1283,8 @@ multilibtool_DATA = $(am__append_3) $(am__append_6) $(am__append_7) \
 	$(am__append_50) $(am__append_51) $(am__append_52) \
 	$(am__append_57) $(am__append_58) $(am__append_61) \
 	$(am__append_64) $(am__append_67) $(am__append_69) \
-	$(am__append_71) $(am__append_77) $(am__append_80) \
-	$(am__append_82) $(am__append_86)
+	$(am__append_71) $(am__append_76) $(am__append_82) \
+	$(am__append_85) $(am__append_87) $(am__append_91)
 multilibtool_LIBRARIES = $(am__append_2) $(am__append_5) \
 	$(am__append_9) $(am__append_11) $(am__append_20) \
 	$(am__append_21) $(am__append_25) $(am__append_28) \
@@ -1237,8 +1292,8 @@ multilibtool_LIBRARIES = $(am__append_2) $(am__append_5) \
 	$(am__append_39) $(am__append_45) $(am__append_48) \
 	$(am__append_54) $(am__append_55) $(am__append_60) \
 	$(am__append_63) $(am__append_66) $(am__append_68) \
-	$(am__append_70) $(am__append_73) $(am__append_79) \
-	$(am__append_81)
+	$(am__append_70) $(am__append_73) $(am__append_78) \
+	$(am__append_84) $(am__append_86)
 includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_16)
 includesystooldir = $(tooldir)/include/sys
@@ -1258,7 +1313,8 @@ libobjs_a_SOURCES = $(am__append_14) $(am__append_19) $(am__append_24) \
 	$(am__append_27) $(am__append_30) $(am__append_34) \
 	$(am__append_40) $(am__append_44) $(am__append_47) \
 	$(am__append_53) $(am__append_59) $(am__append_62) \
-	$(am__append_65) $(am__append_72) $(am__append_78)
+	$(am__append_65) $(am__append_72) $(am__append_77) \
+	$(am__append_83)
 FLAGS_TO_PASS = \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -1772,22 +1828,47 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 @CONFIG_WINCE_TRUE@wince_stub_exe_SOURCES = wince-stub.c
 @CONFIG_WINCE_TRUE@wince_stub_exe_CPPFLAGS = $(AM_CPPFLAGS) -I$(gdbdir)
 @CONFIG_WINCE_TRUE@wince_stub_exe_LDADD = -lwinsock $(WINCE_STUB_LIBS)
+@CONFIG_XSTORMY16_TRUE@xstormy16_libsim_a_SOURCES = \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/syscalls.S \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/sim_malloc_start.s \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/isatty.c
+
+@CONFIG_XSTORMY16_TRUE@xstormy16_libeva_app_a_SOURCES = \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/close.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/fstat.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/getpid.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/kill.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/lseek.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/open.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/stat.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/unlink.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/eva_app.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/isatty.c
+
+@CONFIG_XSTORMY16_TRUE@xstormy16_eva_stub_elf_SOURCES = \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/xstormy16_stub.c \
+@CONFIG_XSTORMY16_TRUE@	xstormy16/crt0_stub.s
+
+@CONFIG_XSTORMY16_TRUE@xstormy16_eva_stub_elf_LDFLAGS = \
+@CONFIG_XSTORMY16_TRUE@	$(AM_LDFLAGS) \
+@CONFIG_XSTORMY16_TRUE@	-nostartfiles -T$(srcdir)/xstormy16/eva_stub.ld
+
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libgloss_a_SOURCES = xtensa/sleep.S \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/window-vectors.S \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_83) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_87)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_88) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_92)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_CPPFLAGS = -DQEMU_SEMIHOSTING \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_84) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_88)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_89) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_93)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_qemu_a_SOURCES = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/sim-vectors.S \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/sim-call.S \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c
 
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_CPPFLAGS = -DOPENOCD_SEMIHOSTING \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_85) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_89)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_90) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_94)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c
 
@@ -1797,10 +1878,10 @@ all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .S .c .dvi .o .obj .ps
+.SUFFIXES: .S .c .dvi .o .obj .ps .s
 am--refresh: Makefile
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/frv/Makefile.inc $(srcdir)/i386/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/mcore/Makefile.inc $(srcdir)/mn10200/Makefile.inc $(srcdir)/mn10300/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/Makefile.inc $(srcdir)/nds32/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/frv/Makefile.inc $(srcdir)/i386/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/mcore/Makefile.inc $(srcdir)/mn10200/Makefile.inc $(srcdir)/mn10300/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/Makefile.inc $(srcdir)/nds32/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xstormy16/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1822,7 +1903,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
 	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
 	esac;
-$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/frv/Makefile.inc $(srcdir)/i386/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/mcore/Makefile.inc $(srcdir)/mn10200/Makefile.inc $(srcdir)/mn10300/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/Makefile.inc $(srcdir)/nds32/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__empty):
+$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/frv/Makefile.inc $(srcdir)/i386/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/mcore/Makefile.inc $(srcdir)/mn10200/Makefile.inc $(srcdir)/mn10300/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/Makefile.inc $(srcdir)/nds32/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xstormy16/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1885,8 +1966,6 @@ visium/Makefile: $(top_builddir)/config.status $(top_srcdir)/visium/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 xc16x/Makefile: $(top_builddir)/config.status $(top_srcdir)/xc16x/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-xstormy16/Makefile: $(top_builddir)/config.status $(top_srcdir)/xstormy16/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 m32c/Makefile: $(top_builddir)/config.status $(top_srcdir)/m32c/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 rl78/Makefile: $(top_builddir)/config.status $(top_srcdir)/rl78/Makefile.in
@@ -2407,6 +2486,18 @@ v850/$(DEPDIR)/$(am__dirstamp):
 	@: > v850/$(DEPDIR)/$(am__dirstamp)
 v850/crt0.$(OBJEXT): v850/$(am__dirstamp) \
 	v850/$(DEPDIR)/$(am__dirstamp)
+xstormy16/$(am__dirstamp):
+	@$(MKDIR_P) xstormy16
+	@: > xstormy16/$(am__dirstamp)
+xstormy16/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) xstormy16/$(DEPDIR)
+	@: > xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/crt0.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/crti.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/crtn.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
 xtensa/$(am__dirstamp):
 	@$(MKDIR_P) xtensa
 	@: > xtensa/$(am__dirstamp)
@@ -3037,6 +3128,40 @@ v850/libsim.a: $(v850_libsim_a_OBJECTS) $(v850_libsim_a_DEPENDENCIES) $(EXTRA_v8
 	$(AM_V_at)-rm -f v850/libsim.a
 	$(AM_V_AR)$(v850_libsim_a_AR) v850/libsim.a $(v850_libsim_a_OBJECTS) $(v850_libsim_a_LIBADD)
 	$(AM_V_at)$(RANLIB) v850/libsim.a
+xstormy16/close.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/fstat.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/getpid.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/kill.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/lseek.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/open.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/stat.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/unlink.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/eva_app.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/isatty.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+
+xstormy16/libeva_app.a: $(xstormy16_libeva_app_a_OBJECTS) $(xstormy16_libeva_app_a_DEPENDENCIES) $(EXTRA_xstormy16_libeva_app_a_DEPENDENCIES) xstormy16/$(am__dirstamp)
+	$(AM_V_at)-rm -f xstormy16/libeva_app.a
+	$(AM_V_AR)$(xstormy16_libeva_app_a_AR) xstormy16/libeva_app.a $(xstormy16_libeva_app_a_OBJECTS) $(xstormy16_libeva_app_a_LIBADD)
+	$(AM_V_at)$(RANLIB) xstormy16/libeva_app.a
+xstormy16/syscalls.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/sim_malloc_start.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+
+xstormy16/libsim.a: $(xstormy16_libsim_a_OBJECTS) $(xstormy16_libsim_a_DEPENDENCIES) $(EXTRA_xstormy16_libsim_a_DEPENDENCIES) xstormy16/$(am__dirstamp)
+	$(AM_V_at)-rm -f xstormy16/libsim.a
+	$(AM_V_AR)$(xstormy16_libsim_a_AR) xstormy16/libsim.a $(xstormy16_libsim_a_OBJECTS) $(xstormy16_libsim_a_LIBADD)
+	$(AM_V_at)$(RANLIB) xstormy16/libsim.a
 xtensa/xtensa_libgloss_a-sleep.$(OBJEXT): xtensa/$(am__dirstamp) \
 	xtensa/$(DEPDIR)/$(am__dirstamp)
 xtensa/xtensa_libgloss_a-syscalls.$(OBJEXT): xtensa/$(am__dirstamp) \
@@ -3129,6 +3254,48 @@ clean-binPROGRAMS:
 
 clean-checkPROGRAMS:
 	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+install-multilibtoolPROGRAMS: $(multilibtool_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(multilibtool_PROGRAMS)'; test -n "$(multilibtooldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(multilibtooldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(multilibtooldir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(multilibtooldir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(multilibtooldir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-multilibtoolPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(multilibtool_PROGRAMS)'; test -n "$(multilibtooldir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(multilibtooldir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(multilibtooldir)" && rm -f $$files
+
+clean-multilibtoolPROGRAMS:
+	-test -z "$(multilibtool_PROGRAMS)" || rm -f $(multilibtool_PROGRAMS)
 bfin/sim-test.$(OBJEXT): bfin/$(am__dirstamp) \
 	bfin/$(DEPDIR)/$(am__dirstamp)
 
@@ -3160,6 +3327,14 @@ wince/$(am__dirstamp):
 wince/stub.exe$(EXEEXT): $(wince_stub_exe_OBJECTS) $(wince_stub_exe_DEPENDENCIES) $(EXTRA_wince_stub_exe_DEPENDENCIES) wince/$(am__dirstamp)
 	@rm -f wince/stub.exe$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(wince_stub_exe_OBJECTS) $(wince_stub_exe_LDADD) $(LIBS)
+xstormy16/xstormy16_stub.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+xstormy16/crt0_stub.$(OBJEXT): xstormy16/$(am__dirstamp) \
+	xstormy16/$(DEPDIR)/$(am__dirstamp)
+
+xstormy16/eva_stub.elf$(EXEEXT): $(xstormy16_eva_stub_elf_OBJECTS) $(xstormy16_eva_stub_elf_DEPENDENCIES) $(EXTRA_xstormy16_eva_stub_elf_DEPENDENCIES) xstormy16/$(am__dirstamp)
+	@rm -f xstormy16/eva_stub.elf$(EXEEXT)
+	$(AM_V_CCLD)$(xstormy16_eva_stub_elf_LINK) $(xstormy16_eva_stub_elf_OBJECTS) $(xstormy16_eva_stub_elf_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -3184,6 +3359,7 @@ mostlyclean-compile:
 	-rm -f nios2/*.$(OBJEXT)
 	-rm -f riscv/*.$(OBJEXT)
 	-rm -f v850/*.$(OBJEXT)
+	-rm -f xstormy16/*.$(OBJEXT)
 	-rm -f xtensa/*.$(OBJEXT)
 	-rm -f xtensa/boards/esp32/*.$(OBJEXT)
 	-rm -f xtensa/boards/esp32s3/*.$(OBJEXT)
@@ -3604,6 +3780,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/utime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/wait.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/close.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/eva_app.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/fstat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/getpid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/isatty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/lseek.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/open.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/stat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/syscalls.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/unlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@xstormy16/$(DEPDIR)/xstormy16_stub.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/crt0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/crt1-boards.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@xtensa/$(DEPDIR)/crt1-sim.Po@am__quote@
@@ -5958,6 +6146,12 @@ wince_stub_exe-wince-stub.obj: wince-stub.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='wince-stub.c' object='wince_stub_exe-wince-stub.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wince_stub_exe_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wince_stub_exe-wince-stub.obj `if test -f 'wince-stub.c'; then $(CYGPATH_W) 'wince-stub.c'; else $(CYGPATH_W) '$(srcdir)/wince-stub.c'; fi`
+
+.s.o:
+	$(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ $<
+
+.s.obj:
+	$(AM_V_CCAS)$(CCASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 doc/$(am__dirstamp):
 	@$(MKDIR_P) doc
 	@: > doc/$(am__dirstamp)
@@ -6337,7 +6531,7 @@ all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(PROGRAMS) $(DATA) \
 		config.h all-local
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(aarch64_cpu_initcpuinitdir)" "$(DESTDIR)$(arm_cpu_initcpuinitdir)" "$(DESTDIR)$(includemachinetooldir)" "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)"; do \
+	for dir in "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(aarch64_cpu_initcpuinitdir)" "$(DESTDIR)$(arm_cpu_initcpuinitdir)" "$(DESTDIR)$(includemachinetooldir)" "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -6411,6 +6605,8 @@ distclean-generic:
 	-rm -f v850/$(DEPDIR)/$(am__dirstamp)
 	-rm -f v850/$(am__dirstamp)
 	-rm -f wince/$(am__dirstamp)
+	-rm -f xstormy16/$(DEPDIR)/$(am__dirstamp)
+	-rm -f xstormy16/$(am__dirstamp)
 	-rm -f xtensa/$(DEPDIR)/$(am__dirstamp)
 	-rm -f xtensa/$(am__dirstamp)
 	-rm -f xtensa/boards/esp32/$(DEPDIR)/$(am__dirstamp)
@@ -6426,11 +6622,12 @@ clean: clean-recursive
 
 clean-am: clean-aminfo clean-binPROGRAMS clean-checkPROGRAMS \
 	clean-generic clean-local clean-multilibtoolLIBRARIES \
-	clean-noinstLIBRARIES mostlyclean-am
+	clean-multilibtoolPROGRAMS clean-noinstLIBRARIES \
+	mostlyclean-am
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) frv/$(DEPDIR) i386/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) mcore/$(DEPDIR) mn10200/$(DEPDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nds32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) frv/$(DEPDIR) i386/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) mcore/$(DEPDIR) mn10200/$(DEPDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nds32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xstormy16/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-local distclean-tags
@@ -6451,7 +6648,7 @@ install-data-am: install-aarch64_cpu_initcpuinitDATA \
 	install-arm_cpu_initcpuinitDATA install-includemachinetoolDATA \
 	install-includesystoolDATA install-includetoolDATA \
 	install-info-am install-multilibtoolDATA \
-	install-multilibtoolLIBRARIES
+	install-multilibtoolLIBRARIES install-multilibtoolPROGRAMS
 
 install-dvi: install-dvi-recursive
 
@@ -6573,7 +6770,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) frv/$(DEPDIR) i386/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) mcore/$(DEPDIR) mn10200/$(DEPDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nds32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) frv/$(DEPDIR) i386/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) mcore/$(DEPDIR) mn10200/$(DEPDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nds32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xstormy16/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-local
@@ -6597,7 +6794,8 @@ uninstall-am: uninstall-aarch64_cpu_initcpuinitDATA \
 	uninstall-includemachinetoolDATA uninstall-includesystoolDATA \
 	uninstall-includetoolDATA uninstall-info-am \
 	uninstall-multilibtoolDATA uninstall-multilibtoolLIBRARIES \
-	uninstall-pdf-am uninstall-ps-am
+	uninstall-multilibtoolPROGRAMS uninstall-pdf-am \
+	uninstall-ps-am
 
 .MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
@@ -6605,10 +6803,11 @@ uninstall-am: uninstall-aarch64_cpu_initcpuinitDATA \
 	am--refresh check check-am clean clean-aminfo \
 	clean-binPROGRAMS clean-checkPROGRAMS clean-cscope \
 	clean-generic clean-local clean-multilibtoolLIBRARIES \
-	clean-noinstLIBRARIES cscope cscopelist-am ctags ctags-am \
-	dist-info distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-local distclean-tags dvi dvi-am html \
-	html-am html-local info info-am install \
+	clean-multilibtoolPROGRAMS clean-noinstLIBRARIES cscope \
+	cscopelist-am ctags ctags-am dist-info distclean \
+	distclean-compile distclean-generic distclean-hdr \
+	distclean-local distclean-tags dvi dvi-am html html-am \
+	html-local info info-am install \
 	install-aarch64_cpu_initcpuinitDATA install-am \
 	install-arm_cpu_initcpuinitDATA install-binPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -6617,19 +6816,21 @@ uninstall-am: uninstall-aarch64_cpu_initcpuinitDATA \
 	install-includesystoolDATA install-includetoolDATA \
 	install-info install-info-am install-man \
 	install-multilibtoolDATA install-multilibtoolLIBRARIES \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-local mostlyclean \
-	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \
-	mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \
+	install-multilibtoolPROGRAMS install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-aminfo maintainer-clean-generic \
+	maintainer-clean-local mostlyclean mostlyclean-aminfo \
+	mostlyclean-compile mostlyclean-generic mostlyclean-local pdf \
+	pdf-am ps ps-am tags tags-am uninstall \
 	uninstall-aarch64_cpu_initcpuinitDATA uninstall-am \
 	uninstall-arm_cpu_initcpuinitDATA uninstall-binPROGRAMS \
 	uninstall-dvi-am uninstall-html-am \
 	uninstall-includemachinetoolDATA uninstall-includesystoolDATA \
 	uninstall-includetoolDATA uninstall-info-am \
 	uninstall-multilibtoolDATA uninstall-multilibtoolLIBRARIES \
-	uninstall-pdf-am uninstall-ps-am
+	uninstall-multilibtoolPROGRAMS uninstall-pdf-am \
+	uninstall-ps-am
 
 .PRECIOUS: Makefile
 
@@ -6743,6 +6944,8 @@ maintainer-clean-local: maintainer-clean-multi
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@	$(AM_V_GEN)cp $< $@
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@mcore/cmb.specs: mcore/pe-cmb.specs
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@	$(AM_V_GEN)cp $< $@
+@CONFIG_XSTORMY16_TRUE@xstormy16/eva_stub.hex: xstormy16/eva_stub.elf
+@CONFIG_XSTORMY16_TRUE@	$(AM_V_GEN)$(OBJCOPY) -O ihex $< $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libgloss/configure b/libgloss/configure
index 193b54903..c96473d73 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -646,6 +646,8 @@ CFLAGS
 CC
 CONFIG_XTENSA_FALSE
 CONFIG_XTENSA_TRUE
+CONFIG_XSTORMY16_FALSE
+CONFIG_XSTORMY16_TRUE
 CONFIG_WINCE_FALSE
 CONFIG_WINCE_TRUE
 CONFIG_V850_FALSE
@@ -2938,9 +2940,7 @@ case "${target}" in
 	target_makefile_frag=${srcdir}/config/xc16x.mt
 	;;
   xstormy16-*-*)
-	ac_config_files="$ac_config_files xstormy16/Makefile"
-
-	subdirs="$subdirs xstormy16"
+	config_xstormy16=true
 	;;
   xtensa-*-*)
 	config_xtensa=true
@@ -3176,6 +3176,14 @@ else
   CONFIG_WINCE_FALSE=
 fi
 
+   if test x$config_xstormy16 = xtrue; then
+  CONFIG_XSTORMY16_TRUE=
+  CONFIG_XSTORMY16_FALSE='#'
+else
+  CONFIG_XSTORMY16_TRUE='#'
+  CONFIG_XSTORMY16_FALSE=
+fi
+
    if test x$config_xtensa = xtrue; then
   CONFIG_XTENSA_TRUE=
   CONFIG_XTENSA_FALSE='#'
@@ -5739,6 +5747,10 @@ if test -z "${CONFIG_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_XSTORMY16_TRUE}" && test -z "${CONFIG_XSTORMY16_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_XSTORMY16\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_XTENSA_TRUE}" && test -z "${CONFIG_XTENSA_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_XTENSA\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6410,7 +6422,6 @@ do
     "mt/Makefile") CONFIG_FILES="$CONFIG_FILES mt/Makefile" ;;
     "visium/Makefile") CONFIG_FILES="$CONFIG_FILES visium/Makefile" ;;
     "xc16x/Makefile") CONFIG_FILES="$CONFIG_FILES xc16x/Makefile" ;;
-    "xstormy16/Makefile") CONFIG_FILES="$CONFIG_FILES xstormy16/Makefile" ;;
     "m32c/Makefile") CONFIG_FILES="$CONFIG_FILES m32c/Makefile" ;;
     "rl78/Makefile") CONFIG_FILES="$CONFIG_FILES rl78/Makefile" ;;
     "rx/Makefile") CONFIG_FILES="$CONFIG_FILES rx/Makefile" ;;
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index d56d8950e..d0770a421 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -181,8 +181,7 @@ case "${target}" in
 	target_makefile_frag=${srcdir}/config/xc16x.mt
 	;;
   xstormy16-*-*)
-	AC_CONFIG_FILES([xstormy16/Makefile])
-	subdirs="$subdirs xstormy16"
+	config_xstormy16=true
 	;;
   xtensa-*-*)
 	config_xtensa=true
@@ -240,7 +239,7 @@ dnl the ports above will too!
 m4_foreach_w([SUBDIR], [
   aarch64 arc arm bfin csky d30v frv i386 i960 iq2000 libnosys lm32
   mcore mn10200 mn10300 moxie msp430
-  nds32 nios2 riscv v850 wince xtensa
+  nds32 nios2 riscv v850 wince xstormy16 xtensa
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])
diff --git a/libgloss/xstormy16/Makefile.in b/libgloss/xstormy16/Makefile.in
deleted file mode 100644
index 49d8a8dea..000000000
--- a/libgloss/xstormy16/Makefile.in
+++ /dev/null
@@ -1,131 +0,0 @@
-#
-#
-
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-
-SHELL =	/bin/sh
-
-mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-# Yuk.
-OBJCOPY = $(subst ranlib,objcopy,$(RANLIB))
-
-OBJS		= isatty.o
-CFLAGS		= -g -O2
-ASFLAGS		= --gdwarf2
-SCRIPTS		= 
-CRT		= crt0.o crti.o crtn.o
-
-# Here is all of the simulator stuff
-SIM_SCRIPTS	= sim_high.ld sim_rom.ld
-SIM_LDFLAGS	=
-SIM_BSP		= libsim.a
-SIM_OBJS	= syscalls.o sim_malloc_start.o
-
-# Here is stuff for building apps for GDB on the EVA board
-EVA_APP_BSP     = libeva_app.a
-EVA_APP_OBJS    = close.o fstat.o getpid.o kill.o lseek.o open.o \
-                  stat.o unlink.o eva_app.o
-EVA_APP_SCRIPTS = eva_app.ld
-
-# Stub stuff
-EVA_STUB_HEX    = eva_stub.hex
-EVA_STUB        = eva_stub.elf
-EVA_STUB_OBJS   = xstormy16_stub.o crt0_stub.o
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-#
-# build a test program for each target board. Just trying to get
-# it to link is a good test, so we ignore all the errors for now.
-#
-# all: ${MON_CRT0} ${MON_BSP}
-all: ${CRT} ${SIM_BSP} ${EVA_APP_BSP} ${EVA_STUB_HEX}
-
-#
-# here's where we build the board support packages for each target
-#
-${SIM_BSP}: ${OBJS} ${SIM_OBJS}
-	${AR} ${ARFLAGS} ${SIM_BSP} ${SIM_OBJS} ${OBJS}
-	${RANLIB} ${SIM_BSP}
-
-${EVA_APP_BSP}: ${OBJS} ${EVA_APP_OBJS}
-	${AR} ${ARFLAGS} ${EVA_APP_BSP} ${EVA_APP_OBJS} ${OBJS}
-	${RANLIB} ${EVA_APP_BSP}
-
-${EVA_STUB_HEX}: ${EVA_STUB}
-	${OBJCOPY} -O ihex $< $@
-
-${EVA_STUB}: ${EVA_STUB_OBJS} ${srcdir}/eva_stub.ld
-	${CC} -g -Os -nostartfiles -T${srcdir}/eva_stub.ld ${EVA_STUB_OBJS} -o $@
-
-
-#
-# here's where we build the test programs for each target
-#
-.PHONY: test
-test:	
-	true
-
-#
-#
-#
-.c.S:
-	${CC} ${CFLAGS_FOR_TARGET} -c $<
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x *.hex $(SIM_BSP) $(EVA_APP_BSP) $(EVA_STUB) 
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile *~
-
-.PHONY: install info install-info clean-info
-install: 
-	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
-	set -e; for x in ${SIM_BSP} ${CRT} ${EVA_APP_BSP} ${EVA_STUB_HEX} ${EVA_STUB} ; do\
-	  ${INSTALL_DATA} $$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; \
-	done
-	@for script in ${SCRIPTS} ${SIM_SCRIPTS} ${EVA_APP_SCRIPTS}; do\
-	  ${INSTALL_DATA} ${srcdir}/$${script} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$${script}; \
-	done
-
-
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status
diff --git a/libgloss/xstormy16/Makefile.inc b/libgloss/xstormy16/Makefile.inc
new file mode 100644
index 000000000..346fee379
--- /dev/null
+++ b/libgloss/xstormy16/Makefile.inc
@@ -0,0 +1,48 @@
+multilibtool_DATA += \
+	%D%/crt0.o \
+	%D%/crti.o \
+	%D%/crtn.o
+libobjs_a_SOURCES += \
+	%D%/crt0.s \
+	%D%/crti.s \
+	%D%/crtn.s
+
+## Here is all of the simulator stuff
+multilibtool_DATA += \
+	%D%/sim_high.ld \
+	%D%/sim_rom.ld
+multilibtool_LIBRARIES += %D%/libsim.a
+%C%_libsim_a_SOURCES = \
+	%D%/syscalls.S \
+	%D%/sim_malloc_start.s \
+	%D%/isatty.c
+
+## Here is stuff for building apps for GDB on the EVA board
+multilibtool_DATA += %D%/eva_app.ld
+multilibtool_LIBRARIES += %D%/libeva_app.a
+%C%_libeva_app_a_SOURCES = \
+	%D%/close.c \
+	%D%/fstat.c \
+	%D%/getpid.c \
+	%D%/kill.c \
+	%D%/lseek.c \
+	%D%/open.c \
+	%D%/stat.c \
+	%D%/unlink.c \
+	%D%/eva_app.c \
+	%D%/isatty.c
+
+## Stub stuff
+multilibtool_PROGRAMS += %D%/eva_stub.elf
+%C%_eva_stub_elf_SOURCES = \
+	%D%/xstormy16_stub.c \
+	%D%/crt0_stub.s
+%C%_eva_stub_elf_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-nostartfiles -T$(srcdir)/%D%/eva_stub.ld
+
+multilibtool_DATA += \
+	%D%/eva_stub.hex
+%D%/eva_stub.hex: %D%/eva_stub.elf
+	$(AM_V_GEN)$(OBJCOPY) -O ihex $< $@
+CLEANFILES += %D%/eva_stub.hex
-- 
cgit v1.2.3