libgloss: merge moxie into top-level Makefile

Avoid a recursive make to speed things up a bit.
A moxie-elf build shows installed objects & libs produce same code.

7 files changed, 306 insertions, 239 deletions

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 0d4460b58..b6f12735c 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -90,6 +90,9 @@ endif
 if CONFIG_LM32
 include lm32/Makefile.inc
 endif
+if CONFIG_MOXIE
+include moxie/Makefile.inc
+endif
 if CONFIG_NIOS2
 include nios2/Makefile.inc
 endif
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index fd845cf5f..867211704 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -176,22 +176,33 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 @CONFIG_LM32_TRUE@am__append_29 = lm32/crt0.o lm32/sim.ld
 @CONFIG_LM32_TRUE@am__append_30 = lm32/libgloss.a
 @CONFIG_LM32_TRUE@am__append_31 = lm32/crt0.S
-@CONFIG_NIOS2_TRUE@am__append_32 = \
+@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_32 = \
+@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@	moxie/moxie-elf-common.ld \
+@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@	moxie/qemu.ld \
+@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@	moxie/sim.ld \
+@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@	moxie/moxiebox.ld
+
+@CONFIG_MOXIE_TRUE@@MOXIE_BUILD_CRT0_TRUE@am__append_33 = moxie/crt0.o
+@CONFIG_MOXIE_TRUE@am__append_34 = \
+@CONFIG_MOXIE_TRUE@	moxie/crt0.S
+
+@CONFIG_MOXIE_TRUE@am__append_35 = moxie/libsim.a moxie/libqemu.a
+@CONFIG_NIOS2_TRUE@am__append_36 = \
 @CONFIG_NIOS2_TRUE@	nios2/qemu-hosted.ld
 
-@CONFIG_NIOS2_TRUE@am__append_33 = nios2/libnios2.a
-@CONFIG_RISCV_TRUE@am__append_34 = \
+@CONFIG_NIOS2_TRUE@am__append_37 = nios2/libnios2.a
+@CONFIG_RISCV_TRUE@am__append_38 = \
 @CONFIG_RISCV_TRUE@	riscv/nano.specs \
 @CONFIG_RISCV_TRUE@	riscv/sim.specs \
 @CONFIG_RISCV_TRUE@	riscv/semihost.specs \
 @CONFIG_RISCV_TRUE@	riscv/crt0.o
 
-@CONFIG_RISCV_TRUE@am__append_35 = riscv/libgloss.a riscv/libsim.a \
+@CONFIG_RISCV_TRUE@am__append_39 = riscv/libgloss.a riscv/libsim.a \
 @CONFIG_RISCV_TRUE@	riscv/libsemihost.a
-@CONFIG_WINCE_TRUE@am__append_36 = $(gdbdir)
-@CONFIG_WINCE_TRUE@am__append_37 = wince/stub.exe
-@CONFIG_XTENSA_TRUE@am__append_38 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
-@CONFIG_XTENSA_TRUE@am__append_39 = \
+@CONFIG_WINCE_TRUE@am__append_40 = $(gdbdir)
+@CONFIG_WINCE_TRUE@am__append_41 = wince/stub.exe
+@CONFIG_XTENSA_TRUE@am__append_42 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
+@CONFIG_XTENSA_TRUE@am__append_43 = \
 @CONFIG_XTENSA_TRUE@	xtensa/default.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/nano.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/sim.elf.specs \
@@ -200,27 +211,27 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 @CONFIG_XTENSA_TRUE@	xtensa/sys.openocd.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/crt0.o
 
