libgloss: merge lm32 into top-level Makefile

Avoid a recursive make to speed things up a bit.

This drops the header install logic because the lm32/ subdir doesn't
actually have any header files to install.

libgloss/Makefile.am

@@ -68,6 +68,9 @@ endif
 if CONFIG_LIBNOSYS
 include libnosys/Makefile.inc
 endif
+if CONFIG_LM32
+include lm32/Makefile.inc
+endif
 if CONFIG_WINCE
 include wince/Makefile.inc
 endif

libgloss/Makefile.in

@@ -138,8 +138,11 @@ check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3)
 @CONFIG_IQ2000_TRUE@am__append_12 = iq2000/test
 @CONFIG_LIBNOSYS_TRUE@am__append_13 = libnosys/nosys.specs
 @CONFIG_LIBNOSYS_TRUE@am__append_14 = libnosys/libnosys.a
-@CONFIG_WINCE_TRUE@am__append_15 = $(gdbdir)
+@CONFIG_LM32_TRUE@am__append_15 = lm32/crt0.o lm32/sim.ld
-@CONFIG_WINCE_TRUE@am__append_16 = wince/stub.exe
+@CONFIG_LM32_TRUE@am__append_16 = lm32/libgloss.a
+@CONFIG_LM32_TRUE@am__append_17 = lm32/crt0.S
+@CONFIG_WINCE_TRUE@am__append_18 = $(gdbdir)
+@CONFIG_WINCE_TRUE@am__append_19 = wince/stub.exe
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
@@ -167,12 +170,11 @@ CONFIG_CLEAN_FILES = arc/Makefile csky/Makefile epiphany/Makefile \
 	sparc/Makefile mips/Makefile riscv/Makefile rs6000/Makefile \
 	mn10200/Makefile mn10300/Makefile cr16/Makefile cris/Makefile \
 	crx/Makefile d30v/Makefile fr30/Makefile frv/Makefile \
-	ft32/Makefile lm32/Makefile mcore/Makefile mep/Makefile \
+	ft32/Makefile mcore/Makefile mep/Makefile moxie/Makefile \
-	moxie/Makefile microblaze/Makefile mt/Makefile v850/Makefile \
+	microblaze/Makefile mt/Makefile v850/Makefile visium/Makefile \
-	visium/Makefile xc16x/Makefile xstormy16/Makefile \
+	xc16x/Makefile xstormy16/Makefile m32c/Makefile \
-	m32c/Makefile msp430/Makefile rl78/Makefile rx/Makefile \
+	msp430/Makefile rl78/Makefile rx/Makefile spu/Makefile \
-	spu/Makefile tic6x/Makefile or1k/Makefile pru/Makefile \
+	tic6x/Makefile or1k/Makefile pru/Makefile nios2/Makefile
-	nios2/Makefile
 CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
@@ -278,8 +280,15 @@ libobjs_a_LIBADD =
 @CONFIG_BFIN_TRUE@am__objects_1 = bfin/crt0.$(OBJEXT) \
 @CONFIG_BFIN_TRUE@	bfin/basiccrt.$(OBJEXT)
 @CONFIG_IQ2000_TRUE@am__objects_2 = iq2000/crt0.$(OBJEXT)
-am_libobjs_a_OBJECTS = $(am__objects_1) $(am__objects_2)
+@CONFIG_LM32_TRUE@am__objects_3 = lm32/crt0.$(OBJEXT)
+am_libobjs_a_OBJECTS = $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3)
 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)
 @CONFIG_WINCE_TRUE@am__EXEEXT_1 = wince/stub.exe$(EXEEXT)
 @CONFIG_BFIN_TRUE@am__EXEEXT_2 = bfin/sim-test$(EXEEXT)
 @CONFIG_IQ2000_TRUE@am__EXEEXT_3 = iq2000/test$(EXEEXT)
@@ -334,8 +343,8 @@ am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(bfin_libbfinbsp_a_SOURCES) $(bfin_libsim_a_SOURCES) \
 	$(iq2000_libeval_a_SOURCES) $(libnosys_libnosys_a_SOURCES) \
