libgloss: merge i386 into top-level Makefile

Avoid a recursive make to speed things up a bit.
A i386-elf build shows installed objects & libs produce same code other
than a rename from cygmon-gmon.o & cygmon-salib.o to i386_libcygmon_a-*.o
due to the use of custom CPPFLAGS in here.

6 files changed, 210 insertions, 234 deletions

diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am
index 1b5a86a48..73fb8e481 100644
--- a/libgloss/Makefile.am
+++ b/libgloss/Makefile.am
@@ -100,6 +100,9 @@ endif
 if CONFIG_FRV
 include frv/Makefile.inc
 endif
+if CONFIG_I386
+include i386/Makefile.inc
+endif
 if CONFIG_I960
 include i960/Makefile.inc
 endif
diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in
index 11eb7239f..1ee0ace37 100644
--- a/libgloss/Makefile.in
+++ b/libgloss/Makefile.in
@@ -170,60 +170,63 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 @CONFIG_FRV_TRUE@am__append_23 = frv/crt0.o
 @CONFIG_FRV_TRUE@am__append_24 = frv/crt0.S
 @CONFIG_FRV_TRUE@am__append_25 = frv/libsim.a
-@CONFIG_I960_TRUE@am__append_26 = i960/crt0.o i960/mon960.ld
-@CONFIG_I960_TRUE@am__append_27 = \
+@CONFIG_I386_TRUE@am__append_26 = i386/cygmon.ld i386/cygmon-crt0.o
+@CONFIG_I386_TRUE@am__append_27 = i386/cygmon-crt0.S
+@CONFIG_I386_TRUE@am__append_28 = i386/libcygmon.a
+@CONFIG_I960_TRUE@am__append_29 = i960/crt0.o i960/mon960.ld
+@CONFIG_I960_TRUE@am__append_30 = \
 @CONFIG_I960_TRUE@	i960/crt0.c
 
-@CONFIG_I960_TRUE@am__append_28 = i960/libmon960.a
-@CONFIG_IQ2000_TRUE@am__append_29 = iq2000/crt0.o iq2000/sim.ld
-@CONFIG_IQ2000_TRUE@am__append_30 = iq2000/libeval.a
-@CONFIG_IQ2000_TRUE@am__append_31 = iq2000/crt0.S iq2000/test.o
-@CONFIG_IQ2000_TRUE@am__append_32 = iq2000/test
-@CONFIG_LIBNOSYS_TRUE@am__append_33 = libnosys/nosys.specs
-@CONFIG_LIBNOSYS_TRUE@am__append_34 = libnosys/libnosys.a
-@CONFIG_LM32_TRUE@am__append_35 = lm32/crt0.o lm32/sim.ld
-@CONFIG_LM32_TRUE@am__append_36 = lm32/libgloss.a
-@CONFIG_LM32_TRUE@am__append_37 = lm32/crt0.S
-@CONFIG_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_38 = \
+@CONFIG_I960_TRUE@am__append_31 = i960/libmon960.a
+@CONFIG_IQ2000_TRUE@am__append_32 = iq2000/crt0.o iq2000/sim.ld
+@CONFIG_IQ2000_TRUE@am__append_33 = iq2000/libeval.a
+@CONFIG_IQ2000_TRUE@am__append_34 = iq2000/crt0.S iq2000/test.o
+@CONFIG_IQ2000_TRUE@am__append_35 = iq2000/test
+@CONFIG_LIBNOSYS_TRUE@am__append_36 = libnosys/nosys.specs
+@CONFIG_LIBNOSYS_TRUE@am__append_37 = libnosys/libnosys.a
+@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_MOXIE_TRUE@@HAVE_MULTISUBDIR_FALSE@am__append_41 = \
 @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_39 = moxie/crt0.o
-@CONFIG_MOXIE_TRUE@am__append_40 = \
+@CONFIG_MOXIE_TRUE@@MOXIE_BUILD_CRT0_TRUE@am__append_42 = moxie/crt0.o
+@CONFIG_MOXIE_TRUE@am__append_43 = \
 @CONFIG_MOXIE_TRUE@	moxie/crt0.S
 
-@CONFIG_MOXIE_TRUE@am__append_41 = moxie/libsim.a moxie/libqemu.a
-@CONFIG_MSP430_TRUE@am__append_42 = msp430/msp430-sim.ld \
+@CONFIG_MOXIE_TRUE@am__append_44 = moxie/libsim.a moxie/libqemu.a
+@CONFIG_MSP430_TRUE@am__append_45 = 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_43 = \
+@CONFIG_MSP430_TRUE@am__append_46 = \
 @CONFIG_MSP430_TRUE@	msp430/gcrt0.S \
 @CONFIG_MSP430_TRUE@	msp430/crt0.S
 