-@CONFIG_XTENSA_TRUE@am__append_40 = \
+@CONFIG_XTENSA_TRUE@am__append_44 = \
 @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_41 = xtensa/libgloss.a
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_42 = \
+@CONFIG_XTENSA_TRUE@am__append_45 = xtensa/libgloss.a
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_46 = \
 @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_43 = xtensa/libsys_qemu.a \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_47 = 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_44 = xtensa/boards/esp32/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_45 = xtensa/boards/esp32/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_46 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_47 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_48 = xtensa/boards/esp32s3/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_49 = xtensa/boards/esp32s3/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_50 = -I$(srcdir)/xtensa/boards/esp32s3/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_51 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_48 = xtensa/boards/esp32/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_49 = xtensa/boards/esp32/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_50 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_51 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_52 = xtensa/boards/esp32s3/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_53 = xtensa/boards/esp32s3/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_54 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_55 = -I$(srcdir)/xtensa/boards/esp32s3/include
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -251,10 +262,10 @@ CONFIG_CLEAN_FILES = epiphany/Makefile i386/Makefile m32r/Makefile \
 	rs6000/Makefile mn10200/Makefile mn10300/Makefile \
 	cr16/Makefile cris/Makefile crx/Makefile fr30/Makefile \
 	frv/Makefile ft32/Makefile mcore/Makefile mep/Makefile \
-	moxie/Makefile microblaze/Makefile mt/Makefile v850/Makefile \
-	visium/Makefile xc16x/Makefile xstormy16/Makefile \
-	m32c/Makefile msp430/Makefile rl78/Makefile rx/Makefile \
-	spu/Makefile tic6x/Makefile or1k/Makefile pru/Makefile \
+	microblaze/Makefile mt/Makefile v850/Makefile visium/Makefile \
+	xc16x/Makefile xstormy16/Makefile m32c/Makefile \
+	msp430/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'`;
@@ -453,17 +464,51 @@ libobjs_a_LIBADD =
 @CONFIG_CSKY_TRUE@am__objects_4 = csky/crt0.$(OBJEXT)
 @CONFIG_IQ2000_TRUE@am__objects_5 = iq2000/crt0.$(OBJEXT)
 @CONFIG_LM32_TRUE@am__objects_6 = lm32/crt0.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@am__objects_7 = xtensa/crt0.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@am__objects_7 = moxie/crt0.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@am__objects_8 = 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) \
-	$(am__objects_5) $(am__objects_6) $(am__objects_7)
+	$(am__objects_5) $(am__objects_6) $(am__objects_7) \
+	$(am__objects_8)
 libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS)
 lm32_libgloss_a_AR = $(AR) $(ARFLAGS)
 lm32_libgloss_a_LIBADD =
 @CONFIG_LM32_TRUE@am_lm32_libgloss_a_OBJECTS = lm32/isatty.$(OBJEXT) \
 @CONFIG_LM32_TRUE@	lm32/scall.$(OBJEXT)
 lm32_libgloss_a_OBJECTS = $(am_lm32_libgloss_a_OBJECTS)
+moxie_libqemu_a_AR = $(AR) $(ARFLAGS)
+moxie_libqemu_a_LIBADD =
+@CONFIG_MOXIE_TRUE@am_moxie_libqemu_a_OBJECTS =  \
+@CONFIG_MOXIE_TRUE@	moxie/qemu-write.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/qemu-time.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-exit.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sbrk.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-close.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/fstat.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/getpid.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/isatty.$(OBJEXT) moxie/kill.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/putnum.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-lseek.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-read.$(OBJEXT)
+moxie_libqemu_a_OBJECTS = $(am_moxie_libqemu_a_OBJECTS)
+moxie_libsim_a_AR = $(AR) $(ARFLAGS)
+moxie_libsim_a_LIBADD =
+@CONFIG_MOXIE_TRUE@am_moxie_libsim_a_OBJECTS = moxie/fstat.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/getpid.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/isatty.$(OBJEXT) moxie/kill.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/putnum.$(OBJEXT) moxie/sbrk.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-close.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-exit.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-inbyte.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-lseek.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-open.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-read.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-time.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-unlink.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/sim-write.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@	moxie/stat.$(OBJEXT)
+moxie_libsim_a_OBJECTS = $(am_moxie_libsim_a_OBJECTS)
 nios2_libnios2_a_AR = $(AR) $(ARFLAGS)
 nios2_libnios2_a_LIBADD =
 @CONFIG_NIOS2_TRUE@am_nios2_libnios2_a_OBJECTS =  \
@@ -554,7 +599,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_8 =  \
+@CONFIG_RISCV_TRUE@am__objects_9 =  \
 @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) \
