diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index eea9cb63c..309d0dd74 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,10 @@ +2014-08-14 Bin Cheng + + * arm/elf-nano.specs: New file. + * arm/elf-rdimon.specs: Support nano.specs. + * arm/Makefile.in: Support nano.specs. + * libnosys/nosys.specs: Support nano.specs. + 2014-07-27 Anthony Green * moxie/Makefile.in (LD_SCRIPTS): Add moxiebox.ld diff --git a/libgloss/arm/Makefile.in b/libgloss/arm/Makefile.in index ab5c9cbbf..6e89cfb03 100644 --- a/libgloss/arm/Makefile.in +++ b/libgloss/arm/Makefile.in @@ -52,8 +52,11 @@ OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \ @BUILD_CRT0_TRUE@CRT0 = crt0.o @BUILD_CRT0_TRUE@CRT0_INSTALL = install-crt0 -@BUILD_CRT0_FALSE@CRT0 = -@BUILD_CRT0_FALSE@CRT0_INSTALL = +@BUILD_CRT0_FALSE@CRT0 = +@BUILD_CRT0_FALSE@CRT0_INSTALL = + +NANO_SCRIPTS=nano.specs +NANO_INSTALL=install-nano LINUX_CRT0 = linux-crt0.o LINUX_BSP = libgloss-linux.a @@ -172,7 +175,7 @@ distclean maintainer-clean realclean: clean rm -f Makefile config.status *~ .PHONY: install info install-info clean-info -install: ${CRT0_INSTALL} ${LINUX_INSTALL} ${REDBOOT_INSTALL} ${RDPMON_INSTALL} ${RDIMON_INSTALL} ${IQ80310_INSTALL} ${PID_INSTALL} +install: ${CRT0_INSTALL} ${LINUX_INSTALL} ${REDBOOT_INSTALL} ${RDPMON_INSTALL} ${RDIMON_INSTALL} ${IQ80310_INSTALL} ${PID_INSTALL} ${NANO_INSTALL} @rootpre=`pwd`/; export rootpre; \ srcrootpre=`cd $(srcdir); pwd`/; export srcrootpre; \ for dir in .. ${SUBDIRS}; do \ @@ -183,6 +186,9 @@ install: ${CRT0_INSTALL} ${LINUX_INSTALL} ${REDBOOT_INSTALL} ${RDPMON_INSTALL} $ else true; fi; \ done +install-nano: + set -e; for x in ${NANO_SCRIPTS}; do ${INSTALL_DATA} ${srcdir}/${objtype}$$x $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x; done + install-crt0: ${INSTALL_DATA} ${CRT0} $(DESTDIR)${tooldir}/lib${MULTISUBDIR}/$$x diff --git a/libgloss/arm/elf-rdimon.specs b/libgloss/arm/elf-rdimon.specs index 2f0692c8a..c35061f3a 100644 --- a/libgloss/arm/elf-rdimon.specs +++ b/libgloss/arm/elf-rdimon.specs @@ -1,10 +1,13 @@ -%rename lib libc +%rename link_gcc_c_sequence rdimon_link_gcc_c_sequence -*libgloss: --lrdimon +*rdimon_libc: +%{!specs=nano.specs:-lc} %{specs=nano.specs:-lc_nano} -*lib: ---start-group %(libc) %(libgloss) --end-group +*rdimon_libgloss: +%{!specs=nano.specs:-lrdimon} %{specs=nano.specs:-lrdimon_nano} + +*link_gcc_c_sequence: +%(rdimon_link_gcc_c_sequence) --start-group %G %(rdimon_libc) %(rdimon_libgloss) --end-group *startfile: crti%O%s crtbegin%O%s %{!pg:rdimon-crt0%O%s} %{pg:rdimon-crt0%O%s} diff --git a/libgloss/libnosys/nosys.specs b/libgloss/libnosys/nosys.specs index 034fefb82..3a84db3b5 100644 --- a/libgloss/libnosys/nosys.specs +++ b/libgloss/libnosys/nosys.specs @@ -1,8 +1,11 @@ -%rename lib libc +%rename link_gcc_c_sequence nosys_link_gcc_c_sequence -*libgloss: +*nosys_libgloss: -lnosys -*lib: ---start-group %(libc) %(libgloss) --end-group +*nosys_libc: +%{!specs=nano.specs:-lc} %{specs=nano.specs:-lc_nano} + +*link_gcc_c_sequence: +%(nosys_link_gcc_c_sequence) --start-group %G %(nosys_libc) %(nosys_libgloss) --end-group