-@CONFIG_MSP430_TRUE@am__append_44 = msp430/libsim.a msp430/libnosys.a \
+@CONFIG_MSP430_TRUE@am__append_47 = msp430/libsim.a msp430/libnosys.a \
 @CONFIG_MSP430_TRUE@	msp430/libcrt.a
-@CONFIG_NIOS2_TRUE@am__append_45 = \
+@CONFIG_NIOS2_TRUE@am__append_48 = \
 @CONFIG_NIOS2_TRUE@	nios2/qemu-hosted.ld
 
-@CONFIG_NIOS2_TRUE@am__append_46 = nios2/libnios2.a
-@CONFIG_RISCV_TRUE@am__append_47 = \
+@CONFIG_NIOS2_TRUE@am__append_49 = nios2/libnios2.a
+@CONFIG_RISCV_TRUE@am__append_50 = \
 @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_48 = riscv/libgloss.a riscv/libsim.a \
+@CONFIG_RISCV_TRUE@am__append_51 = riscv/libgloss.a riscv/libsim.a \
 @CONFIG_RISCV_TRUE@	riscv/libsemihost.a
-@CONFIG_V850_TRUE@am__append_49 = v850/crt0.o
-@CONFIG_V850_TRUE@am__append_50 = v850/crt0.S
-@CONFIG_V850_TRUE@am__append_51 = v850/libsim.a
-@CONFIG_WINCE_TRUE@am__append_52 = $(gdbdir)
-@CONFIG_WINCE_TRUE@am__append_53 = wince/stub.exe
-@CONFIG_XTENSA_TRUE@am__append_54 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
-@CONFIG_XTENSA_TRUE@am__append_55 = \
+@CONFIG_V850_TRUE@am__append_52 = v850/crt0.o
+@CONFIG_V850_TRUE@am__append_53 = v850/crt0.S
+@CONFIG_V850_TRUE@am__append_54 = v850/libsim.a
+@CONFIG_WINCE_TRUE@am__append_55 = $(gdbdir)
+@CONFIG_WINCE_TRUE@am__append_56 = wince/stub.exe
+@CONFIG_XTENSA_TRUE@am__append_57 = -D_LIBGLOSS -I$(srcdir)/xtensa/include
+@CONFIG_XTENSA_TRUE@am__append_58 = \
 @CONFIG_XTENSA_TRUE@	xtensa/default.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/nano.specs \
 @CONFIG_XTENSA_TRUE@	xtensa/sim.elf.specs \
@@ -232,27 +235,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_56 = \
+@CONFIG_XTENSA_TRUE@am__append_59 = \
 @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_57 = xtensa/libgloss.a
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_58 = \
+@CONFIG_XTENSA_TRUE@am__append_60 = xtensa/libgloss.a
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_61 = \
 @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_59 = xtensa/libsys_qemu.a \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_62 = 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_60 = xtensa/boards/esp32/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_61 = xtensa/boards/esp32/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_62 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_63 = -I$(srcdir)/xtensa/boards/esp32/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_64 = xtensa/boards/esp32s3/memory.elf.ld
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_65 = xtensa/boards/esp32s3/board.c
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_66 = -I$(srcdir)/xtensa/boards/esp32s3/include
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_67 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_63 = xtensa/boards/esp32/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_64 = xtensa/boards/esp32/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_65 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_66 = -I$(srcdir)/xtensa/boards/esp32/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_67 = xtensa/boards/esp32s3/memory.elf.ld
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_68 = xtensa/boards/esp32s3/board.c
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_69 = -I$(srcdir)/xtensa/boards/esp32s3/include
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__append_70 = -I$(srcdir)/xtensa/boards/esp32s3/include
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -277,15 +280,14 @@ 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 i386/Makefile m32r/Makefile \
-	m68hc11/Makefile nds32/Makefile m68k/Makefile pa/Makefile \
-	sparc_leon/Makefile sparc/Makefile mips/Makefile \
-	rs6000/Makefile mn10200/Makefile mn10300/Makefile \
-	cr16/Makefile cris/Makefile crx/Makefile fr30/Makefile \
-	ft32/Makefile mcore/Makefile mep/Makefile microblaze/Makefile \
-	mt/Makefile visium/Makefile xc16x/Makefile xstormy16/Makefile \
-	m32c/Makefile rl78/Makefile rx/Makefile spu/Makefile \
-	tic6x/Makefile or1k/Makefile pru/Makefile \
+CONFIG_CLEAN_FILES = epiphany/Makefile m32r/Makefile m68hc11/Makefile \
+	nds32/Makefile m68k/Makefile pa/Makefile sparc_leon/Makefile \
+	sparc/Makefile mips/Makefile rs6000/Makefile mn10200/Makefile \
+	mn10300/Makefile cr16/Makefile cris/Makefile crx/Makefile \
+	fr30/Makefile ft32/Makefile mcore/Makefile mep/Makefile \
+	microblaze/Makefile mt/Makefile visium/Makefile xc16x/Makefile \
+	xstormy16/Makefile m32c/Makefile rl78/Makefile rx/Makefile \
+	spu/Makefile tic6x/Makefile or1k/Makefile pru/Makefile \
 	sparc/libsys/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -438,6 +440,11 @@ frv_libsim_a_LIBADD =
 @CONFIG_FRV_TRUE@	frv/sim-unlink.$(OBJEXT) \
 @CONFIG_FRV_TRUE@	frv/sim-write.$(OBJEXT) frv/stat.$(OBJEXT)
 frv_libsim_a_OBJECTS = $(am_frv_libsim_a_OBJECTS)