@@ -587,17 +632,17 @@ 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_8)
+@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_9)
 riscv_libsim_a_OBJECTS = $(am_riscv_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_9 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_10 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_10 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_11 = 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_9) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_10)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_10) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_11)
 xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS)
 xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS)
 xtensa_libsys_openocd_a_LIBADD =
@@ -669,6 +714,7 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_a_SOURCES) \
 	$(csky_libsemi_a_SOURCES) $(d30v_libsim_a_SOURCES) \
 	$(iq2000_libeval_a_SOURCES) $(libnosys_libnosys_a_SOURCES) \
 	$(libobjs_a_SOURCES) $(lm32_libgloss_a_SOURCES) \
+	$(moxie_libqemu_a_SOURCES) $(moxie_libsim_a_SOURCES) \
 	$(nios2_libnios2_a_SOURCES) $(riscv_libgloss_a_SOURCES) \
 	$(riscv_libsemihost_a_SOURCES) $(riscv_libsim_a_SOURCES) \
 	$(xtensa_libgloss_a_SOURCES) \
@@ -761,7 +807,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-VPATH = @srcdir@ $(am__append_36)
+VPATH = @srcdir@ $(am__append_40)
 AARCH64_OBJTYPE = @AARCH64_OBJTYPE@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -779,7 +825,7 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(am__append_38)
+CPPFLAGS = @CPPFLAGS@ $(am__append_42)
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -810,8 +856,6 @@ MIPS_SCRIPT_LIST = @MIPS_SCRIPT_LIST@
 MKDIR_P = @MKDIR_P@
 MN10300_BSP_LIST = @MN10300_BSP_LIST@
 MN10300_SCRIPT_LIST = @MN10300_SCRIPT_LIST@
-MOXIE_BUILD_CRT0_FALSE = @MOXIE_BUILD_CRT0_FALSE@
-MOXIE_BUILD_CRT0_TRUE = @MOXIE_BUILD_CRT0_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -900,13 +944,14 @@ multilibtool_DATA = $(am__append_3) $(am__append_6) $(am__append_7) \
 	$(am__append_8) $(am__append_13) $(am__append_15) \
 	$(am__append_18) $(am__append_22) $(am__append_23) \
 	$(am__append_27) $(am__append_29) $(am__append_32) \
-	$(am__append_34) $(am__append_39) $(am__append_42) \
-	$(am__append_44) $(am__append_48)
+	$(am__append_33) $(am__append_36) $(am__append_38) \
+	$(am__append_43) $(am__append_46) $(am__append_48) \
+	$(am__append_52)
 multilibtool_LIBRARIES = $(am__append_2) $(am__append_5) \
 	$(am__append_9) $(am__append_11) $(am__append_20) \
 	$(am__append_21) $(am__append_24) $(am__append_28) \
-	$(am__append_30) $(am__append_33) $(am__append_35) \
-	$(am__append_41) $(am__append_43)
+	$(am__append_30) $(am__append_35) $(am__append_37) \
+	$(am__append_39) $(am__append_45) $(am__append_47)
 includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_16)
 includesystooldir = $(tooldir)/include/sys
@@ -917,7 +962,7 @@ AM_CPPFLAGS = -idirafter $(srcroot)/include
 # to install (e.g. our crt0.o objects).
 noinst_LIBRARIES = libobjs.a
 libobjs_a_SOURCES = $(am__append_14) $(am__append_19) $(am__append_25) \
-	$(am__append_31) $(am__append_40)
+	$(am__append_31) $(am__append_34) $(am__append_44)
 FLAGS_TO_PASS = \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -1102,6 +1147,38 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 @CONFIG_LM32_TRUE@	lm32/isatty.c \
 @CONFIG_LM32_TRUE@	lm32/scall.S
 
