libgloss: merge m32r into top-level Makefile

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

6 files changed, 345 insertions, 272 deletions

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 30ca10527..580f371b2 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -116,6 +116,9 @@ endif
 if CONFIG_LM32
 include lm32/Makefile.inc
 endif
+if CONFIG_M32R
+include m32r/Makefile.inc
+endif
 if CONFIG_MCORE
 include mcore/Makefile.inc
 endif
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 7fdfe7f49..f32de47a3 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -189,123 +189,133 @@ multilibtool_PROGRAMS = $(am__EXEEXT_6)
 @CONFIG_LM32_TRUE@am__append_38 = lm32/crt0.o lm32/sim.ld
 @CONFIG_LM32_TRUE@am__append_39 = lm32/libgloss.a
 @CONFIG_LM32_TRUE@am__append_40 = lm32/crt0.S
-@CONFIG_MCORE_TRUE@@MCORE_BUILD_ELF_TRUE@am__append_41 = \
+@CONFIG_M32R_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_41 = \
+@CONFIG_M32R_TRUE@@HAVE_MULTISUBDIR_FALSE@	m32r/eva.ld \
+@CONFIG_M32R_TRUE@@HAVE_MULTISUBDIR_FALSE@	m32r/eva-stub.ld \
+@CONFIG_M32R_TRUE@@HAVE_MULTISUBDIR_FALSE@	m32r/mon.specs
+
+@CONFIG_M32R_TRUE@am__append_42 = m32r/crt0.o m32r/m32r-lib.o \
+@CONFIG_M32R_TRUE@	m32r/m32r-stub.o
+@CONFIG_M32R_TRUE@am__append_43 = m32r/crt0.S m32r/m32r-lib.c \
+@CONFIG_M32R_TRUE@	m32r/m32r-stub.c
+@CONFIG_M32R_TRUE@am__append_44 = m32r/libgloss.a m32r/libmon.a
+@CONFIG_MCORE_TRUE@@MCORE_BUILD_ELF_TRUE@am__append_45 = \
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_ELF_TRUE@	mcore/cmb.ld \
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_ELF_TRUE@	mcore/cmb.specs
 
-@CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@am__append_42 = \
+@CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@am__append_46 = \
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@	mcore/cmb.ld \
 @CONFIG_MCORE_TRUE@@MCORE_BUILD_PE_TRUE@	mcore/cmb.specs
 
-@CONFIG_MCORE_TRUE@am__append_43 = mcore/crt0.o
-@CONFIG_MCORE_TRUE@am__append_44 = mcore/crt0.S
-@CONFIG_MCORE_TRUE@am__append_45 = mcore/libsim.a mcore/libcmb.a
-@CONFIG_MN10200_TRUE@am__append_46 = mn10200/eval.ld mn10200/sim.ld \
+@CONFIG_MCORE_TRUE@am__append_47 = mcore/crt0.o
+@CONFIG_MCORE_TRUE@am__append_48 = mcore/crt0.S
+@CONFIG_MCORE_TRUE@am__append_49 = mcore/libsim.a mcore/libcmb.a
+@CONFIG_MN10200_TRUE@am__append_50 = mn10200/eval.ld mn10200/sim.ld \
 @CONFIG_MN10200_TRUE@	mn10200/crt0.o
-@CONFIG_MN10200_TRUE@am__append_47 = mn10200/crt0.S
-@CONFIG_MN10200_TRUE@am__append_48 = mn10200/libeval.a
-@CONFIG_MN10200_TRUE@am__append_49 = mn10200/test
-@CONFIG_MN10300_TRUE@am__append_50 = \
+@CONFIG_MN10200_TRUE@am__append_51 = mn10200/crt0.S
+@CONFIG_MN10200_TRUE@am__append_52 = mn10200/libeval.a
+@CONFIG_MN10200_TRUE@am__append_53 = mn10200/test
+@CONFIG_MN10300_TRUE@am__append_54 = \
 @CONFIG_MN10300_TRUE@	mn10300/eval.ld \
 @CONFIG_MN10300_TRUE@	mn10300/sim.ld
 
-@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am__append_51 = \
+@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am__append_55 = \
 @CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@	mn10300/asb2303.ld \
 @CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@	mn10300/asb2305.ld
 
-@CONFIG_MN10300_TRUE@am__append_52 = \
+@CONFIG_MN10300_TRUE@am__append_56 = \
 @CONFIG_MN10300_TRUE@	mn10300/crt0.o \
 @CONFIG_MN10300_TRUE@	mn10300/crt0_cygmon.o \
 @CONFIG_MN10300_TRUE@	mn10300/crt0_redboot.o
 
-@CONFIG_MN10300_TRUE@am__append_53 = \
+@CONFIG_MN10300_TRUE@am__append_57 = \
 @CONFIG_MN10300_TRUE@	mn10300/crt0.S \
 @CONFIG_MN10300_TRUE@	mn10300/crt0_cygmon.S \
 @CONFIG_MN10300_TRUE@	mn10300/crt0_redboot.S
 
-@CONFIG_MN10300_TRUE@am__append_54 = mn10300/libeval.a
-@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am__append_55 = mn10300/libcygmon.a
-@CONFIG_MN10300_TRUE@am__append_56 = mn10300/test
-@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_57 = \
+@CONFIG_MN10300_TRUE@am__append_58 = mn10300/libeval.a
+@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am__append_59 = mn10300/libcygmon.a
+@CONFIG_MN10300_TRUE@am__append_60 = mn10300/test
+@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_61 = \
 @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_58 = moxie/crt0.o
