libgloss: merge v850 into top-level Makefile

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

6 files changed, 271 insertions, 206 deletions

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index b6f12735c..742ef52c5 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -99,6 +99,9 @@ endif
 if CONFIG_RISCV
 include riscv/Makefile.inc
 endif
+if CONFIG_V850
+include v850/Makefile.inc
+endif
 if CONFIG_WINCE
 include wince/Makefile.inc
 endif
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 867211704..59e9b2df7 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -199,10 +199,13 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 
 @CONFIG_RISCV_TRUE@am__append_39 = riscv/libgloss.a riscv/libsim.a \
 @CONFIG_RISCV_TRUE@	riscv/libsemihost.a
-@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_V850_TRUE@am__append_40 = v850/crt0.o
+@CONFIG_V850_TRUE@am__append_41 = v850/crt0.S
+@CONFIG_V850_TRUE@am__append_42 = v850/libsim.a
+@CONFIG_WINCE_TRUE@am__append_43 = $(gdbdir)
+@CONFIG_WINCE_TRUE@am__append_44 = wince/stub.exe
+@CONFIG_XTENSA_TRUE@am__append_45 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
+@CONFIG_XTENSA_TRUE@am__append_46 = \
 @CONFIG_XTENSA_TRUE@	xtensa/default.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/nano.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/sim.elf.specs \
@@ -211,27 +214,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_44 = \
+@CONFIG_XTENSA_TRUE@am__append_47 = \
 @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_45 = xtensa/libgloss.a
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_46 = \
+@CONFIG_XTENSA_TRUE@am__append_48 = xtensa/libgloss.a
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_49 = \
 @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_47 = xtensa/libsys_qemu.a \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_50 = 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_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
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_51 = xtensa/boards/esp32/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_52 = xtensa/boards/esp32/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_53 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_54 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_55 = xtensa/boards/esp32s3/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_56 = xtensa/boards/esp32s3/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_57 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_58 = -I$(srcdir)/xtensa/boards/esp32s3/include
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -262,11 +265,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 \
-	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
+	microblaze/Makefile mt/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'`;
 am__vpath_adj = case $$p in \
@@ -465,12 +467,13 @@ libobjs_a_LIBADD =
 @CONFIG_IQ2000_TRUE@am__objects_5 = iq2000/crt0.$(OBJEXT)
 @CONFIG_LM32_TRUE@am__objects_6 = lm32/crt0.$(OBJEXT)
 @CONFIG_MOXIE_TRUE@am__objects_7 = moxie/crt0.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@am__objects_8 = xtensa/crt0.$(OBJEXT) \
+@CONFIG_V850_TRUE@am__objects_8 = v850/crt0.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@am__objects_9 = 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_8)
+	$(am__objects_8) $(am__objects_9)
 libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS)
 lm32_libgloss_a_AR = $(AR) $(ARFLAGS)
 lm32_libgloss_a_LIBADD =
@@ -599,7 +602,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_9 =  \
+@CONFIG_RISCV_TRUE@am__objects_10 =  \
 @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) \
@@ -632,17 +635,35 @@ 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_9)
+@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_10)
 riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS)
+v850_libsim_a_AR = $(AR) $(ARFLAGS)
+v850_libsim_a_LIBADD =
+@CONFIG_V850_TRUE@am_v850_libsim_a_OBJECTS = v850/_exit.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/access.$(OBJEXT) v850/chmod.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/chown.$(OBJEXT) v850/close.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/creat.$(OBJEXT) v850/crt1.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/execv.$(OBJEXT) v850/execve.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/fork.$(OBJEXT) v850/fstat.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/getpid.$(OBJEXT) v850/gettime.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/isatty.$(OBJEXT) v850/kill.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/link.$(OBJEXT) v850/lseek.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/open.$(OBJEXT) v850/pipe.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/read.$(OBJEXT) v850/sbrk.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/stat.$(OBJEXT) v850/time.$(OBJEXT) \
+@CONFIG_V850_TRUE@	v850/times.$(OBJEXT) v850/trap.$(OBJEXT) \
+@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)
 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_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_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_11 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_12 = 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_10) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_11)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_11) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_12)
 xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS)
 xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS)
 xtensa_libsys_openocd_a_LIBADD =