+@CONFIG_MOXIE_TRUE@moxie_libsim_a_SOURCES = \
+@CONFIG_MOXIE_TRUE@	moxie/fstat.c \
+@CONFIG_MOXIE_TRUE@	moxie/getpid.c \
+@CONFIG_MOXIE_TRUE@	moxie/isatty.c \
+@CONFIG_MOXIE_TRUE@	moxie/kill.c \
+@CONFIG_MOXIE_TRUE@	moxie/putnum.c \
+@CONFIG_MOXIE_TRUE@	moxie/sbrk.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-close.S \
+@CONFIG_MOXIE_TRUE@	moxie/sim-exit.S \
+@CONFIG_MOXIE_TRUE@	moxie/sim-inbyte.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-lseek.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-open.S \
+@CONFIG_MOXIE_TRUE@	moxie/sim-read.S \
+@CONFIG_MOXIE_TRUE@	moxie/sim-time.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-unlink.S \
+@CONFIG_MOXIE_TRUE@	moxie/sim-write.S \
+@CONFIG_MOXIE_TRUE@	moxie/stat.c
+
+@CONFIG_MOXIE_TRUE@moxie_libqemu_a_SOURCES = \
+@CONFIG_MOXIE_TRUE@	moxie/qemu-write.c \
+@CONFIG_MOXIE_TRUE@	moxie/qemu-time.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-exit.S \
+@CONFIG_MOXIE_TRUE@	moxie/sbrk.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-close.S \
+@CONFIG_MOXIE_TRUE@	moxie/fstat.c \
+@CONFIG_MOXIE_TRUE@	moxie/getpid.c \
+@CONFIG_MOXIE_TRUE@	moxie/isatty.c \
+@CONFIG_MOXIE_TRUE@	moxie/kill.c \
+@CONFIG_MOXIE_TRUE@	moxie/putnum.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-lseek.c \
+@CONFIG_MOXIE_TRUE@	moxie/sim-read.S
+
 @CONFIG_NIOS2_TRUE@nios2_libnios2_a_SOURCES = \
 @CONFIG_NIOS2_TRUE@	nios2/crt0.S \
 @CONFIG_NIOS2_TRUE@	nios2/io-close.c \
@@ -1203,19 +1280,19 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 @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_45) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_49)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_49) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_53)
 @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_46) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_50)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_50) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_54)
 @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_47) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_51)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_51) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_55)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c
 
@@ -1228,7 +1305,7 @@ all: config.h
 .SUFFIXES: .S .c .dvi .o .obj .ps
 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)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/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)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1250,7 +1327,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)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/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)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1319,8 +1396,6 @@ mcore/Makefile: $(top_builddir)/config.status $(top_srcdir)/mcore/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 mep/Makefile: $(top_builddir)/config.status $(top_srcdir)/mep/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-moxie/Makefile: $(top_builddir)/config.status $(top_srcdir)/moxie/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 microblaze/Makefile: $(top_builddir)/config.status $(top_srcdir)/microblaze/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 mt/Makefile: $(top_builddir)/config.status $(top_srcdir)/mt/Makefile.in
@@ -1713,6 +1788,14 @@ lm32/$(DEPDIR)/$(am__dirstamp):
 	@: > lm32/$(DEPDIR)/$(am__dirstamp)
 lm32/crt0.$(OBJEXT): lm32/$(am__dirstamp) \
 	lm32/$(DEPDIR)/$(am__dirstamp)
+moxie/$(am__dirstamp):
+	@$(MKDIR_P) moxie
+	@: > moxie/$(am__dirstamp)
+moxie/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) moxie/$(DEPDIR)
+	@: > moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/crt0.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
 xtensa/$(am__dirstamp):
 	@$(MKDIR_P) xtensa
 	@: > xtensa/$(am__dirstamp)