-@CONFIG_MOXIE_TRUE@am__append_59 = \
+@CONFIG_MOXIE_TRUE@@MOXIE_BUILD_CRT0_TRUE@am__append_62 = moxie/crt0.o
+@CONFIG_MOXIE_TRUE@am__append_63 = \
 @CONFIG_MOXIE_TRUE@	moxie/crt0.S
 
-@CONFIG_MOXIE_TRUE@am__append_60 = moxie/libsim.a moxie/libqemu.a
-@CONFIG_MSP430_TRUE@am__append_61 = msp430/msp430-sim.ld \
+@CONFIG_MOXIE_TRUE@am__append_64 = moxie/libsim.a moxie/libqemu.a
+@CONFIG_MSP430_TRUE@am__append_65 = msp430/msp430-sim.ld \
 @CONFIG_MSP430_TRUE@	msp430/msp430xl-sim.ld \
 @CONFIG_MSP430_TRUE@	msp430/intr_vectors.ld msp430/gcrt0.o \
 @CONFIG_MSP430_TRUE@	msp430/crt0.o
-@CONFIG_MSP430_TRUE@am__append_62 = \
+@CONFIG_MSP430_TRUE@am__append_66 = \
 @CONFIG_MSP430_TRUE@	msp430/gcrt0.S \
 @CONFIG_MSP430_TRUE@	msp430/crt0.S
 
-@CONFIG_MSP430_TRUE@am__append_63 = msp430/libsim.a msp430/libnosys.a \
+@CONFIG_MSP430_TRUE@am__append_67 = msp430/libsim.a msp430/libnosys.a \
 @CONFIG_MSP430_TRUE@	msp430/libcrt.a
-@CONFIG_NDS32_TRUE@am__append_64 = \
+@CONFIG_NDS32_TRUE@am__append_68 = \
 @CONFIG_NDS32_TRUE@	nds32/crt0.o \
 @CONFIG_NDS32_TRUE@	nds32/crt1.o
 
-@CONFIG_NDS32_TRUE@am__append_65 = \
+@CONFIG_NDS32_TRUE@am__append_69 = \
 @CONFIG_NDS32_TRUE@	nds32/crt0.S \
 @CONFIG_NDS32_TRUE@	nds32/crt1.S
 
-@CONFIG_NDS32_TRUE@am__append_66 = nds32/libgloss.a
-@CONFIG_NIOS2_TRUE@am__append_67 = \
+@CONFIG_NDS32_TRUE@am__append_70 = nds32/libgloss.a
+@CONFIG_NIOS2_TRUE@am__append_71 = \
 @CONFIG_NIOS2_TRUE@	nios2/qemu-hosted.ld
 
-@CONFIG_NIOS2_TRUE@am__append_68 = nios2/libnios2.a
-@CONFIG_RISCV_TRUE@am__append_69 = \
+@CONFIG_NIOS2_TRUE@am__append_72 = nios2/libnios2.a
+@CONFIG_RISCV_TRUE@am__append_73 = \
 @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_70 = riscv/libgloss.a riscv/libsim.a \
+@CONFIG_RISCV_TRUE@am__append_74 = riscv/libgloss.a riscv/libsim.a \
 @CONFIG_RISCV_TRUE@	riscv/libsemihost.a
-@CONFIG_RL78_TRUE@am__append_71 = rl78/rl78.ld rl78/rl78-sim.ld \
+@CONFIG_RL78_TRUE@am__append_75 = rl78/rl78.ld rl78/rl78-sim.ld \
 @CONFIG_RL78_TRUE@	rl78/gcrt0.o rl78/crt0.o rl78/crtn.o
-@CONFIG_RL78_TRUE@am__append_72 = \
+@CONFIG_RL78_TRUE@am__append_76 = \
 @CONFIG_RL78_TRUE@	rl78/gcrt0.S \
 @CONFIG_RL78_TRUE@	rl78/crt0.S \
 @CONFIG_RL78_TRUE@	rl78/crtn.S
 
-@CONFIG_RL78_TRUE@am__append_73 = rl78/libsim.a
-@CONFIG_RX_TRUE@am__append_74 = rx/rx.ld rx/rx-sim.ld rx/gcrt0.o \
+@CONFIG_RL78_TRUE@am__append_77 = rl78/libsim.a
+@CONFIG_RX_TRUE@am__append_78 = rx/rx.ld rx/rx-sim.ld rx/gcrt0.o \
 @CONFIG_RX_TRUE@	rx/crt0.o rx/crtn.o
-@CONFIG_RX_TRUE@am__append_75 = \
+@CONFIG_RX_TRUE@am__append_79 = \
 @CONFIG_RX_TRUE@	rx/gcrt0.S \
 @CONFIG_RX_TRUE@	rx/crt0.S \
 @CONFIG_RX_TRUE@	rx/crtn.S
 
