From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id 3E8123858C2F; Tue, 2 Jan 2024 04:39:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E8123858C2F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1704170340; bh=fOyV7CfFMvdouYYrQAY2AtU2Zm1P6QE9diGf/omSdzs=; h=From:To:Subject:Date:From; b=xtkKOqsqmqxOgAay378emIxXiy+tY6ALzRUtau/22Xvl7dNUTN9V8lRm/EIG+AuUf xJhNb3lVRuv1KS6Xd6Avf5sF67t5NrmL9elXxYiBu2qzic84ynApUqBSD3yRa6qs6M ICV8doym3UkFs9Xa9DP2fY2wKIOqQLXzAIvUhVvs= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin/users/vapier/wip] libgloss: merge xc16x into top-level Makefile X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/users/vapier/wip X-Git-Oldrev: 13a24be553efd61cbcc959b8bfe1ad2063b7615e X-Git-Newrev: 930bc1bdf54421f12c9373fed0754cd2451abe79 Message-Id: <20240102043900.3E8123858C2F@sourceware.org> Date: Tue, 2 Jan 2024 04:39:00 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D930bc1bdf54= 421f12c9373fed0754cd2451abe79 commit 930bc1bdf54421f12c9373fed0754cd2451abe79 Author: Mike Frysinger Date: Fri Dec 29 21:24:58 2023 -0500 libgloss: merge xc16x into top-level Makefile =20 Avoid a recursive make to speed things up a bit. Untested as this target has never been merged into gcc. Diff: --- libgloss/Makefile.am | 3 + libgloss/config/xc16x.mt | 3 - libgloss/configure.ac | 6 +- libgloss/xc16x/Makefile.in | 145 ----------------------------------------= ---- libgloss/xc16x/Makefile.inc | 82 +++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 152 deletions(-) diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index f69a3f1b8..6b27f15b0 100644 --- a/libgloss/Makefile.am +++ b/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 diff --git a/libgloss/config/xc16x.mt b/libgloss/config/xc16x.mt deleted file mode 100644 index 2ac79cebc..000000000 --- a/libgloss/config/xc16x.mt +++ /dev/null @@ -1,3 +0,0 @@ -# Dummy target-specific Makefile fragment for XC16X. We can't -# use default.mt because it refers to generic source files whose -# names conflict with the XC16X-specific sources. diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 17e98a2fa..98ff6d6e6 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -167,9 +167,7 @@ case "${target}" in config_testsuite=3Dfalse ;; xc16x-*-*) - AC_CONFIG_FILES([xc16x/Makefile]) - subdirs=3D"$subdirs xc16x" - target_makefile_frag=3D${srcdir}/config/xc16x.mt + config_xc16x=3Dtrue ;; xstormy16-*-*) config_xstormy16=3Dtrue @@ -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 =3D x= true) ]) diff --git a/libgloss/xc16x/Makefile.in b/libgloss/xc16x/Makefile.in deleted file mode 100644 index 5e2584e00..000000000 --- a/libgloss/xc16x/Makefile.in +++ /dev/null @@ -1,145 +0,0 @@ -# -# Copyright (C) 2006 KPIT Cummins -# Copyright (C) 2009 Conny Marco Menebr=C3=B6cker -# 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. -# - -DESTDIR =3D -VPATH =3D @srcdir@ -srcdir =3D @srcdir@ -objdir =3D . -srcroot =3D $(srcdir)/../.. -objroot =3D $(objdir)/../.. - -prefix =3D @prefix@ -exec_prefix =3D @exec_prefix@ - -host_alias =3D @host_alias@ -target_alias =3D @target_alias@ -program_transform_name =3D @program_transform_name@ - -bindir =3D @bindir@ -libdir =3D @libdir@ -tooldir =3D $(exec_prefix)/$(target_alias) - -# Multilib support variables. -# TOP is used instead of MULTI{BUILD,SRC}TOP. -MULTIDIRS =3D -MULTISUBDIR =3D -MULTIDO =3D true -MULTICLEAN =3D true - -INSTALL =3D @INSTALL@ -INSTALL_PROGRAM =3D @INSTALL_PROGRAM@ -INSTALL_DATA =3D @INSTALL_DATA@ - -SHELL =3D /bin/sh - -mkinstalldirs =3D $(SHELL) $(srcroot)/mkinstalldirs - -CC =3D @CC@ - -#AS =3D @AS@ -AS =3D `if [ -f ${objroot}/../gas/as.new ] ; \ - then echo ${objroot}/../gas/as.new ; \ - else echo as ; fi` - -AR =3D @AR@ - -#LD =3D @LD@ -LD =3D `if [ -f ${objroot}/../ld/ld.new ] ; \ - then echo ${objroot}/../ld/ld.new ; \ - else echo ld ; fi` - -RANLIB =3D @RANLIB@ - -OBJDUMP =3D `if [ -f ${objroot}/../binutils/objdump ] ; \ - then echo ${objroot}/../binutils/objdump ; \ - else t=3D'$(program_transform_name)'; echo objdump | sed -e $$t ; fi` -OBJCOPY =3D `if [ -f ${objroot}/../binutils/objcopy ] ; \ - then echo ${objroot}/../binutils/objcopy ; \ - else t=3D'$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` - -CRT0 =3D crt0.o - -# Generic object files common to all targets. -GENOBJS_NO_TRAP =3D 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 =3D ${GENOBJS_NO_TRAP} trap_handle.o - -# Object files specific to particular targets. -EVALOBJS =3D ${GENOBJS} -CYGMONOBJS =3D ${GENOBJS_NO_TRAP} - -CFLAGS =3D -g=20 - -GCC_LDFLAGS =3D `if [ -d ${objroot}/../gcc ] ; \ - then echo -L${objroot}/../gcc ; fi` - -SCRIPTS =3D @script_list@ -BSP =3D @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:=09 - -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${MULTIS= UBDIR}/$${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 diff --git a/libgloss/xc16x/Makefile.inc b/libgloss/xc16x/Makefile.inc new file mode 100644 index 000000000..30bdb77e5 --- /dev/null +++ b/libgloss/xc16x/Makefile.inc @@ -0,0 +1,82 @@ +## Copyright (C) 2006 KPIT Cummins +## Copyright (C) 2009 Conny Marco Menebr=C3=B6cker +## 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 =3D crt0.o + +# Generic object files common to all targets. +GENOBJS_NO_TRAP =3D 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 =3D ${GENOBJS_NO_TRAP} trap_handle.o + +# Object files specific to particular targets. +EVALOBJS =3D ${GENOBJS} +CYGMONOBJS =3D ${GENOBJS_NO_TRAP} + +SCRIPTS =3D @script_list@ +BSP =3D @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:=09 + +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${MULTIS= UBDIR}/$${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