@@ -717,7 +738,7 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_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) \
+	$(v850_libsim_a_SOURCES) $(xtensa_libgloss_a_SOURCES) \
 	$(xtensa_libsys_openocd_a_SOURCES) \
 	$(xtensa_libsys_qemu_a_SOURCES) bfin/sim-test.c iq2000/test.c \
 	$(wince_stub_exe_SOURCES)
@@ -807,7 +828,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-VPATH = @srcdir@ $(am__append_40)
+VPATH = @srcdir@ $(am__append_43)
 AARCH64_OBJTYPE = @AARCH64_OBJTYPE@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -825,7 +846,7 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(am__append_42)
+CPPFLAGS = @CPPFLAGS@ $(am__append_45)
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -945,13 +966,14 @@ multilibtool_DATA = $(am__append_3) $(am__append_6) $(am__append_7) \
 	$(am__append_18) $(am__append_22) $(am__append_23) \
 	$(am__append_27) $(am__append_29) $(am__append_32) \
 	$(am__append_33) $(am__append_36) $(am__append_38) \
-	$(am__append_43) $(am__append_46) $(am__append_48) \
-	$(am__append_52)
+	$(am__append_40) $(am__append_46) $(am__append_49) \
+	$(am__append_51) $(am__append_55)
 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_35) $(am__append_37) \
-	$(am__append_39) $(am__append_45) $(am__append_47)
+	$(am__append_39) $(am__append_42) $(am__append_48) \
+	$(am__append_50)
 includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_16)
 includesystooldir = $(tooldir)/include/sys
@@ -962,7 +984,8 @@ 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_34) $(am__append_44)
+	$(am__append_31) $(am__append_34) $(am__append_41) \
+	$(am__append_47)
 FLAGS_TO_PASS = \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -1273,6 +1296,37 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 
 @CONFIG_RISCV_TRUE@includemachinetooldir = $(tooldir)/include/machine
 @CONFIG_RISCV_TRUE@includemachinetool_DATA = riscv/machine/syscall.h
+@CONFIG_V850_TRUE@v850_libsim_a_SOURCES = \
+@CONFIG_V850_TRUE@	v850/_exit.c \
+@CONFIG_V850_TRUE@	v850/access.c \
+@CONFIG_V850_TRUE@	v850/chmod.c \
+@CONFIG_V850_TRUE@	v850/chown.c \
+@CONFIG_V850_TRUE@	v850/close.c \
+@CONFIG_V850_TRUE@	v850/creat.c \
+@CONFIG_V850_TRUE@	v850/crt1.c \
+@CONFIG_V850_TRUE@	v850/execv.c \
+@CONFIG_V850_TRUE@	v850/execve.c \
+@CONFIG_V850_TRUE@	v850/fork.c \
+@CONFIG_V850_TRUE@	v850/fstat.c \
+@CONFIG_V850_TRUE@	v850/getpid.c \
+@CONFIG_V850_TRUE@	v850/gettime.c \
+@CONFIG_V850_TRUE@	v850/isatty.c \
+@CONFIG_V850_TRUE@	v850/kill.c \
+@CONFIG_V850_TRUE@	v850/link.c \
+@CONFIG_V850_TRUE@	v850/lseek.c \
+@CONFIG_V850_TRUE@	v850/open.c \
+@CONFIG_V850_TRUE@	v850/pipe.c \
+@CONFIG_V850_TRUE@	v850/read.c \
+@CONFIG_V850_TRUE@	v850/sbrk.c \
+@CONFIG_V850_TRUE@	v850/stat.c \
+@CONFIG_V850_TRUE@	v850/time.c \
+@CONFIG_V850_TRUE@	v850/times.c \
+@CONFIG_V850_TRUE@	v850/trap.S \
+@CONFIG_V850_TRUE@	v850/unlink.c \
+@CONFIG_V850_TRUE@	v850/utime.c \
+@CONFIG_V850_TRUE@	v850/wait.c \
+@CONFIG_V850_TRUE@	v850/write.c
+
 @CONFIG_WINCE_TRUE@gdbdir = ${dir ${patsubst %/,%,${dir @srcdir@}}}gdb
 @CONFIG_WINCE_TRUE@wince_stub_exe_SOURCES = wince-stub.c
 @CONFIG_WINCE_TRUE@wince_stub_exe_CPPFLAGS = $(AM_CPPFLAGS) -I$(gdbdir)