+i386_libcygmon_a_AR = $(AR) $(ARFLAGS)
+i386_libcygmon_a_LIBADD =
+@CONFIG_I386_TRUE@am_i386_libcygmon_a_OBJECTS = i386/i386_libcygmon_a-cygmon-salib.$(OBJEXT) \
+@CONFIG_I386_TRUE@	i386/i386_libcygmon_a-cygmon-gmon.$(OBJEXT)
+i386_libcygmon_a_OBJECTS = $(am_i386_libcygmon_a_OBJECTS)
 i960_libmon960_a_AR = $(AR) $(ARFLAGS)
 i960_libmon960_a_LIBADD =
 @CONFIG_I960_TRUE@am_i960_libmon960_a_OBJECTS = putnum.$(OBJEXT) \
@@ -505,20 +512,21 @@ libobjs_a_LIBADD =
 @CONFIG_BFIN_TRUE@	bfin/basiccrt.$(OBJEXT)
 @CONFIG_CSKY_TRUE@am__objects_4 = csky/crt0.$(OBJEXT)
 @CONFIG_FRV_TRUE@am__objects_5 = frv/crt0.$(OBJEXT)
-@CONFIG_I960_TRUE@am__objects_6 = i960/crt0.$(OBJEXT)
-@CONFIG_IQ2000_TRUE@am__objects_7 = iq2000/crt0.$(OBJEXT)
-@CONFIG_LM32_TRUE@am__objects_8 = lm32/crt0.$(OBJEXT)
-@CONFIG_MOXIE_TRUE@am__objects_9 = moxie/crt0.$(OBJEXT)
-@CONFIG_MSP430_TRUE@am__objects_10 = msp430/gcrt0.$(OBJEXT) \
+@CONFIG_I386_TRUE@am__objects_6 = i386/cygmon-crt0.$(OBJEXT)
+@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_MOXIE_TRUE@am__objects_10 = moxie/crt0.$(OBJEXT)
+@CONFIG_MSP430_TRUE@am__objects_11 = msp430/gcrt0.$(OBJEXT) \
 @CONFIG_MSP430_TRUE@	msp430/crt0.$(OBJEXT)
-@CONFIG_V850_TRUE@am__objects_11 = v850/crt0.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@am__objects_12 = xtensa/crt0.$(OBJEXT) \
+@CONFIG_V850_TRUE@am__objects_12 = v850/crt0.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@am__objects_13 = 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_9) $(am__objects_10) \
-	$(am__objects_11) $(am__objects_12)
+	$(am__objects_11) $(am__objects_12) $(am__objects_13)
 libobjs_a_OBJECTS = $(am_libobjs_a_OBJECTS)
 lm32_libgloss_a_AR = $(AR) $(ARFLAGS)
 lm32_libgloss_a_LIBADD =
@@ -679,7 +687,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_13 =  \
+@CONFIG_RISCV_TRUE@am__objects_14 =  \
 @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) \
@@ -712,7 +720,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_13)
+@CONFIG_RISCV_TRUE@am_riscv_libsim_a_OBJECTS = $(am__objects_14)
 riscv_libsim_a_OBJECTS = $(am_riscv_libsim_a_OBJECTS)
 v850_libsim_a_AR = $(AR) $(ARFLAGS)
 v850_libsim_a_LIBADD =