-@CONFIG_RX_TRUE@am__append_76 = rx/libsim.a
-@CONFIG_V850_TRUE@am__append_77 = v850/crt0.o
-@CONFIG_V850_TRUE@am__append_78 = v850/crt0.S
-@CONFIG_V850_TRUE@am__append_79 = v850/libsim.a
-@CONFIG_WINCE_TRUE@am__append_80 = $(gdbdir)
-@CONFIG_WINCE_TRUE@am__append_81 = wince/stub.exe
-@CONFIG_XSTORMY16_TRUE@am__append_82 = xstormy16/crt0.o \
+@CONFIG_RX_TRUE@am__append_80 = rx/libsim.a
+@CONFIG_V850_TRUE@am__append_81 = v850/crt0.o
+@CONFIG_V850_TRUE@am__append_82 = v850/crt0.S
+@CONFIG_V850_TRUE@am__append_83 = v850/libsim.a
+@CONFIG_WINCE_TRUE@am__append_84 = $(gdbdir)
+@CONFIG_WINCE_TRUE@am__append_85 = wince/stub.exe
+@CONFIG_XSTORMY16_TRUE@am__append_86 = 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_83 = \
+@CONFIG_XSTORMY16_TRUE@am__append_87 = \
 @CONFIG_XSTORMY16_TRUE@	xstormy16/crt0.s \
 @CONFIG_XSTORMY16_TRUE@	xstormy16/crti.s \
 @CONFIG_XSTORMY16_TRUE@	xstormy16/crtn.s
 
-@CONFIG_XSTORMY16_TRUE@am__append_84 = xstormy16/libsim.a \
+@CONFIG_XSTORMY16_TRUE@am__append_88 = xstormy16/libsim.a \
 @CONFIG_XSTORMY16_TRUE@	xstormy16/libeva_app.a
-@CONFIG_XSTORMY16_TRUE@am__append_85 = xstormy16/eva_stub.elf
-@CONFIG_XSTORMY16_TRUE@am__append_86 = xstormy16/eva_stub.hex
-@CONFIG_XTENSA_TRUE@am__append_87 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
-@CONFIG_XTENSA_TRUE@am__append_88 = \
+@CONFIG_XSTORMY16_TRUE@am__append_89 = xstormy16/eva_stub.elf
+@CONFIG_XSTORMY16_TRUE@am__append_90 = xstormy16/eva_stub.hex
+@CONFIG_XTENSA_TRUE@am__append_91 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
+@CONFIG_XTENSA_TRUE@am__append_92 = \
 @CONFIG_XTENSA_TRUE@	xtensa/default.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/nano.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/sim.elf.specs \
@@ -314,27 +324,27 @@ multilibtool_PROGRAMS = $(am__EXEEXT_6)
 @CONFIG_XTENSA_TRUE@	xtensa/sys.openocd.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/crt0.o
 
-@CONFIG_XTENSA_TRUE@am__append_89 = \
+@CONFIG_XTENSA_TRUE@am__append_93 = \
 @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_90 = xtensa/libgloss.a
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_91 = \
+@CONFIG_XTENSA_TRUE@am__append_94 = xtensa/libgloss.a
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_95 = \
 @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_92 = xtensa/libsys_qemu.a \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_96 = 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_93 = xtensa/boards/esp32/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_94 = xtensa/boards/esp32/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_95 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_96 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_97 = xtensa/boards/esp32s3/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_98 = xtensa/boards/esp32s3/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_99 = -I$(srcdir)/xtensa/boards/esp32s3/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_100 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_97 = xtensa/boards/esp32/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_98 = xtensa/boards/esp32/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_99 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_100 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_101 = xtensa/boards/esp32s3/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_102 = xtensa/boards/esp32s3/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_103 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_104 = -I$(srcdir)/xtensa/boards/esp32s3/include
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -359,13 +369,13 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = epiphany/Makefile m32r/Makefile m68hc11/Makefile \
-	m68k/Makefile pa/Makefile sparc_leon/Makefile sparc/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 \
-	m32c/Makefile spu/Makefile tic6x/Makefile or1k/Makefile \
-	pru/Makefile sparc/libsys/Makefile
+CONFIG_CLEAN_FILES = epiphany/Makefile m68hc11/Makefile m68k/Makefile \
+	pa/Makefile sparc_leon/Makefile sparc/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 m32c/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 \
@@ -593,25 +603,28 @@ libobjs_a_LIBADD =
 @CONFIG_I960_TRUE@am__objects_7 = i960/crt0.$(OBJEXT)
 @CONFIG_IQ2000_TRUE@am__objects_8 = iq2000/crt0.$(OBJEXT)
 @CONFIG_LM32_TRUE@am__objects_9 = lm32/crt0.$(OBJEXT)
-@CONFIG_MCORE_TRUE@am__objects_10 = mcore/crt0.$(OBJEXT)
-@CONFIG_MN10200_TRUE@am__objects_11 = mn10200/crt0.$(OBJEXT)
-@CONFIG_MN10300_TRUE@am__objects_12 = mn10300/crt0.$(OBJEXT) \
+@CONFIG_M32R_TRUE@am__objects_10 = m32r/crt0.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/m32r-lib.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/m32r-stub.$(OBJEXT)
+@CONFIG_MCORE_TRUE@am__objects_11 = mcore/crt0.$(OBJEXT)
+@CONFIG_MN10200_TRUE@am__objects_12 = mn10200/crt0.$(OBJEXT)
+@CONFIG_MN10300_TRUE@am__objects_13 = mn10300/crt0.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/crt0_cygmon.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/crt0_redboot.$(OBJEXT)
-@CONFIG_MOXIE_TRUE@am__objects_13 = moxie/crt0.$(OBJEXT)
-@CONFIG_MSP430_TRUE@am__objects_14 = msp430/gcrt0.$(OBJEXT) \
+@CONFIG_MOXIE_TRUE@am__objects_14 = moxie/crt0.$(OBJEXT)
+@CONFIG_MSP430_TRUE@am__objects_15 = msp430/gcrt0.$(OBJEXT) \
 @CONFIG_MSP430_TRUE@	msp430/crt0.$(OBJEXT)