-	$(libobjs_a_SOURCES) bfin/sim-test.c iq2000/test.c \
+	$(libobjs_a_SOURCES) $(lm32_libgloss_a_SOURCES) \
-	$(wince_stub_exe_SOURCES)
+	bfin/sim-test.c iq2000/test.c $(wince_stub_exe_SOURCES)
 AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
 am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
 am__v_DVIPS_0 = @echo "  DVIPS   " $@;
@@ -420,7 +429,7 @@ ETAGS = etags
 CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-VPATH = @srcdir@ $(am__append_15)
+VPATH = @srcdir@ $(am__append_18)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -549,9 +558,9 @@ SUBDIRS = @subdirs@ .
 tooldir = $(exec_prefix)/$(target_alias)
 multilibtooldir = $(tooldir)/lib$(MULTISUBDIR)
 multilibtool_DATA = $(am__append_4) $(am__append_6) $(am__append_9) \
-	$(am__append_13)
+	$(am__append_13) $(am__append_15)
 multilibtool_LIBRARIES = $(am__append_2) $(am__append_10) \
-	$(am__append_14)
+	$(am__append_14) $(am__append_16)
 includetooldir = $(tooldir)/include
 includetool_DATA = $(am__append_7)
 includesystooldir = $(tooldir)/include/sys
@@ -560,7 +569,7 @@ includesystool_DATA = $(am__append_8)
 # A fake library so automake will generate rules for plain objects that we want
 # to install (e.g. our crt0.o objects).
 noinst_LIBRARIES = libobjs.a
-libobjs_a_SOURCES = $(am__append_5) $(am__append_11)
+libobjs_a_SOURCES = $(am__append_5) $(am__append_11) $(am__append_17)
 FLAGS_TO_PASS = \
 	"CC=$(CC)" \
 	"CFLAGS=$(CFLAGS)" \
@@ -640,6 +649,10 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
 @CONFIG_LIBNOSYS_TRUE@	libnosys/write.c \
 @CONFIG_LIBNOSYS_TRUE@	libnosys/_exit.c
 
+@CONFIG_LM32_TRUE@lm32_libgloss_a_SOURCES = \
+@CONFIG_LM32_TRUE@	lm32/isatty.c \
+@CONFIG_LM32_TRUE@	lm32/scall.S
+
 @CONFIG_WINCE_TRUE@gdbdir = ${dir ${patsubst %/,%,${dir @srcdir@}}}gdb
 @CONFIG_WINCE_TRUE@wince_stub_exe_SOURCES = wince-stub.c
 @CONFIG_WINCE_TRUE@wince_stub_exe_CPPFLAGS = $(AM_CPPFLAGS) -I$(gdbdir)
@@ -651,7 +664,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)/bfin/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/wince/Makefile.inc $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/wince/Makefile.inc $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -673,7 +686,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)/bfin/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/wince/Makefile.inc $(am__empty):
+$(top_srcdir)/../multilib.am $(srcdir)/doc/Makefile.inc $(srcdir)/bfin/Makefile.inc $(srcdir)/iq2000/Makefile.inc $(srcdir)/libnosys/Makefile.inc $(srcdir)/lm32/Makefile.inc $(srcdir)/wince/Makefile.inc $(am__empty):
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -746,8 +759,6 @@ frv/Makefile: $(top_builddir)/config.status $(top_srcdir)/frv/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 ft32/Makefile: $(top_builddir)/config.status $(top_srcdir)/ft32/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-lm32/Makefile: $(top_builddir)/config.status $(top_srcdir)/lm32/Makefile.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
 mcore/Makefile: $(top_builddir)/config.status $(top_srcdir)/mcore/Makefile.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 mep/Makefile: $(top_builddir)/config.status $(top_srcdir)/mep/Makefile.in
@@ -958,11 +969,28 @@ bfin/basiccrt.$(OBJEXT): bfin/$(am__dirstamp) \
 	bfin/$(DEPDIR)/$(am__dirstamp)
 iq2000/crt0.$(OBJEXT): iq2000/$(am__dirstamp) \
 	iq2000/$(DEPDIR)/$(am__dirstamp)