@@ -1280,19 +1334,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_49) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_53)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_52) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_56)
 @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_50) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_54)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_53) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_57)
 @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_51) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_55)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_54) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_58)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c
 
@@ -1305,7 +1359,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)/moxie/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)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1327,7 +1381,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)/moxie/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)/v850/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
@@ -1400,8 +1454,6 @@ microblaze/Makefile: $(top_builddir)/config.status $(top_srcdir)/microblaze/Make
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 mt/Makefile: $(top_builddir)/config.status $(top_srcdir)/mt/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-v850/Makefile: $(top_builddir)/config.status $(top_srcdir)/v850/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 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
@@ -1796,6 +1848,14 @@ moxie/$(DEPDIR)/$(am__dirstamp):
 	@: > moxie/$(DEPDIR)/$(am__dirstamp)
 moxie/crt0.$(OBJEXT): moxie/$(am__dirstamp) \
 	moxie/$(DEPDIR)/$(am__dirstamp)
+v850/$(am__dirstamp):
+	@$(MKDIR_P) v850
+	@: > v850/$(am__dirstamp)
+v850/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) v850/$(DEPDIR)
+	@: > v850/$(DEPDIR)/$(am__dirstamp)
+v850/crt0.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
 xtensa/$(am__dirstamp):
 	@$(MKDIR_P) xtensa
 	@: > xtensa/$(am__dirstamp)