-@CONFIG_NDS32_TRUE@am__objects_15 = nds32/crt0.$(OBJEXT) \
+@CONFIG_NDS32_TRUE@am__objects_16 = nds32/crt0.$(OBJEXT) \
 @CONFIG_NDS32_TRUE@	nds32/crt1.$(OBJEXT)
-@CONFIG_RL78_TRUE@am__objects_16 = rl78/gcrt0.$(OBJEXT) \
+@CONFIG_RL78_TRUE@am__objects_17 = rl78/gcrt0.$(OBJEXT) \
 @CONFIG_RL78_TRUE@	rl78/crt0.$(OBJEXT) rl78/crtn.$(OBJEXT)
-@CONFIG_RX_TRUE@am__objects_17 = rx/gcrt0.$(OBJEXT) rx/crt0.$(OBJEXT) \
+@CONFIG_RX_TRUE@am__objects_18 = rx/gcrt0.$(OBJEXT) rx/crt0.$(OBJEXT) \
 @CONFIG_RX_TRUE@	rx/crtn.$(OBJEXT)
-@CONFIG_V850_TRUE@am__objects_18 = v850/crt0.$(OBJEXT)
-@CONFIG_XSTORMY16_TRUE@am__objects_19 = xstormy16/crt0.$(OBJEXT) \
+@CONFIG_V850_TRUE@am__objects_19 = v850/crt0.$(OBJEXT)
+@CONFIG_XSTORMY16_TRUE@am__objects_20 = xstormy16/crt0.$(OBJEXT) \
 @CONFIG_XSTORMY16_TRUE@	xstormy16/crti.$(OBJEXT) \
 @CONFIG_XSTORMY16_TRUE@	xstormy16/crtn.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@am__objects_20 = xtensa/crt0.$(OBJEXT) \
+@CONFIG_XTENSA_TRUE@am__objects_21 = 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) \
@@ -620,16 +633,35 @@ am_libobjs_a_OBJECTS = $(am__objects_3) $(am__objects_4) \
 	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
 	$(am__objects_14) $(am__objects_15) $(am__objects_16) \
 	$(am__objects_17) $(am__objects_18) $(am__objects_19) \
-	$(am__objects_20)
+	$(am__objects_20) $(am__objects_21)
 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)
+m32r_libgloss_a_AR = $(AR) $(ARFLAGS)
+m32r_libgloss_a_LIBADD =
+@CONFIG_M32R_TRUE@am__objects_22 = m32r/chmod.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/close.$(OBJEXT) m32r/exit.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/fstat.$(OBJEXT) m32r/getpid.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/isatty.$(OBJEXT) m32r/kill.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/lseek.$(OBJEXT) m32r/open.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/raise.$(OBJEXT) m32r/read.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/sbrk.$(OBJEXT) m32r/stat.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/unlink.$(OBJEXT) m32r/utime.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	m32r/write.$(OBJEXT)
+@CONFIG_M32R_TRUE@am_m32r_libgloss_a_OBJECTS = m32r/trap0.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	$(am__objects_22)
+m32r_libgloss_a_OBJECTS = $(am_m32r_libgloss_a_OBJECTS)
+m32r_libmon_a_AR = $(AR) $(ARFLAGS)
+m32r_libmon_a_LIBADD =
+@CONFIG_M32R_TRUE@am_m32r_libmon_a_OBJECTS = m32r/trapmon0.$(OBJEXT) \
+@CONFIG_M32R_TRUE@	$(am__objects_22)
+m32r_libmon_a_OBJECTS = $(am_m32r_libmon_a_OBJECTS)
 mcore_libcmb_a_AR = $(AR) $(ARFLAGS)
 mcore_libcmb_a_LIBADD =
-@CONFIG_MCORE_TRUE@am__objects_21 = mcore/fstat.$(OBJEXT) \
+@CONFIG_MCORE_TRUE@am__objects_23 = 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) \
@@ -641,12 +673,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_21)
+@CONFIG_MCORE_TRUE@	$(am__objects_23)
 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_21)
+@CONFIG_MCORE_TRUE@	mcore/syscalls.$(OBJEXT) $(am__objects_23)
 mcore_libsim_a_OBJECTS = $(am_mcore_libsim_a_OBJECTS)
 mn10200_libeval_a_AR = $(AR) $(ARFLAGS)
 mn10200_libeval_a_LIBADD =
@@ -673,7 +705,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_22 = mn10300/_exit.$(OBJEXT) \
+@CONFIG_MN10300_TRUE@am__objects_24 = mn10300/_exit.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/access.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/chmod.$(OBJEXT) \
 @CONFIG_MN10300_TRUE@	mn10300/close.$(OBJEXT) \
@@ -692,12 +724,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_22) \
+@CONFIG_MN10300_TRUE@@MN10300_BUILD_LIBCYGMON_TRUE@am_mn10300_libcygmon_a_OBJECTS = $(am__objects_24) \
 @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_22) \
+@CONFIG_MN10300_TRUE@am_mn10300_libeval_a_OBJECTS = $(am__objects_24) \
 @CONFIG_MN10300_TRUE@	mn10300/trap.$(OBJEXT)
 mn10300_libeval_a_OBJECTS = $(am_mn10300_libeval_a_OBJECTS)
 moxie_libqemu_a_AR = $(AR) $(ARFLAGS)