+lm32/$(am__dirstamp):
+	@$(MKDIR_P) lm32
+	@: > lm32/$(am__dirstamp)
+lm32/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) lm32/$(DEPDIR)
+	@: > lm32/$(DEPDIR)/$(am__dirstamp)
+lm32/crt0.$(OBJEXT): lm32/$(am__dirstamp) \
+	lm32/$(DEPDIR)/$(am__dirstamp)
 
 libobjs.a: $(libobjs_a_OBJECTS) $(libobjs_a_DEPENDENCIES) $(EXTRA_libobjs_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libobjs.a
 	$(AM_V_AR)$(libobjs_a_AR) libobjs.a $(libobjs_a_OBJECTS) $(libobjs_a_LIBADD)
 	$(AM_V_at)$(RANLIB) libobjs.a
+lm32/isatty.$(OBJEXT): lm32/$(am__dirstamp) \
+	lm32/$(DEPDIR)/$(am__dirstamp)
+lm32/scall.$(OBJEXT): lm32/$(am__dirstamp) \
+	lm32/$(DEPDIR)/$(am__dirstamp)
+
+lm32/libgloss.a: $(lm32_libgloss_a_OBJECTS) $(lm32_libgloss_a_DEPENDENCIES) $(EXTRA_lm32_libgloss_a_DEPENDENCIES) lm32/$(am__dirstamp)
+	$(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
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -1033,6 +1061,7 @@ mostlyclean-compile:
 	-rm -f bfin/*.$(OBJEXT)
 	-rm -f iq2000/*.$(OBJEXT)
 	-rm -f libnosys/*.$(OBJEXT)
+	-rm -f lm32/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -1091,6 +1120,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/unlink.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/wait.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@libnosys/$(DEPDIR)/write.Po@am__quote@
+@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@
 
 .S.o:
 @am__fastdepCCAS_TRUE@	$(AM_V_CPPAS)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -1545,6 +1577,8 @@ distclean-generic:
 	-rm -f iq2000/$(am__dirstamp)
 	-rm -f libnosys/$(DEPDIR)/$(am__dirstamp)
 	-rm -f libnosys/$(am__dirstamp)
+	-rm -f lm32/$(DEPDIR)/$(am__dirstamp)
+	-rm -f lm32/$(am__dirstamp)
 	-rm -f wince/$(am__dirstamp)
 
 maintainer-clean-generic:
@@ -1558,7 +1592,7 @@ clean-am: clean-aminfo clean-binPROGRAMS clean-checkPROGRAMS \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(DEPDIR) bfin/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) bfin/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-local distclean-tags
@@ -1699,7 +1733,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(DEPDIR) bfin/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR)
+	-rm -rf ./$(DEPDIR) bfin/$(DEPDIR) iq2000/$(DEPDIR) libnosys/$(DEPDIR) lm32/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
 	maintainer-clean-generic maintainer-clean-local

libgloss/configure

@@ -631,6 +631,8 @@ CFLAGS
 CC
 CONFIG_WINCE_FALSE
 CONFIG_WINCE_TRUE
+CONFIG_LM32_FALSE
+CONFIG_LM32_TRUE
 CONFIG_LIBNOSYS_FALSE
 CONFIG_LIBNOSYS_TRUE
 CONFIG_IQ2000_FALSE
@@ -2848,9 +2850,7 @@ subdirs="$subdirs aarch64"
 	subdirs="$subdirs ft32"
 	;;
   lm32*-*-*)
-	ac_config_files="$ac_config_files lm32/Makefile"
+	config_lm32=true
-
-	subdirs="$subdirs lm32"
 	;;
   mcore-*-*)
 	ac_config_files="$ac_config_files mcore/Makefile"
@@ -2982,6 +2982,14 @@ else
   CONFIG_LIBNOSYS_FALSE=
 fi
 
+   if test x$config_lm32 = xtrue; then
+  CONFIG_LM32_TRUE=
+  CONFIG_LM32_FALSE='#'
+else
+  CONFIG_LM32_TRUE='#'
+  CONFIG_LM32_FALSE=
+fi
+
    if test x$config_wince = xtrue; then
   CONFIG_WINCE_TRUE=
   CONFIG_WINCE_FALSE='#'
@@ -5199,6 +5207,10 @@ if test -z "${CONFIG_LIBNOSYS_TRUE}" && test -z "${CONFIG_LIBNOSYS_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_LIBNOSYS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+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_WINCE_TRUE}" && test -z "${CONFIG_WINCE_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_WINCE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5847,7 +5859,6 @@ do
     "fr30/Makefile") CONFIG_FILES="$CONFIG_FILES fr30/Makefile" ;;
     "frv/Makefile") CONFIG_FILES="$CONFIG_FILES frv/Makefile" ;;
     "ft32/Makefile") CONFIG_FILES="$CONFIG_FILES ft32/Makefile" ;;
-    "lm32/Makefile") CONFIG_FILES="$CONFIG_FILES lm32/Makefile" ;;
     "mcore/Makefile") CONFIG_FILES="$CONFIG_FILES mcore/Makefile" ;;
     "mep/Makefile") CONFIG_FILES="$CONFIG_FILES mep/Makefile" ;;
     "moxie/Makefile") CONFIG_FILES="$CONFIG_FILES moxie/Makefile" ;;

libgloss/configure.ac

@@ -147,8 +147,7 @@ case "${target}" in
 	subdirs="$subdirs ft32"
 	;;
   lm32*-*-*)
-	AC_CONFIG_FILES([lm32/Makefile])
+	config_lm32=true
-	subdirs="$subdirs lm32"
 	;;
   mcore-*-*)
 	AC_CONFIG_FILES([mcore/Makefile])
@@ -240,7 +239,7 @@ esac
 dnl These subdirs have converted to non-recursive make.  Hopefully someday all
 dnl the ports above will too!
 m4_foreach_w([SUBDIR], [
-  bfin iq2000 libnosys wince
+  bfin iq2000 libnosys lm32 wince
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])

libgloss/lm32/Makefile.in

@@ -1,98 +0,0 @@
-
-VPATH = @srcdir@ @srcdir@/..
-srcdir = @srcdir@
-objdir = .
-srcroot = $(srcdir)/../..
-objroot = $(objdir)/../..
-
-mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs
-
-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)
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
-
-# Multilib support variables.
-# TOP is used instead of MULTI{BUILD,SRC}TOP.
-MULTIDIRS =
-MULTISUBDIR =
-MULTIDO = true
-MULTICLEAN = true
-
-SHELL =	/bin/sh
-
-CC = @CC@
-
-AS = @AS@
-AR = @AR@
-LD = @LD@
-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`
-
-OBJS        = isatty.o scall.o 
-SCRIPTS     = sim.ld  
-CRT0S       = crt0.o 
-BSPS        = libgloss.a
-
-# Host specific makefile fragment comes in here.
-@host_makefile_frag@
-
-all: $(CRT0S) $(BSPS)
-
-libgloss.a: $(OBJS)
-	${AR} ${ARFLAGS} $@ $(OBJS)
-	${RANLIB} $@
-
-#
-# Standard targets
-#
-
-clean mostlyclean:
-	rm -f a.out core *.i *.o *-test *.srec *.dis *.x
-
-distclean maintainer-clean realclean: clean
-	rm -f Makefile *~
-
-.PHONY: install info install-info clean-info
-install: install-scripts # install-includes 
-	@for crt0 in ${CRT0S}; do\
-	 $(INSTALL_PROGRAM) $${crt0} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-	@for bsp in ${BSPS}; do\
-	 $(INSTALL_PROGRAM) $${bsp} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-
-install-includes:
-	$(mkinstalldirs) $(DESTDIR)$(tooldir)/include/excess; \
-	for i in $(srcdir)/*.h; do \
-	 $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/excess/`basename $$i`; \
-	done; 
-	
-install-scripts:
-	@for script in ${SCRIPTS}; do\
-	 $(INSTALL_DATA) ${srcdir}/$${script} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}; \
-	done
-	
-doc:
-info:
-install-info:
-clean-info:
-
-Makefile: Makefile.in ../config.status
-	cd .. && $(SHELL) config.status

libgloss/lm32/Makefile.inc

@@ -0,0 +1,7 @@
+multilibtool_DATA += %D%/crt0.o %D%/sim.ld
+multilibtool_LIBRARIES += %D%/libgloss.a
+libobjs_a_SOURCES += %D%/crt0.S
+
+%C%_libgloss_a_SOURCES = \
+	%D%/isatty.c \
+	%D%/scall.S