libgloss: merge xc16x into top-level Makefile

Avoid a recursive make to speed things up a bit.
Untested as this target has never been merged into gcc.

libgloss/Makefile.am

@@ -180,6 +180,9 @@ endif
 if CONFIG_WINCE
 include wince/Makefile.inc
 endif
+if CONFIG_XC16X
+include xc16x/Makefile.inc
+endif
 if CONFIG_XSTORMY16
 include xstormy16/Makefile.inc
 endif

libgloss/configure.ac

@@ -167,9 +167,7 @@ case "${target}" in
 	config_testsuite=false
 	;;
   xc16x-*-*)
-	AC_CONFIG_FILES([xc16x/Makefile])
-	subdirs="$subdirs xc16x"
-	target_makefile_frag=${srcdir}/config/xc16x.mt
+	config_xc16x=true
 	;;
   xstormy16-*-*)
 	config_xstormy16=true
@@ -228,7 +226,7 @@ m4_foreach_w([SUBDIR], [
   libnosys lm32
   m32r mcore microblaze mn10200 mn10300 moxie msp430
   nds32 nios2 or1k riscv rl78 rx sparc sparc_leon tic6x v850 visium wince
-  xstormy16 xtensa
+  xc16x xstormy16 xtensa
 ], [dnl
   AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue)
 ])

libgloss/xc16x/Makefile.inc

@@ -0,0 +1,82 @@
+## Copyright (C) 2006 KPIT Cummins
+## Copyright (C) 2009 Conny Marco Menebröcker
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms is permitted
+## provided that the above copyright notice and following paragraph are
+## duplicated in all such forms.
+##
+## This file is distributed WITHOUT ANY WARRANTY; without even the implied
+## warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+CRT0 = crt0.o
+
+# Generic object files common to all targets.
+GENOBJS_NO_TRAP = close.o create.o crt0.o fstat.o getchar1.o \
+    isatty.o lseek.o mem-layout.o misc.o open.o \
+    read.o sbrk.o syscalls.o write.o
+GENOBJS = ${GENOBJS_NO_TRAP} trap_handle.o
+
+# Object files specific to particular targets.
+EVALOBJS = ${GENOBJS}
+CYGMONOBJS = ${GENOBJS_NO_TRAP}
+
+SCRIPTS = @script_list@
+BSP = @bsp_list@
+
+# Host specific makefile fragment comes in here.
+@host_makefile_frag@
+
+#
+# build a test program for each target board. Just trying to get
+# it to link is a good test, so we ignore all the errors for now.
+#
+
+all: ${CRT0} ${BSP}
+
+#
+# here's where we build the board support packages for each target
+#
+
+libeval.a: $(EVALOBJS)
+	${AR} ${ARFLAGS} $@ $(EVALOBJS)
+	${RANLIB} $@
+
+libcygmon.a: $(CYGMONOBJS)
+	${AR} ${ARFLAGS} $@ $(CYGMONOBJS)
+	${RANLIB} $@
+
+
+doc:	
+
+clean mostlyclean:
+	rm -f a.out core *.i *~ *.o *-test *.srec *.dis *.map *.x
+
+distclean maintainer-clean realclean: clean
+	rm -f Makefile config.status a.out
+
+.PHONY: install info install-info clean-info
+install:
+	${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR}
+	@for crt in ${CRT0}; do \
+	$(INSTALL_PROGRAM) $${crt} $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$${crt}; \
+	done
+	@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:
+
+# these are for the BSPs
+crt0.o: ${srcdir}/crt0.S
+
+# target specific makefile fragment comes in here.
+@target_makefile_frag@
+
+Makefile: Makefile.in ../config.status
+	cd .. && $(SHELL) config.status