@@ -2120,6 +2180,69 @@ riscv/libsim.a: $(riscv_libsim_a_OBJECTS) $(riscv_libsim_a_DEPENDENCIES) $(EXTRA
 	$(AM_V_at)-rm -f riscv/libsim.a
 	$(AM_V_AR)$(riscv_libsim_a_AR) riscv/libsim.a $(riscv_libsim_a_OBJECTS) $(riscv_libsim_a_LIBADD)
 	$(AM_V_at)$(RANLIB) riscv/libsim.a
+v850/_exit.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/access.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/chmod.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/chown.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/close.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/creat.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/crt1.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/execv.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/execve.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/fork.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/fstat.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/getpid.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/gettime.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/isatty.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/kill.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/link.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/lseek.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/open.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/pipe.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/read.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/sbrk.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/stat.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/time.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/times.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/trap.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/unlink.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/utime.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/wait.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+v850/write.$(OBJEXT): v850/$(am__dirstamp) \
+	v850/$(DEPDIR)/$(am__dirstamp)
+
+v850/libsim.a: $(v850_libsim_a_OBJECTS) $(v850_libsim_a_DEPENDENCIES) $(EXTRA_v850_libsim_a_DEPENDENCIES) v850/$(am__dirstamp)
+	$(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
 xtensa/xtensa_libgloss_a-sleep.$(OBJEXT): xtensa/$(am__dirstamp) \
 	xtensa/$(DEPDIR)/$(am__dirstamp)
 xtensa/xtensa_libgloss_a-syscalls.$(OBJEXT): xtensa/$(am__dirstamp) \
@@ -2246,6 +2369,7 @@ mostlyclean-compile:
 	-rm -f moxie/*.$(OBJEXT)
 	-rm -f nios2/*.$(OBJEXT)
 	-rm -f riscv/*.$(OBJEXT)
+	-rm -f v850/*.$(OBJEXT)
 	-rm -f xtensa/*.$(OBJEXT)
 	-rm -f xtensa/boards/esp32/*.$(OBJEXT)
 	-rm -f xtensa/boards/esp32s3/*.$(OBJEXT)
@@ -2500,6 +2624,36 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/riscv_libsim_a-sys_utime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/riscv_libsim_a-sys_wait.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@riscv/$(DEPDIR)/riscv_libsim_a-sys_write.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/_exit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/access.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/chmod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/chown.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/close.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/creat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/crt0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/crt1.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/execv.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/execve.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/fork.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/fstat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/getpid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/gettime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/isatty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/link.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/lseek.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/open.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/pipe.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/read.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/sbrk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/stat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/time.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/times.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/trap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@v850/$(DEPDIR)/unlink.Po@am__quote@
+@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@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@
@@ -5260,6 +5414,8 @@ distclean-generic:
 	-rm -f nios2/$(am__dirstamp)
 	-rm -f riscv/$(DEPDIR)/$(am__dirstamp)
 	-rm -f riscv/$(am__dirstamp)
+	-rm -f v850/$(DEPDIR)/$(am__dirstamp)
+	-rm -f v850/$(am__dirstamp)
 	-rm -f wince/$(am__dirstamp)
 	-rm -f xtensa/$(DEPDIR)/$(am__dirstamp)
 	-rm -f xtensa/$(am__dirstamp)
@@ -5280,7 +5436,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) moxie/$(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) v850/$(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
@@ -5423,7 +5579,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) moxie/$(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) v850/$(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 782ae9a2f..def93ce56 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -643,6 +643,8 @@ CONFIG_XTENSA_FALSE
 CONFIG_XTENSA_TRUE
 CONFIG_WINCE_FALSE
 CONFIG_WINCE_TRUE
+CONFIG_V850_FALSE
+CONFIG_V850_TRUE
 CONFIG_RISCV_FALSE
 CONFIG_RISCV_TRUE
 CONFIG_NIOS2_FALSE
@@ -2916,9 +2918,7 @@ case "${target}" in
 	subdirs="$subdirs mt"
 	;;
   v850*-*-*)
-	ac_config_files="$ac_config_files v850/Makefile"
-
-	subdirs="$subdirs v850"
+	config_v850=true
 	;;
   visium-*-*)
 	ac_config_files="$ac_config_files visium/Makefile"
@@ -3093,6 +3093,14 @@ else
   CONFIG_RISCV_FALSE=
 fi
 
+   if test x$config_v850 = xtrue; then
+  CONFIG_V850_TRUE=
+  CONFIG_V850_FALSE='#'
+else
+  CONFIG_V850_TRUE='#'
+  CONFIG_V850_FALSE=
+fi
+
    if test x$config_wince = xtrue; then
   CONFIG_WINCE_TRUE=
   CONFIG_WINCE_FALSE='#'
@@ -5424,6 +5432,10 @@ if test -z "${CONFIG_RISCV_TRUE}" && test -z "${CONFIG_RISCV_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_RISCV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_V850_TRUE}" && test -z "${CONFIG_V850_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_V850\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 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
@@ -6092,7 +6104,6 @@ do
     "mep/Makefile") CONFIG_FILES="$CONFIG_FILES mep/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" ;;
     "visium/Makefile") CONFIG_FILES="$CONFIG_FILES visium/Makefile" ;;
     "xc16x/Makefile") CONFIG_FILES="$CONFIG_FILES xc16x/Makefile" ;;
     "xstormy16/Makefile") CONFIG_FILES="$CONFIG_FILES xstormy16/Makefile" ;;
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 472cbb8f9..81b66a2f8 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -177,8 +177,7 @@ case "${target}" in
 	subdirs="$subdirs mt"
 	;;
   v850*-*-*)
-	AC_CONFIG_FILES([v850/Makefile])
-	subdirs="$subdirs v850"
+	config_v850=true
 	;;
   visium-*-*)
 	AC_CONFIG_FILES([visium/Makefile])
@@ -249,7 +248,8 @@ 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 moxie nios2 riscv wince xtensa
+  aarch64 arc arm bfin csky d30v iq2000 libnosys lm32 moxie nios2 riscv v850
+  wince xtensa
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])
diff --git a/libgloss/v850/Makefile.in b/libgloss/v850/Makefile.in
deleted file mode 100644
index dd507be59..000000000
--- a/libgloss/v850/Makefile.in
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright (c) 2002 Red Hat, Inc
-#
-# 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/frv. This is the board support
-# code for the various frv targets.
-
-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`
-
-CRT0 = crt0.o
-SIM_BSP = libsim.a
-SIM_OBJS = _exit.o \
-           access.o \
-           chmod.o \
-	   chown.o \
-           close.o \
-	   creat.o \
-           crt1.o \
-	   execv.o \
-	   execve.o \
-	   fork.o \
-           fstat.o \
-           getpid.o \
-           gettime.o \
-           isatty.o \
-           kill.o \
-	   link.o \
-           lseek.o \
-           open.o \
-	   pipe.o \
-           read.o \
-           sbrk.o \
-           stat.o \
-           time.o \
-           times.o \
-           trap.o \
-           unlink.o \
-           utime.o \
-	   wait.o \
-           write.o
-
-#### Host specific Makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0) $(SIM_BSP)
-
-$(SIM_BSP): $(SIM_OBJS)
-	$(AR) $(ARFLAGS) $@ $?
-	$(RANLIB) $@
-
-_exit.o: $(srcdir)/_exit.c
-access.o: $(srcdir)/access.c
-chmod.o: $(srcdir)/chmod.c
-chown.o: $(srcdir)/chown.c
-close.o: $(srcdir)/close.c
-creat.o: $(srcdir)/creat.c
-crt1.o: $(srcdir)/crt1.c
-execv.o: $(srcdir)/execv.c
-execve.o: $(srcdir)/execve.c
-fork.o: $(srcdir)/fork.c
-fstat.o: $(srcdir)/fstat.c
-getpid.o: $(srcdir)/getpid.c
-gettime.o: $(srcdir)/gettime.c
-isatty.o: $(srcdir)/isatty.c
-kill.o: $(srcdir)/kill.c
-link.o: $(srcdir)/link.c
-lseek.o: $(srcdir)/lseek.c
-open.o: $(srcdir)/open.c
-pipe.o: $(srcdir)/pipe.c
-read.o: $(srcdir)/read.c
-sbrk.o: $(srcdir)/sbrk.c
-stat.o: $(srcdir)/stat.c
-time.o: $(srcdir)/time.c
-times.o: $(srcdir)/times.c
-trap.o: $(srcdir)/trap.S
-unlink.o: $(srcdir)/unlink.c
-utime.o: $(srcdir)/utime.c
-wait.o: $(srcdir)/wait.c
-write.o: $(srcdir)/write.c
-
-install: $($(CPU)_INSTALL)
-	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	$(INSTALL_DATA) $(SIM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP)
-
-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/v850/Makefile.inc b/libgloss/v850/Makefile.inc
new file mode 100644
index 000000000..a491922f7
--- /dev/null
+++ b/libgloss/v850/Makefile.inc
@@ -0,0 +1,46 @@
+## Copyright (c) 2002 Red Hat, Inc
+##
+## 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.
+
+multilibtool_DATA += %D%/crt0.o
+libobjs_a_SOURCES += %D%/crt0.S
+
+multilibtool_LIBRARIES += %D%/libsim.a
+%C%_libsim_a_SOURCES = \
+	%D%/_exit.c \
+	%D%/access.c \
+	%D%/chmod.c \
+	%D%/chown.c \
+	%D%/close.c \
+	%D%/creat.c \
+	%D%/crt1.c \
+	%D%/execv.c \
+	%D%/execve.c \
+	%D%/fork.c \
+	%D%/fstat.c \
+	%D%/getpid.c \
+	%D%/gettime.c \
+	%D%/isatty.c \
+	%D%/kill.c \
+	%D%/link.c \
+	%D%/lseek.c \
+	%D%/open.c \
+	%D%/pipe.c \
+	%D%/read.c \
+	%D%/sbrk.c \
+	%D%/stat.c \
+	%D%/time.c \
+	%D%/times.c \
+	%D%/trap.S \
+	%D%/unlink.c \
+	%D%/utime.c \
+	%D%/wait.c \
+	%D%/write.c