@@ -734,13 +742,13 @@ v850_libsim_a_LIBADD =
 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_14 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_15 = xtensa/boards/esp32s3/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_15 = xtensa/boards/esp32/xtensa_libgloss_a-board.$(OBJEXT)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP32S3_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@am__objects_16 = 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_14) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_15)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_15) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__objects_16)
 xtensa_libgloss_a_OBJECTS = $(am_xtensa_libgloss_a_OBJECTS)
 xtensa_libsys_openocd_a_AR = $(AR) $(ARFLAGS)
 xtensa_libsys_openocd_a_LIBADD =
@@ -810,15 +818,15 @@ SOURCES = $(aarch64_librdimon_a_SOURCES) $(arc_libnsim_a_SOURCES) \
 	$(arm_librdimon_a_SOURCES) $(arm_librdpmon_a_SOURCES) \
 	$(bfin_libbfinbsp_a_SOURCES) $(bfin_libsim_a_SOURCES) \
 	$(csky_libsemi_a_SOURCES) $(d30v_libsim_a_SOURCES) \
-	$(frv_libsim_a_SOURCES) $(i960_libmon960_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) \
-	$(msp430_libcrt_a_SOURCES) $(msp430_libnosys_a_SOURCES) \
-	$(msp430_libsim_a_SOURCES) $(nios2_libnios2_a_SOURCES) \
-	$(riscv_libgloss_a_SOURCES) $(riscv_libsemihost_a_SOURCES) \
-	$(riscv_libsim_a_SOURCES) $(v850_libsim_a_SOURCES) \
-	$(xtensa_libgloss_a_SOURCES) \
+	$(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) $(moxie_libqemu_a_SOURCES) \
+	$(moxie_libsim_a_SOURCES) $(msp430_libcrt_a_SOURCES) \
+	$(msp430_libnosys_a_SOURCES) $(msp430_libsim_a_SOURCES) \
+	$(nios2_libnios2_a_SOURCES) $(riscv_libgloss_a_SOURCES) \
+	$(riscv_libsemihost_a_SOURCES) $(riscv_libsim_a_SOURCES) \
+	$(v850_libsim_a_SOURCES) $(xtensa_libgloss_a_SOURCES) \
 	$(xtensa_libsys_openocd_a_SOURCES) \
 	$(xtensa_libsys_qemu_a_SOURCES) bfin/sim-test.c iq2000/test.c \
 	$(wince_stub_exe_SOURCES)
@@ -908,7 +916,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-VPATH = @srcdir@ $(am__append_52)
+VPATH = @srcdir@ $(am__append_55)
 AARCH64_OBJTYPE = @AARCH64_OBJTYPE@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -926,7 +934,7 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@ $(am__append_54)
+CPPFLAGS = @CPPFLAGS@ $(am__append_57)
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
@@ -1046,18 +1054,18 @@ multilibtooldir = $(tooldir)/lib$(MULTISUBDIR)
 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_26) $(am__append_29) $(am__append_33) \
-	$(am__append_35) $(am__append_38) $(am__append_39) \
-	$(am__append_42) $(am__append_45) $(am__append_47) \
-	$(am__append_49) $(am__append_55) $(am__append_58) \
-	$(am__append_60) $(am__append_64)
+	$(am__append_26) $(am__append_29) $(am__append_32) \
+	$(am__append_36) $(am__append_38) $(am__append_41) \
+	$(am__append_42) $(am__append_45) $(am__append_48) \
+	$(am__append_50) $(am__append_52) $(am__append_58) \
+	$(am__append_61) $(am__append_63) $(am__append_67)
 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_30) $(am__append_34) $(am__append_36) \
-	$(am__append_41) $(am__append_44) $(am__append_46) \
-	$(am__append_48) $(am__append_51) $(am__append_57) \
-	$(am__append_59)
+	$(am__append_31) $(am__append_33) $(am__append_37) \
+	$(am__append_39) $(am__append_44) $(am__append_47) \
+	$(am__append_49) $(am__append_51) $(am__append_54) \
+	$(am__append_60) $(am__append_62)
 includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_16)
 includesystooldir = $(tooldir)/include/sys