@@ -882,7 +914,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_23 =  \
+@CONFIG_RISCV_TRUE@am__objects_25 =  \
 @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) \
@@ -915,7 +947,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_23)
+@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_25)
 riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS)
 rl78_libsim_a_AR = $(AR) $(ARFLAGS)
 rl78_libsim_a_LIBADD =
@@ -992,13 +1024,13 @@ xstormy16_libsim_a_LIBADD =
 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_24 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_25 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_26 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_27 = 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_24) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_25)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_26) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_27)
 xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS)
 xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS)
 xtensa_libsys_openocd_a_LIBADD =
@@ -1096,7 +1128,8 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_a_SOURCES) \
 	$(frv_libsim_a_SOURCES) $(i386_libcygmon_a_SOURCES) \
 	$(i960_libmon960_a_SOURCES) $(iq2000_libeval_a_SOURCES) \
 	$(libnosys_libnosys_a_SOURCES) $(libobjs_a_SOURCES) \
-	$(lm32_libgloss_a_SOURCES) $(mcore_libcmb_a_SOURCES) \
+	$(lm32_libgloss_a_SOURCES) $(m32r_libgloss_a_SOURCES) \
+	$(m32r_libmon_a_SOURCES) $(mcore_libcmb_a_SOURCES) \
 	$(mcore_libsim_a_SOURCES) $(mn10200_libeval_a_SOURCES) \
 	$(mn10300_libcygmon_a_SOURCES) $(mn10300_libeval_a_SOURCES) \
 	$(moxie_libqemu_a_SOURCES) $(moxie_libsim_a_SOURCES) \
@@ -1197,7 +1230,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-VPATH = @srcdir@ $(am__append_80)
+VPATH = @srcdir@ $(am__append_84)
 AARCH64_OBJTYPE = @AARCH64_OBJTYPE@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -1215,7 +1248,7 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(am__append_87)
+CPPFLAGS = @CPPFLAGS@ $(am__append_91)
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -1323,7 +1356,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) $(am__append_86)
+CLEANFILES = $(am__append_4) $(am__append_10) $(am__append_90)
 PHONY = 
 SUBDIRS = @subdirs@ .
 srcroot = $(top_srcdir)/..
@@ -1334,23 +1367,24 @@ multilibtool_DATA = $(am__append_3) $(am__append_6) $(am__append_7) \
 	$(am__append_18) $(am__append_22) $(am__append_23) \
 	$(am__append_26) $(am__append_29) $(am__append_32) \
 	$(am__append_36) $(am__append_38) $(am__append_41) \
-	$(am__append_42) $(am__append_43) $(am__append_46) \
-	$(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_74) $(am__append_77) \
-	$(am__append_82) $(am__append_88) $(am__append_91) \
-	$(am__append_93) $(am__append_97)
+	$(am__append_42) $(am__append_45) $(am__append_46) \
+	$(am__append_47) $(am__append_50) $(am__append_54) \
+	$(am__append_55) $(am__append_56) $(am__append_61) \
+	$(am__append_62) $(am__append_65) $(am__append_68) \
+	$(am__append_71) $(am__append_73) $(am__append_75) \
+	$(am__append_78) $(am__append_81) $(am__append_86) \
+	$(am__append_92) $(am__append_95) $(am__append_97) \
+	$(am__append_101)
 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) \
 	$(am__append_31) $(am__append_33) $(am__append_37) \
-	$(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_76) \
-	$(am__append_79) $(am__append_84) $(am__append_90) \
-	$(am__append_92)
+	$(am__append_39) $(am__append_44) $(am__append_49) \
+	$(am__append_52) $(am__append_58) $(am__append_59) \
+	$(am__append_64) $(am__append_67) $(am__append_70) \
+	$(am__append_72) $(am__append_74) $(am__append_77) \
+	$(am__append_80) $(am__append_83) $(am__append_88) \
+	$(am__append_94) $(am__append_96)
 includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_16)
 includesystooldir = $(tooldir)/include/sys
@@ -1368,10 +1402,11 @@ AM_LDFLAGS = $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$(subst /
 noinst_LIBRARIES = libobjs.a
 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_75) \
-	$(am__append_78) $(am__append_83) $(am__append_89)
+	$(am__append_40) $(am__append_43) $(am__append_48) \
+	$(am__append_51) $(am__append_57) $(am__append_63) \
+	$(am__append_66) $(am__append_69) $(am__append_76) \
+	$(am__append_79) $(am__append_82) $(am__append_87) \
+	$(am__append_93)
 FLAGS_TO_PASS = \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -1590,6 +1625,32 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 @CONFIG_LM32_TRUE@	lm32/isatty.c \
 @CONFIG_LM32_TRUE@	lm32/scall.S
 