@@ -1739,6 +1822,52 @@ lm32/libgloss.a: $(lm32_libgloss_a_OBJECTS) $(lm32_libgloss_a_DEPENDENCIES) $(EX
 	$(AM_V_at)-rm -f lm32/libgloss.a
 	$(AM_V_AR)$(lm32_libgloss_a_AR) lm32/libgloss.a $(lm32_libgloss_a_OBJECTS) $(lm32_libgloss_a_LIBADD)
 	$(AM_V_at)$(RANLIB) lm32/libgloss.a
+moxie/qemu-write.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/qemu-time.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-exit.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sbrk.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-close.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/fstat.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/getpid.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/isatty.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/kill.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/putnum.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-lseek.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-read.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+
+moxie/libqemu.a: $(moxie_libqemu_a_OBJECTS) $(moxie_libqemu_a_DEPENDENCIES) $(EXTRA_moxie_libqemu_a_DEPENDENCIES) moxie/$(am__dirstamp)
+	$(AM_V_at)-rm -f moxie/libqemu.a
+	$(AM_V_AR)$(moxie_libqemu_a_AR) moxie/libqemu.a $(moxie_libqemu_a_OBJECTS) $(moxie_libqemu_a_LIBADD)
+	$(AM_V_at)$(RANLIB) moxie/libqemu.a
+moxie/sim-inbyte.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-open.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-time.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-unlink.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/sim-write.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+moxie/stat.$(OBJEXT): moxie/$(am__dirstamp) \
+	moxie/$(DEPDIR)/$(am__dirstamp)
+
+moxie/libsim.a: $(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_DEPENDENCIES) $(EXTRA_moxie_libsim_a_DEPENDENCIES) moxie/$(am__dirstamp)
+	$(AM_V_at)-rm -f moxie/libsim.a
+	$(AM_V_AR)$(moxie_libsim_a_AR) moxie/libsim.a $(moxie_libsim_a_OBJECTS) $(moxie_libsim_a_LIBADD)
+	$(AM_V_at)$(RANLIB) moxie/libsim.a
 nios2/$(am__dirstamp):
 	@$(MKDIR_P) nios2
 	@: > nios2/$(am__dirstamp)
@@ -2114,6 +2243,7 @@ mostlyclean-compile:
 	-rm -f iq2000/*.$(OBJEXT)
 	-rm -f libnosys/*.$(OBJEXT)
 	-rm -f lm32/*.$(OBJEXT)
+	-rm -f moxie/*.$(OBJEXT)
 	-rm -f nios2/*.$(OBJEXT)
 	-rm -f riscv/*.$(OBJEXT)
 	-rm -f xtensa/*.$(OBJEXT)
@@ -2241,6 +2371,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@lm32/$(DEPDIR)/crt0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lm32/$(DEPDIR)/isatty.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@lm32/$(DEPDIR)/scall.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/crt0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/fstat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/getpid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/isatty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/putnum.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/qemu-time.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/qemu-write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sbrk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-close.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-exit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-inbyte.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-lseek.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-open.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-read.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-time.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-unlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/sim-write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@moxie/$(DEPDIR)/stat.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nios2/$(DEPDIR)/nios2_libnios2_a-crt0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nios2/$(DEPDIR)/nios2_libnios2_a-getpid.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@nios2/$(DEPDIR)/nios2_libnios2_a-io-close.Po@am__quote@
@@ -5105,6 +5254,8 @@ distclean-generic:
 	-rm -f libnosys/$(am__dirstamp)
 	-rm -f lm32/$(DEPDIR)/$(am__dirstamp)
 	-rm -f lm32/$(am__dirstamp)
+	-rm -f moxie/$(DEPDIR)/$(am__dirstamp)
+	-rm -f moxie/$(am__dirstamp)
 	-rm -f nios2/$(DEPDIR)/$(am__dirstamp)
 	-rm -f nios2/$(am__dirstamp)
 	-rm -f riscv/$(DEPDIR)/$(am__dirstamp)
@@ -5129,7 +5280,7 @@ clean-am: clean-aminfo clean-binPROGRAMS clean-checkPROGRAMS \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(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) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) nios2/$(DEPDIR) riscv/$(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
@@ -5272,7 +5423,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) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(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) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) nios2/$(DEPDIR) riscv/$(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
diff --git a/libgloss/configure b/libgloss/configure
index 5f6bc5841..782ae9a2f 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -647,6 +647,8 @@ CONFIG_RISCV_FALSE
 CONFIG_RISCV_TRUE
 CONFIG_NIOS2_FALSE
 CONFIG_NIOS2_TRUE
+CONFIG_MOXIE_FALSE
+CONFIG_MOXIE_TRUE
 CONFIG_LM32_FALSE
 CONFIG_LM32_TRUE
 CONFIG_LIBNOSYS_FALSE
@@ -2901,9 +2903,7 @@ case "${target}" in
 	subdirs="$subdirs mep"
 	;;
   moxie-*-*)
-	ac_config_files="$ac_config_files moxie/Makefile"
-
-	subdirs="$subdirs moxie"
+	config_moxie=true
 	;;
   microblaze*-*-*)
 	ac_config_files="$ac_config_files microblaze/Makefile"
@@ -3069,6 +3069,14 @@ else
   CONFIG_LM32_FALSE=
 fi
 
+   if test x$config_moxie = xtrue; then
+  CONFIG_MOXIE_TRUE=
+  CONFIG_MOXIE_FALSE='#'
+else
+  CONFIG_MOXIE_TRUE='#'
+  CONFIG_MOXIE_FALSE=
+fi
+
    if test x$config_nios2 = xtrue; then
   CONFIG_NIOS2_TRUE=
   CONFIG_NIOS2_FALSE='#'
@@ -5097,17 +5105,19 @@ esac
 
 
 
-case "${target}" in
-  moxie-*-moxiebox*)
-    MOXIE_BUILD_CRT0_TRUE='#'
-    MOXIE_BUILD_CRT0_FALSE=
-    ;;
-  *)
-    MOXIE_BUILD_CRT0_TRUE=
-    MOXIE_BUILD_CRT0_FALSE='#'
-    ;;
+case ${target} in #(
+  moxie-*-moxiebox*) :
+    MOXIE_BUILD_CRT0=false ;; #(
+  *) :
+    MOXIE_BUILD_CRT0=true ;;
 esac
-
+ if $MOXIE_BUILD_CRT0; then
+  MOXIE_BUILD_CRT0_TRUE=
+  MOXIE_BUILD_CRT0_FALSE='#'
+else
+  MOXIE_BUILD_CRT0_TRUE='#'
+  MOXIE_BUILD_CRT0_FALSE=
+fi
 
 
 SPARC_CPU=SPARC
@@ -5402,6 +5412,10 @@ if test -z "${CONFIG_LM32_TRUE}" && test -z "${CONFIG_LM32_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_LM32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_MOXIE_TRUE}" && test -z "${CONFIG_MOXIE_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_MOXIE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_NIOS2_TRUE}" && test -z "${CONFIG_NIOS2_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_NIOS2\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5430,6 +5444,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MOXIE_BUILD_CRT0_TRUE}" && test -z "${MOXIE_BUILD_CRT0_FALSE}"; then
+  as_fn_error $? "conditional \"MOXIE_BUILD_CRT0\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_XTENSA_BOARD_ESP32_TRUE}" && test -z "${HAVE_XTENSA_BOARD_ESP32_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_XTENSA_BOARD_ESP32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6072,7 +6090,6 @@ do
     "ft32/Makefile") CONFIG_FILES="$CONFIG_FILES ft32/Makefile" ;;
     "mcore/Makefile") CONFIG_FILES="$CONFIG_FILES mcore/Makefile" ;;
     "mep/Makefile") CONFIG_FILES="$CONFIG_FILES mep/Makefile" ;;
-    "moxie/Makefile") CONFIG_FILES="$CONFIG_FILES moxie/Makefile" ;;
     "microblaze/Makefile") CONFIG_FILES="$CONFIG_FILES microblaze/Makefile" ;;
     "mt/Makefile") CONFIG_FILES="$CONFIG_FILES mt/Makefile" ;;
     "v850/Makefile") CONFIG_FILES="$CONFIG_FILES v850/Makefile" ;;
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 268d86c51..472cbb8f9 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -166,8 +166,7 @@ case "${target}" in
 	subdirs="$subdirs mep"
 	;;
   moxie-*-*)
-	AC_CONFIG_FILES([moxie/Makefile])
-	subdirs="$subdirs moxie"
+	config_moxie=true
 	;;
   microblaze*-*-*)
 	AC_CONFIG_FILES([microblaze/Makefile])
@@ -250,7 +249,7 @@ AC_SUBST(subdirs)
 dnl These subdirs have converted to non-recursive make.  Hopefully someday all
 dnl the ports above will too!
 m4_foreach_w([SUBDIR], [
-  aarch64 arc arm bfin csky d30v iq2000 libnosys lm32 nios2 riscv wince xtensa
+  aarch64 arc arm bfin csky d30v iq2000 libnosys lm32 moxie nios2 riscv wince xtensa
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])
diff --git a/libgloss/moxie/Makefile.in b/libgloss/moxie/Makefile.in
deleted file mode 100644
index e87510fe2..000000000
--- a/libgloss/moxie/Makefile.in
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright (c) 2008, 2010 Anthony Green
-#
-# The authors hereby grant permission to use, copy, modify, distribute,
-# and license this software and its documentation for any purpose, provided
-# that existing copyright notices are retained in all copies and that this
-# notice is included verbatim in any distributions. No written agreement,
-# license, or royalty fee is required for any of the authorized uses.
-# Modifications to this software may be copyrighted by their authors
-# and need not follow the licensing terms described here, provided that
-# the new terms are clearly indicated on the first page of each file where
-# they apply.
-
-# Makefile for libgloss/spro. This is the board support code for the
-# moxie target.
-
-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)
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-AR_FLAGS = rc
-
-OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \
-	then echo ${objroot}/../binutils/objdump ; \
-	else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi`
-OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \
-	then echo ${objroot}/../binutils/objcopy ; \
-	else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi`
-
-LD_SCRIPTS = moxie-elf-common.ld qemu.ld sim.ld moxiebox.ld
-
-@MOXIE_BUILD_CRT0_TRUE@CRT0		= crt0.o
-@MOXIE_BUILD_CRT0_TRUE@CRT0_INSTALL	= install-crt0
-@MOXIE_BUILD_CRT0_FALSE@CRT0		=
-@MOXIE_BUILD_CRT0_FALSE@CRT0_INSTALL	=
-
-SIM_BSP = libsim.a
-SIM_OBJS = fstat.o \
-	   getpid.o \
-	   isatty.o \
-	   kill.o \
-	   putnum.o \
-	   sbrk.o \
-	   sim-close.o \
-	   sim-exit.o \
-	   sim-inbyte.o \
-	   sim-lseek.o \
-	   sim-open.o \
-	   sim-read.o \
-	   sim-time.o \
-	   sim-unlink.o \
-	   sim-write.o \
-	   stat.o
-
-QEMU_BSP = libqemu.a
-QEMU_OBJS = qemu-write.o \
-	    qemu-time.o \
-	    sim-exit.o \
-	    sbrk.o \
-	    sim-close.o \
-	    fstat.o \
-	    getpid.o \
-	    isatty.o \
-	    kill.o \
-	    putnum.o \
-	    sim-lseek.o \
-	    sim-read.o
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-all: ${CRT0} $(SIM_BSP) $(QEMU_BSP)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-$(QEMU_BSP): $(QEMU_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-fstat.o: $(srcdir)/fstat.c
-getpid.o: $(srcdir)/getpid.c
-isatty.o: $(srcdir)/isatty.c
-kill.o: $(srcdir)/kill.c
-putnum.o: $(srcdir)/putnum.c
-sbrk.o: $(srcdir)/sbrk.c
-sim-close.o: $(srcdir)/sim-close.S
-sim-exit.o: $(srcdir)/sim-exit.S
-sim-inbyte.o: $(srcdir)/sim-inbyte.c
-sim-lseek.o: $(srcdir)/sim-lseek.c
-sim-open.o: $(srcdir)/sim-open.S
-sim-read.o: $(srcdir)/sim-read.S
-sim-time.o: $(srcdir)/sim-time.c
-sim-unlink.o: $(srcdir)/sim-unlink.S
-sim-write.o: $(srcdir)/sim-write.S
-stat.o: $(srcdir)/stat.c
-qemu-write.o: $(srcdir)/qemu-write.c
-
-install: ${CRT0_INSTALL} $($(CPU)_INSTALL)
-	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(SIM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
-	$(INSTALL_DATA) $(QEMU_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(QEMU_BSP)
-	for x in ${LD_SCRIPTS}; do \
-	  ${INSTALL_DATA} ${srcdir}/$$x $(DESTDIR)${tooldir}/lib/$$x; \
-	done;
-
-install-crt0:
-	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
-	${INSTALL_DATA} ${CRT0} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x
-
-clean mostlyclean:
-	rm -f *.o *.a
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile
-
-.PHONY: info dvi doc install-info clean-info
-info doc dvi:
-install-info:
-clean-info:
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status
diff --git a/libgloss/moxie/Makefile.inc b/libgloss/moxie/Makefile.inc
new file mode 100644
index 000000000..acc92d2e0
--- /dev/null
+++ b/libgloss/moxie/Makefile.inc
@@ -0,0 +1,62 @@
+## Copyright (c) 2008, 2010 Anthony Green
+##
+## The authors hereby grant permission to use, copy, modify, distribute,
+## and license this software and its documentation for any purpose, provided
+## that existing copyright notices are retained in all copies and that this
+## notice is included verbatim in any distributions. No written agreement,
+## license, or royalty fee is required for any of the authorized uses.
+## Modifications to this software may be copyrighted by their authors
+## and need not follow the licensing terms described here, provided that
+## the new terms are clearly indicated on the first page of each file where
+## they apply.
+
+## Makefile for libgloss/spro. This is the board support code for the
+## moxie target.
+
+if !HAVE_MULTISUBDIR
+multilibtool_DATA += \
+	%D%/moxie-elf-common.ld \
+	%D%/qemu.ld \
+	%D%/sim.ld \
+	%D%/moxiebox.ld
+endif
+
+if MOXIE_BUILD_CRT0
+multilibtool_DATA += %D%/crt0.o
+endif
+libobjs_a_SOURCES += \
+	%D%/crt0.S
+
+multilibtool_LIBRARIES += %D%/libsim.a
+%C%_libsim_a_SOURCES = \
+	%D%/fstat.c \
+	%D%/getpid.c \
+	%D%/isatty.c \
+	%D%/kill.c \
+	%D%/putnum.c \
+	%D%/sbrk.c \
+	%D%/sim-close.S \
+	%D%/sim-exit.S \
+	%D%/sim-inbyte.c \
+	%D%/sim-lseek.c \
+	%D%/sim-open.S \
+	%D%/sim-read.S \
+	%D%/sim-time.c \
+	%D%/sim-unlink.S \
+	%D%/sim-write.S \
+	%D%/stat.c
+
+multilibtool_LIBRARIES += %D%/libqemu.a
+%C%_libqemu_a_SOURCES = \
+	%D%/qemu-write.c \
+	%D%/qemu-time.c \
+	%D%/sim-exit.S \
+	%D%/sbrk.c \
+	%D%/sim-close.S \
+	%D%/fstat.c \
+	%D%/getpid.c \
+	%D%/isatty.c \
+	%D%/kill.c \
+	%D%/putnum.c \
+	%D%/sim-lseek.c \
+	%D%/sim-read.S
diff --git a/libgloss/moxie/acinclude.m4 b/libgloss/moxie/acinclude.m4
index 77428ee37..b7bc56b1e 100644
--- a/libgloss/moxie/acinclude.m4
+++ b/libgloss/moxie/acinclude.m4
@@ -1,13 +1,5 @@
 dnl Don't build crt0 for moxiebox, which provides crt0 for us.
-case "${target}" in
-  moxie-*-moxiebox*)
-    MOXIE_BUILD_CRT0_TRUE='#'
-    MOXIE_BUILD_CRT0_FALSE=
-    ;;
-  *)
-    MOXIE_BUILD_CRT0_TRUE=
-    MOXIE_BUILD_CRT0_FALSE='#'
-    ;;
-esac
-AC_SUBST(MOXIE_BUILD_CRT0_TRUE)
-AC_SUBST(MOXIE_BUILD_CRT0_FALSE)
+AS_CASE([${target}],
+  [moxie-*-moxiebox*], [MOXIE_BUILD_CRT0=false],
+  [MOXIE_BUILD_CRT0=true])
+AM_CONDITIONAL([MOXIE_BUILD_CRT0], [$MOXIE_BUILD_CRT0])