@@ -1074,9 +1082,9 @@ AM_LDFLAGS = $(AM_LDFLAGS_$(subst /,_,$(@D))) $(AM_LDFLAGS_$(subst -,_,$(subst /
 # to install (e.g. our crt0.o objects).
 noinst_LIBRARIES = libobjs.a
 libobjs_a_SOURCES = $(am__append_14) $(am__append_19) $(am__append_24) \
-	$(am__append_27) $(am__append_31) $(am__append_37) \
-	$(am__append_40) $(am__append_43) $(am__append_50) \
-	$(am__append_56)
+	$(am__append_27) $(am__append_30) $(am__append_34) \
+	$(am__append_40) $(am__append_43) $(am__append_46) \
+	$(am__append_53) $(am__append_59)
 FLAGS_TO_PASS = \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -1242,6 +1250,14 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 @CONFIG_FRV_TRUE@	frv/sim-write.S \
 @CONFIG_FRV_TRUE@	frv/stat.c
 
+@CONFIG_I386_TRUE@i386_libcygmon_a_SOURCES = \
+@CONFIG_I386_TRUE@	i386/cygmon-salib.c \
+@CONFIG_I386_TRUE@	i386/cygmon-gmon.c
+
+@CONFIG_I386_TRUE@i386_libcygmon_a_CPPFLAGS = \
+@CONFIG_I386_TRUE@	$(AM_CPPFLAGS) \
+@CONFIG_I386_TRUE@	$(I386_CPPFLAGS)
+
 @CONFIG_I960_TRUE@i960_libmon960_a_SOURCES = \
 @CONFIG_I960_TRUE@	putnum.c \
 @CONFIG_I960_TRUE@	unlink.c \
@@ -1477,19 +1493,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_61) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_65)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_64) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_68)
 @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_62) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_66)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_65) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_69)
 @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_63) \
-@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_67)
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_66) \
+@CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	$(am__append_70)
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@xtensa_libsys_openocd_a_SOURCES = \
 @CONFIG_XTENSA_TRUE@@HAVE_XTENSA_BOARD_ESP_TRUE@	xtensa/syscalls.c
 
@@ -1502,7 +1518,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)/frv/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/frv/Makefile.inc $(srcdir)/i386/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/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*) \
@@ -1524,7 +1540,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)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/Makefile.inc $(srcdir)/nios2/Makefile.inc $(srcdir)/riscv/Makefile.inc $(srcdir)/v850/Makefile.inc $(srcdir)/wince/Makefile.inc $(srcdir)/xtensa/Makefile.inc $(am__empty):
+$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/aarch64/Makefile.inc $(srcdir)/aarch64/cpu-init/Makefile.inc $(srcdir)/arc/Makefile.inc $(srcdir)/arm/Makefile.inc $(srcdir)/arm/cpu-init/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/csky/Makefile.inc $(srcdir)/d30v/Makefile.inc $(srcdir)/frv/Makefile.inc $(srcdir)/i386/Makefile.inc $(srcdir)/i960/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/moxie/Makefile.inc $(srcdir)/msp430/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
@@ -1551,8 +1567,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 $@
-i386/Makefile: $(top_builddir)/config.status $(top_srcdir)/i386/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
@@ -1888,6 +1902,21 @@ frv/libsim.a: $(frv_libsim_a_OBJECTS) $(frv_libsim_a_DEPENDENCIES) $(EXTRA_frv_l
 	$(AM_V_at)-rm -f frv/libsim.a
 	$(AM_V_AR)$(frv_libsim_a_AR) frv/libsim.a $(frv_libsim_a_OBJECTS) $(frv_libsim_a_LIBADD)
 	$(AM_V_at)$(RANLIB) frv/libsim.a
+i386/$(am__dirstamp):
+	@$(MKDIR_P) i386
+	@: > i386/$(am__dirstamp)
+i386/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) i386/$(DEPDIR)
+	@: > i386/$(DEPDIR)/$(am__dirstamp)
+i386/i386_libcygmon_a-cygmon-salib.$(OBJEXT): i386/$(am__dirstamp) \
+	i386/$(DEPDIR)/$(am__dirstamp)
+i386/i386_libcygmon_a-cygmon-gmon.$(OBJEXT): i386/$(am__dirstamp) \
+	i386/$(DEPDIR)/$(am__dirstamp)
+
+i386/libcygmon.a: $(i386_libcygmon_a_OBJECTS) $(i386_libcygmon_a_DEPENDENCIES) $(EXTRA_i386_libcygmon_a_DEPENDENCIES) i386/$(am__dirstamp)
+	$(AM_V_at)-rm -f i386/libcygmon.a
+	$(AM_V_AR)$(i386_libcygmon_a_AR) i386/libcygmon.a $(i386_libcygmon_a_OBJECTS) $(i386_libcygmon_a_LIBADD)
+	$(AM_V_at)$(RANLIB) i386/libcygmon.a
 i960/$(am__dirstamp):
 	@$(MKDIR_P) i960
 	@: > i960/$(am__dirstamp)