+@CONFIG_M32R_TRUE@m32r_common_lib_sources = \
+@CONFIG_M32R_TRUE@	m32r/chmod.c \
+@CONFIG_M32R_TRUE@	m32r/close.c \
+@CONFIG_M32R_TRUE@	m32r/exit.c \
+@CONFIG_M32R_TRUE@	m32r/fstat.c \
+@CONFIG_M32R_TRUE@	m32r/getpid.c \
+@CONFIG_M32R_TRUE@	m32r/isatty.c \
+@CONFIG_M32R_TRUE@	m32r/kill.c \
+@CONFIG_M32R_TRUE@	m32r/lseek.c \
+@CONFIG_M32R_TRUE@	m32r/open.c \
+@CONFIG_M32R_TRUE@	m32r/raise.c \
+@CONFIG_M32R_TRUE@	m32r/read.c \
+@CONFIG_M32R_TRUE@	m32r/sbrk.c \
+@CONFIG_M32R_TRUE@	m32r/stat.c \
+@CONFIG_M32R_TRUE@	m32r/unlink.c \
+@CONFIG_M32R_TRUE@	m32r/utime.c \
+@CONFIG_M32R_TRUE@	m32r/write.c
+
+@CONFIG_M32R_TRUE@m32r_libgloss_a_SOURCES = \
+@CONFIG_M32R_TRUE@	m32r/trap0.S \
+@CONFIG_M32R_TRUE@	$(m32r_common_lib_sources)
+
+@CONFIG_M32R_TRUE@m32r_libmon_a_SOURCES = \
+@CONFIG_M32R_TRUE@	m32r/trapmon0.c \
+@CONFIG_M32R_TRUE@	$(m32r_common_lib_sources)
+
 @CONFIG_MCORE_TRUE@mcore_common_lib_sources = \
 @CONFIG_MCORE_TRUE@	mcore/fstat.c \
 @CONFIG_MCORE_TRUE@	mcore/getpid.c \
@@ -1969,19 +2030,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_94) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_98)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_98) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_102)
 @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_95) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_99)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_99) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_103)
 @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_96) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_100)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_100) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_104)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c
 
@@ -1994,7 +2055,7 @@ all: config.h
 .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)/rl78/Makefile.inc $(srcdir)/rx/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xstormy16/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)/m32r/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)/rl78/Makefile.inc $(srcdir)/rx/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*) \
@@ -2016,7 +2077,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)/rl78/Makefile.inc $(srcdir)/rx/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xstormy16/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)/m32r/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)/rl78/Makefile.inc $(srcdir)/rx/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
@@ -2043,8 +2104,6 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 epiphany/Makefile: $(top_builddir)/config.status $(top_srcdir)/epiphany/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-m32r/Makefile: $(top_builddir)/config.status $(top_srcdir)/m32r/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 m68hc11/Makefile: $(top_builddir)/config.status $(top_srcdir)/m68hc11/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 m68k/Makefile: $(top_builddir)/config.status $(top_srcdir)/m68k/Makefile.in
@@ -2531,6 +2590,18 @@ lm32/$(DEPDIR)/$(am__dirstamp):
 	@: > lm32/$(DEPDIR)/$(am__dirstamp)
 lm32/crt0.$(OBJEXT): lm32/$(am__dirstamp) \
 	lm32/$(DEPDIR)/$(am__dirstamp)
+m32r/$(am__dirstamp):
+	@$(MKDIR_P) m32r
+	@: > m32r/$(am__dirstamp)
+m32r/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) m32r/$(DEPDIR)
+	@: > m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/crt0.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/m32r-lib.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/m32r-stub.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
 mcore/$(am__dirstamp):
 	@$(MKDIR_P) mcore
 	@: > mcore/$(am__dirstamp)
@@ -2654,6 +2725,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
+m32r/trap0.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/chmod.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/close.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/exit.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/fstat.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/getpid.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/isatty.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/kill.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/lseek.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/open.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/raise.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/read.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/sbrk.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/stat.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/unlink.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/utime.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+m32r/write.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+
+m32r/libgloss.a: $(m32r_libgloss_a_OBJECTS) $(m32r_libgloss_a_DEPENDENCIES) $(EXTRA_m32r_libgloss_a_DEPENDENCIES) m32r/$(am__dirstamp)
+	$(AM_V_at)-rm -f m32r/libgloss.a
+	$(AM_V_AR)$(m32r_libgloss_a_AR) m32r/libgloss.a $(m32r_libgloss_a_OBJECTS) $(m32r_libgloss_a_LIBADD)
+	$(AM_V_at)$(RANLIB) m32r/libgloss.a
+m32r/trapmon0.$(OBJEXT): m32r/$(am__dirstamp) \
+	m32r/$(DEPDIR)/$(am__dirstamp)
+
+m32r/libmon.a: $(m32r_libmon_a_OBJECTS) $(m32r_libmon_a_DEPENDENCIES) $(EXTRA_m32r_libmon_a_DEPENDENCIES) m32r/$(am__dirstamp)
+	$(AM_V_at)-rm -f m32r/libmon.a
+	$(AM_V_AR)$(m32r_libmon_a_AR) m32r/libmon.a $(m32r_libmon_a_OBJECTS) $(m32r_libmon_a_LIBADD)
+	$(AM_V_at)$(RANLIB) m32r/libmon.a
 mcore/open.$(OBJEXT): mcore/$(am__dirstamp) \
 	mcore/$(DEPDIR)/$(am__dirstamp)
 mcore/close.$(OBJEXT): mcore/$(am__dirstamp) \
@@ -3569,6 +3686,7 @@ mostlyclean-compile:
 	-rm -f iq2000/*.$(OBJEXT)
 	-rm -f libnosys/*.$(OBJEXT)
 	-rm -f lm32/*.$(OBJEXT)
+	-rm -f m32r/*.$(OBJEXT)
 	-rm -f mcore/*.$(OBJEXT)
 	-rm -f mn10200/*.$(OBJEXT)
 	-rm -f mn10300/*.$(OBJEXT)
@@ -3732,6 +3850,27 @@ 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@m32r/$(DEPDIR)/chmod.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/close.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/crt0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/exit.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/fstat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/getpid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/isatty.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/kill.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/lseek.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/m32r-lib.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/m32r-stub.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/open.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/raise.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/read.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/sbrk.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/stat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/trap0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/trapmon0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/unlink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/utime.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@m32r/$(DEPDIR)/write.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mcore/$(DEPDIR)/close.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mcore/$(DEPDIR)/cmb-exit.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@mcore/$(DEPDIR)/cmb-inbyte.Po@am__quote@
@@ -6865,6 +7004,8 @@ distclean-generic:
 	-rm -f libnosys/$(am__dirstamp)
 	-rm -f lm32/$(DEPDIR)/$(am__dirstamp)
 	-rm -f lm32/$(am__dirstamp)
+	-rm -f m32r/$(DEPDIR)/$(am__dirstamp)
+	-rm -f m32r/$(am__dirstamp)
 	-rm -f mcore/$(DEPDIR)/$(am__dirstamp)
 	-rm -f mcore/$(am__dirstamp)
 	-rm -f mn10200/$(DEPDIR)/$(am__dirstamp)
@@ -6910,7 +7051,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) 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) rl78/$(DEPDIR) rx/$(DEPDIR) v850/$(DEPDIR) xstormy16/$(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) m32r/$(DEPDIR) mcore/$(DEPDIR) mn10200/$(DEPDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nds32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) rl78/$(DEPDIR) rx/$(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
@@ -7053,7 +7194,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) rl78/$(DEPDIR) rx/$(DEPDIR) v850/$(DEPDIR) xstormy16/$(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) m32r/$(DEPDIR) mcore/$(DEPDIR) mn10200/$(DEPDIR) mn10300/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nds32/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) rl78/$(DEPDIR) rx/$(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
diff --git a/libgloss/configure b/libgloss/configure
index 245558edf..5aa46f002 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -672,6 +672,8 @@ CONFIG_MN10200_FALSE
 CONFIG_MN10200_TRUE
 CONFIG_MCORE_FALSE
 CONFIG_MCORE_TRUE
+CONFIG_M32R_FALSE
+CONFIG_M32R_TRUE
 CONFIG_LM32_FALSE
 CONFIG_LM32_TRUE
 CONFIG_LIBNOSYS_FALSE
@@ -2811,9 +2813,7 @@ case "${target}" in
 	config_i386=true
 	;;
   m32r-*-*)
-	ac_config_files="$ac_config_files m32r/Makefile"
-
-	subdirs="$subdirs m32r"
+	config_m32r=true
 	;;
   m68hc11-*-* | m6811-*-* | m68hc12-*-* | m6812-*-*)
 	ac_config_files="$ac_config_files m68hc11/Makefile"
@@ -3096,6 +3096,14 @@ else
   CONFIG_LM32_FALSE=
 fi
 
+   if test x$config_m32r = xtrue; then
+  CONFIG_M32R_TRUE=
+  CONFIG_M32R_FALSE='#'
+else
+  CONFIG_M32R_TRUE='#'
+  CONFIG_M32R_FALSE=
+fi
+
    if test x$config_mcore = xtrue; then
   CONFIG_MCORE_TRUE=
   CONFIG_MCORE_FALSE='#'
@@ -5723,6 +5731,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_M32R_TRUE}" && test -z "${CONFIG_M32R_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_M32R\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_MCORE_TRUE}" && test -z "${CONFIG_MCORE_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_MCORE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6428,7 +6440,6 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "epiphany/Makefile") CONFIG_FILES="$CONFIG_FILES epiphany/Makefile" ;;
-    "m32r/Makefile") CONFIG_FILES="$CONFIG_FILES m32r/Makefile" ;;
     "m68hc11/Makefile") CONFIG_FILES="$CONFIG_FILES m68hc11/Makefile" ;;
     "m68k/Makefile") CONFIG_FILES="$CONFIG_FILES m68k/Makefile" ;;
     "pa/Makefile") CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;;
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 0b2cb8d6e..498bde2b7 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -66,8 +66,7 @@ case "${target}" in
 	config_i386=true
 	;;
   m32r-*-*)
-	AC_CONFIG_FILES([m32r/Makefile])
-	subdirs="$subdirs m32r"
+	config_m32r=true
 	;;
   m68hc11-*-* | m6811-*-* | m68hc12-*-* | m6812-*-*)
 	AC_CONFIG_FILES([m68hc11/Makefile])
@@ -236,7 +235,7 @@ 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 frv i386 i960 iq2000 libnosys lm32
-  mcore mn10200 mn10300 moxie msp430
+  m32r mcore mn10200 mn10300 moxie msp430
   nds32 nios2 riscv rl78 rx v850 wince xstormy16 xtensa
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
diff --git a/libgloss/m32r/Makefile.in b/libgloss/m32r/Makefile.in
deleted file mode 100644
index 786502eb8..000000000
--- a/libgloss/m32r/Makefile.in
+++ /dev/null
@@ -1,141 +0,0 @@
-# Makefile for libgloss/m32r
-# Copyright (c) 1996, 1998 Cygnus Support.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms are permitted
-# provided that the above copyright notice and this paragraph are
-# duplicated in all such forms and that any documentation,
-# and/or other materials related to such
-# distribution and use acknowledge that the software was developed
-# at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
-# endorse or promote products derived from this software without
-# specific prior written permission.
-# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-DESTDIR =
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-tooldir = $(exec_prefix)/$(target_alias)
-
-TOP = ../..
-SRCTOP = ../..
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTISRCTOP =
-MULTIBUILDTOP =
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-SHELL = /bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-RANLIB = @RANLIB@
-
-AR_FLAGS = qv
-BISON = bison
-MAKEINFO = makeinfo
-
-.NOEXPORT:
-MAKEOVERRIDES=
-
-TARGETDOC = ../../targetdep.tex
-
-CRT0 = crt0.o
-GDBLIB = m32r-lib.o
-GDBSTUB = m32r-stub.o
-EVASCRIPT = eva.ld
-STUBSCRIPT = eva-stub.ld
-
-GENERIC_LIBOBJS = \
-	chmod.o close.o exit.o fstat.o getpid.o isatty.o kill.o lseek.o \
-	open.o raise.o read.o sbrk.o stat.o unlink.o utime.o write.o
-
-LIBOBJS = trap0.o $(GENERIC_LIBOBJS)
-LIBGLOSS = libgloss.a
-
-MONLIBOBJS = trapmon0.o $(GENERIC_LIBOBJS)
-MONLIBGLOSS = libmon.a
-MONSPECS = mon.specs
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0) $(LIBGLOSS) $(MONLIBGLOSS) $(GDBLIB) $(GDBSTUB)
-
-libgloss.a: $(LIBOBJS)
-	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
-	$(RANLIB) $@
-
-libmon.a: $(MONLIBOBJS)
-	$(AR) $(ARFLAGS) $@ $(MONLIBOBJS)
-	$(RANLIB) $@
-
-install:
-	mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
-	$(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	$(INSTALL_DATA) $(LIBGLOSS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(LIBGLOSS)
-	$(INSTALL_DATA) $(MONLIBGLOSS) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(MONLIBGLOSS)
-	$(INSTALL_DATA) $(GDBLIB) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(GDBLIB)
-	$(INSTALL_DATA) $(GDBSTUB) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(GDBSTUB)
-	$(INSTALL_DATA) $(srcdir)/$(EVASCRIPT) $(DESTDIR)$(tooldir)/lib/$(EVASCRIPT)
-	$(INSTALL_DATA) $(srcdir)/$(STUBSCRIPT) $(DESTDIR)$(tooldir)/lib/$(STUBSCRIPT)
-	$(INSTALL_DATA) $(srcdir)/$(MONSPECS) $(DESTDIR)$(tooldir)/lib/$(MONSPECS)
-
-clean mostlyclean:
-	rm -f *~ *.[oa]
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile
-
-info doc:
-install-info:
-clean-info:
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status
-
-# to support SunOS VPATH
-crt0.o: crt0.S
-m32r-lib.o: m32r-lib.c
-m32r-stub.o: m32r-stub.c
-chmod.o: chmod.c
-close.o: close.c
-exit.o: exit.c
-fstat.o: fstat.c
-getpid.o: getpid.c
-isatty.o: isatty.c
-kill.o: kill.c
-lseek.o: lseek.c
-open.o: open.c
-raise.o: raise.c
-read.o: read.c
-sbrk.o: sbrk.c
-stat.o: stat.c
-unlink.o: unlink.c
-utime.o: utime.c
-write.o: write.c
-trap0.o: trap0.S
-trapmon0.o: trapmon0.c
diff --git a/libgloss/m32r/Makefile.inc b/libgloss/m32r/Makefile.inc
new file mode 100644
index 000000000..7870cf889
--- /dev/null
+++ b/libgloss/m32r/Makefile.inc
@@ -0,0 +1,60 @@
+## Makefile for libgloss/m32r
+## Copyright (c) 1996, 1998 Cygnus Support.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms are permitted
+## provided that the above copyright notice and this paragraph are
+## duplicated in all such forms and that any documentation,
+## and/or other materials related to such
+## distribution and use acknowledge that the software was developed
+## at Cygnus Support, Inc.  Cygnus Support, Inc. may not be used to
+## endorse or promote products derived from this software without
+## specific prior written permission.
+## THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+## IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+## WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+if !HAVE_MULTISUBDIR
+multilibtool_DATA += \
+	%D%/eva.ld \
+	%D%/eva-stub.ld \
+	%D%/mon.specs
+endif
+
+multilibtool_DATA += %D%/crt0.o
+libobjs_a_SOURCES += %D%/crt0.S
+
+%C%_common_lib_sources = \
+	%D%/chmod.c \
+	%D%/close.c \
+	%D%/exit.c \
+	%D%/fstat.c \
+	%D%/getpid.c \
+	%D%/isatty.c \
+	%D%/kill.c \
+	%D%/lseek.c \
+	%D%/open.c \
+	%D%/raise.c \
+	%D%/read.c \
+	%D%/sbrk.c \
+	%D%/stat.c \
+	%D%/unlink.c \
+	%D%/utime.c \
+	%D%/write.c
+
+multilibtool_LIBRARIES += %D%/libgloss.a
+%C%_libgloss_a_SOURCES = \
+	%D%/trap0.S \
+	$(%C%_common_lib_sources)
+
+multilibtool_LIBRARIES += %D%/libmon.a
+%C%_libmon_a_SOURCES = \
+	%D%/trapmon0.c \
+	$(%C%_common_lib_sources)
+
+multilibtool_DATA += \
+	%D%/m32r-lib.o \
+	%D%/m32r-stub.o
+libobjs_a_SOURCES += \
+	%D%/m32r-lib.c \
+	%D%/m32r-stub.c