@@ -2026,6 +2055,8 @@ bfin/basiccrt.$(OBJEXT): bfin/$(am__dirstamp) \
 csky/crt0.$(OBJEXT): csky/$(am__dirstamp) \
 	csky/$(DEPDIR)/$(am__dirstamp)
 frv/crt0.$(OBJEXT): frv/$(am__dirstamp) frv/$(DEPDIR)/$(am__dirstamp)
+i386/cygmon-crt0.$(OBJEXT): i386/$(am__dirstamp) \
+	i386/$(DEPDIR)/$(am__dirstamp)
 i960/crt0.$(OBJEXT): i960/$(am__dirstamp) \
 	i960/$(DEPDIR)/$(am__dirstamp)
 iq2000/crt0.$(OBJEXT): iq2000/$(am__dirstamp) \
@@ -2619,6 +2650,7 @@ mostlyclean-compile:
 	-rm -f csky/*.$(OBJEXT)
 	-rm -f d30v/*.$(OBJEXT)
 	-rm -f frv/*.$(OBJEXT)
+	-rm -f i386/*.$(OBJEXT)
 	-rm -f i960/*.$(OBJEXT)
 	-rm -f iq2000/*.$(OBJEXT)
 	-rm -f libnosys/*.$(OBJEXT)
@@ -2721,6 +2753,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@frv/$(DEPDIR)/sim-unlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@frv/$(DEPDIR)/sim-write.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@frv/$(DEPDIR)/stat.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@i386/$(DEPDIR)/cygmon-crt0.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/crt0.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/mon-read.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@i960/$(DEPDIR)/mon-syscalls.Po@am__quote@
@@ -3684,6 +3719,34 @@ csky/csky_libsemi_a-getpid.obj: csky/getpid.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(csky_libsemi_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o csky/csky_libsemi_a-getpid.obj `if test -f 'csky/getpid.c'; then $(CYGPATH_W) 'csky/getpid.c'; else $(CYGPATH_W) '$(srcdir)/csky/getpid.c'; fi`
 
+i386/i386_libcygmon_a-cygmon-salib.o: i386/cygmon-salib.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i386/i386_libcygmon_a-cygmon-salib.o -MD -MP -MF i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Tpo -c -o i386/i386_libcygmon_a-cygmon-salib.o `test -f 'i386/cygmon-salib.c' || echo '$(srcdir)/'`i386/cygmon-salib.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Tpo i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='i386/cygmon-salib.c' object='i386/i386_libcygmon_a-cygmon-salib.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i386/i386_libcygmon_a-cygmon-salib.o `test -f 'i386/cygmon-salib.c' || echo '$(srcdir)/'`i386/cygmon-salib.c
+
+i386/i386_libcygmon_a-cygmon-salib.obj: i386/cygmon-salib.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i386/i386_libcygmon_a-cygmon-salib.obj -MD -MP -MF i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Tpo -c -o i386/i386_libcygmon_a-cygmon-salib.obj `if test -f 'i386/cygmon-salib.c'; then $(CYGPATH_W) 'i386/cygmon-salib.c'; else $(CYGPATH_W) '$(srcdir)/i386/cygmon-salib.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Tpo i386/$(DEPDIR)/i386_libcygmon_a-cygmon-salib.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='i386/cygmon-salib.c' object='i386/i386_libcygmon_a-cygmon-salib.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i386/i386_libcygmon_a-cygmon-salib.obj `if test -f 'i386/cygmon-salib.c'; then $(CYGPATH_W) 'i386/cygmon-salib.c'; else $(CYGPATH_W) '$(srcdir)/i386/cygmon-salib.c'; fi`
+
+i386/i386_libcygmon_a-cygmon-gmon.o: i386/cygmon-gmon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i386/i386_libcygmon_a-cygmon-gmon.o -MD -MP -MF i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Tpo -c -o i386/i386_libcygmon_a-cygmon-gmon.o `test -f 'i386/cygmon-gmon.c' || echo '$(srcdir)/'`i386/cygmon-gmon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Tpo i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='i386/cygmon-gmon.c' object='i386/i386_libcygmon_a-cygmon-gmon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i386/i386_libcygmon_a-cygmon-gmon.o `test -f 'i386/cygmon-gmon.c' || echo '$(srcdir)/'`i386/cygmon-gmon.c
+
+i386/i386_libcygmon_a-cygmon-gmon.obj: i386/cygmon-gmon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT i386/i386_libcygmon_a-cygmon-gmon.obj -MD -MP -MF i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Tpo -c -o i386/i386_libcygmon_a-cygmon-gmon.obj `if test -f 'i386/cygmon-gmon.c'; then $(CYGPATH_W) 'i386/cygmon-gmon.c'; else $(CYGPATH_W) '$(srcdir)/i386/cygmon-gmon.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Tpo i386/$(DEPDIR)/i386_libcygmon_a-cygmon-gmon.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='i386/cygmon-gmon.c' object='i386/i386_libcygmon_a-cygmon-gmon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(i386_libcygmon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o i386/i386_libcygmon_a-cygmon-gmon.obj `if test -f 'i386/cygmon-gmon.c'; then $(CYGPATH_W) 'i386/cygmon-gmon.c'; else $(CYGPATH_W) '$(srcdir)/i386/cygmon-gmon.c'; fi`
+
 nios2/nios2_libnios2_a-io-close.o: nios2/io-close.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(nios2_libnios2_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT nios2/nios2_libnios2_a-io-close.o -MD -MP -MF nios2/$(DEPDIR)/nios2_libnios2_a-io-close.Tpo -c -o nios2/nios2_libnios2_a-io-close.o `test -f 'nios2/io-close.c' || echo '$(srcdir)/'`nios2/io-close.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) nios2/$(DEPDIR)/nios2_libnios2_a-io-close.Tpo nios2/$(DEPDIR)/nios2_libnios2_a-io-close.Po
@@ -5703,6 +5766,8 @@ distclean-generic:
 	-rm -f doc/$(am__dirstamp)
 	-rm -f frv/$(DEPDIR)/$(am__dirstamp)
 	-rm -f frv/$(am__dirstamp)
+	-rm -f i386/$(DEPDIR)/$(am__dirstamp)
+	-rm -f i386/$(am__dirstamp)
 	-rm -f i960/$(DEPDIR)/$(am__dirstamp)
 	-rm -f i960/$(am__dirstamp)
 	-rm -f iq2000/$(DEPDIR)/$(am__dirstamp)
@@ -5741,7 +5806,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) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) frv/$(DEPDIR) i386/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) msp430/$(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
@@ -5884,7 +5949,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) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) msp430/$(DEPDIR) nios2/$(DEPDIR) riscv/$(DEPDIR) v850/$(DEPDIR) xtensa/$(DEPDIR) xtensa/boards/esp32/$(DEPDIR) xtensa/boards/esp32s3/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) aarch64/$(DEPDIR) arc/$(DEPDIR) arm/$(DEPDIR) bfin/$(DEPDIR) csky/$(DEPDIR) d30v/$(DEPDIR) frv/$(DEPDIR) i386/$(DEPDIR) i960/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR) moxie/$(DEPDIR) msp430/$(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 82a44cfed..2a1005304 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -663,6 +663,8 @@ CONFIG_IQ2000_FALSE
 CONFIG_IQ2000_TRUE
 CONFIG_I960_FALSE
 CONFIG_I960_TRUE
+CONFIG_I386_FALSE
+CONFIG_I386_TRUE
 CONFIG_FRV_FALSE
 CONFIG_FRV_TRUE
 CONFIG_D30V_FALSE
@@ -2789,9 +2791,7 @@ case "${target}" in
 	config_testsuite=true
 	;;
   i[3456]86-*-elf* | i[3456]86-*-coff*)
-	ac_config_files="$ac_config_files i386/Makefile"
-
-	subdirs="$subdirs i386"
+	config_i386=true
 	;;
   m32r-*-*)
 	ac_config_files="$ac_config_files m32r/Makefile"
@@ -3055,6 +3055,14 @@ else
   CONFIG_FRV_FALSE=
 fi
 
+   if test x$config_i386 = xtrue; then
+  CONFIG_I386_TRUE=
+  CONFIG_I386_FALSE='#'
+else
+  CONFIG_I386_TRUE='#'
+  CONFIG_I386_FALSE=
+fi
+
    if test x$config_i960 = xtrue; then
   CONFIG_I960_TRUE=
   CONFIG_I960_FALSE='#'
@@ -5622,6 +5630,10 @@ if test -z "${CONFIG_FRV_TRUE}" && test -z "${CONFIG_FRV_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_FRV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_I386_TRUE}" && test -z "${CONFIG_I386_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_I386\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_I960_TRUE}" && test -z "${CONFIG_I960_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_I960\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6303,7 +6315,6 @@ do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "epiphany/Makefile") CONFIG_FILES="$CONFIG_FILES epiphany/Makefile" ;;
-    "i386/Makefile") CONFIG_FILES="$CONFIG_FILES i386/Makefile" ;;
     "m32r/Makefile") CONFIG_FILES="$CONFIG_FILES m32r/Makefile" ;;
     "m68hc11/Makefile") CONFIG_FILES="$CONFIG_FILES m68hc11/Makefile" ;;
     "nds32/Makefile") CONFIG_FILES="$CONFIG_FILES nds32/Makefile" ;;
diff --git a/libgloss/configure.ac b/libgloss/configure.ac
index 1214e890a..0f768947c 100644
--- a/libgloss/configure.ac
+++ b/libgloss/configure.ac
@@ -63,8 +63,7 @@ case "${target}" in
 	config_testsuite=true
 	;;
   i[[3456]]86-*-elf* | i[[3456]]86-*-coff*)
-	AC_CONFIG_FILES([i386/Makefile])
-	subdirs="$subdirs i386"
+	config_i386=true
 	;;
   m32r-*-*)
 	AC_CONFIG_FILES([m32r/Makefile])
@@ -245,7 +244,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 frv i960 iq2000 libnosys lm32 moxie msp430
+  aarch64 arc arm bfin csky d30v frv i386 i960 iq2000 libnosys lm32 moxie msp430
   nios2 riscv v850 wince xtensa
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
diff --git a/libgloss/i386/Makefile.in b/libgloss/i386/Makefile.in
deleted file mode 100644
index 7ed0b075f..000000000
--- a/libgloss/i386/Makefile.in
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright (c) 1997, 2000 Cygnus Support
-#
-# 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.
-
-DESTDIR =
-VPATH = @srcdir@
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-host_alias = @host_alias@
-target_alias = @target_alias@
-program_transform_name = @program_transform_name@
-
-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@
-AS = `if [ -f ${objroot}/../gas/as.new ] ; \
-	then echo ${objroot}/../gas/as.new ; \
-	else echo as ; fi`
-
-AR = @AR@
-
-#LD = @LD@
-LD = `if [ -f ${objroot}/../ld/ld.new ] ; \
-	then echo ${objroot}/../ld/ld.new ; \
-	else echo ld ; fi`
-
-RANLIB = @RANLIB@
-
-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 = cygmon-crt0.o
-CYGMON_OBJS = cygmon-salib.o cygmon-gmon.o
-
-CFLAGS = -g
-
-GCC_LDFLAGS = `if [ -d ${objroot}/../gcc ] ; \
-	then echo -L${objroot}/../gcc ; fi`
-
-SCRIPTS = cygmon
-BSP = libcygmon.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-all: ${CRT0} ${BSP}
-
-#
-# here's where we build the board support packages for each target
-#
-libcygmon.a: $(CYGMON_OBJS)
-	${AR} ${ARFLAGS} $@ $(CYGMON_OBJS)
-	${RANLIB} $@
-
-cygmon-salib.o: ${srcdir}/cygmon-salib.c
-	$(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@
-
-cygmon-crt0.o: ${srcdir}/cygmon-crt0.S
-	$(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@
-
-doc:	
-
-clean mostlyclean:
-	rm -f a.out core *.i *~ *.o *-test *.srec *.dis *.map *.x
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile a.out
-
-.PHONY: install info install-info clean-info
-install:
-	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
-	$(INSTALL_PROGRAM) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0)
-	@for bsp in ${BSP}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) ${srcdir}/$${script}.ld $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${script}.ld; \
-	done
-
-info:
-install-info:
-clean-info:
-
-test.o:	${srcdir}/test.c
-
-# these are for the BSPs
-${CRT0}: cygmon-crt0.S
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status
diff --git a/libgloss/i386/Makefile.inc b/libgloss/i386/Makefile.inc
new file mode 100644
index 000000000..a0825611a
--- /dev/null
+++ b/libgloss/i386/Makefile.inc
@@ -0,0 +1,25 @@
+## Copyright (c) 1997, 2000 Cygnus Support
+##
+## 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%/cygmon.ld
+
+multilibtool_DATA += %D%/cygmon-crt0.o
+libobjs_a_SOURCES += %D%/cygmon-crt0.S
+
+multilibtool_LIBRARIES += %D%/libcygmon.a
+%C%_libcygmon_a_SOURCES = \
+	%D%/cygmon-salib.c \
+	%D%/cygmon-gmon.c
+%C%_libcygmon_a_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(I386_CPPFLAGS)