From c30356443ece81304501c7fb59209b55175306bd Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 22 Sep 2014 15:26:46 +0000 Subject: [PATCH] * configure.in: Remove config_libnosys=false * configure: Regenerated. * msp430/nosyscalls.S: Rename to ciosyscalls.S * msp430/Makefile.in: Change LIBNOSYS to LIB_CIO. --- libgloss/ChangeLog | 7 +++++++ libgloss/bfin/Makefile.in | 2 +- libgloss/configure | 1 - libgloss/configure.in | 1 - libgloss/msp430/Makefile.in | 12 ++++++------ libgloss/msp430/{nosyscalls.S => ciosyscalls.S} | 0 6 files changed, 14 insertions(+), 9 deletions(-) rename libgloss/msp430/{nosyscalls.S => ciosyscalls.S} (100%) diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog index 309d0dd74..6ee7e5847 100644 --- a/libgloss/ChangeLog +++ b/libgloss/ChangeLog @@ -1,3 +1,10 @@ +2014-09-22 Peter A. Bigot + + * configure.in: Remove config_libnosys=false + * configure: Regenerated. + * msp430/nosyscalls.S: Rename to ciosyscalls.S + * msp430/Makefile.in: Change LIBNOSYS to LIB_CIO. + 2014-08-14 Bin Cheng * arm/elf-nano.specs: New file. diff --git a/libgloss/bfin/Makefile.in b/libgloss/bfin/Makefile.in index c86710810..b206a17ae 100644 --- a/libgloss/bfin/Makefile.in +++ b/libgloss/bfin/Makefile.in @@ -78,7 +78,7 @@ BOARD_LDFLAGS = BOARD_BSP = libbfinbsp.a BOARD_CRT0S = basiccrt.o basiccrts.o BOARD_CRT0S += basiccrt561.o basiccrt561s.o basiccrt561b.o -BOARD_CRT0S += basiccrt60x.o basiccrt60xs.o basiccrt60xc1.o +# BOARD_CRT0S += basiccrt60x.o basiccrt60xs.o basiccrt60xc1.o BOARD_OBJS = clear_cache_range.o _exit.o BOARD_TEST = BOARD_INSTALL = install-board diff --git a/libgloss/configure b/libgloss/configure index 41d91d68a..aaef57959 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -2531,7 +2531,6 @@ case "${target}" in msp430*-*-elf) subdirs="$subdirs msp430" - config_libnosys=false ;; rl78*-*-elf) subdirs="$subdirs rl78" diff --git a/libgloss/configure.in b/libgloss/configure.in index 14287e753..93cc36999 100644 --- a/libgloss/configure.in +++ b/libgloss/configure.in @@ -137,7 +137,6 @@ case "${target}" in ;; msp430*-*-elf) AC_CONFIG_SUBDIRS([msp430]) - config_libnosys=false ;; rl78*-*-elf) AC_CONFIG_SUBDIRS([rl78]) diff --git a/libgloss/msp430/Makefile.in b/libgloss/msp430/Makefile.in index 57c7f10c3..d72051dcb 100644 --- a/libgloss/msp430/Makefile.in +++ b/libgloss/msp430/Makefile.in @@ -63,7 +63,7 @@ SCRIPTS += $(srcdir)/intr_vectors.ld CRT = gcrt0.o crt0.o crt0-minrt.o crtn.o crtn-minrt.o SIM_BSP = libsim.a -LIBNOSYS = libnosys.a +LIB_CIO = libcio.a LIB_CRT = libcrt.a SIM_OBJS = syscalls.o \ @@ -71,7 +71,7 @@ SIM_OBJS = syscalls.o \ write.o \ sbrk.o -NOSYS_OBJS = nosyscalls.o \ +CIO_OBJS = ciosyscalls.o \ cio.o \ write.o \ unlink.o \ @@ -91,7 +91,7 @@ CRT_OBJS = \ @host_makefile_frag@ -all: $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT) copy_scripts_to_objdir +all: $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT) copy_scripts_to_objdir crt_%.o : crt0.S $(CC) -DL$* -Wa,-gdwarf2 -Wa,-I$(srcdir) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $< -o $@ @@ -110,7 +110,7 @@ $(SIM_BSP): $(SIM_OBJS) $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ -$(LIBNOSYS): $(NOSYS_OBJS) +$(LIB_CIO): $(CIO_OBJS) $(AR) $(ARFLAGS) $@ $? $(RANLIB) $@ @@ -151,8 +151,8 @@ unlink.o : $(SDEPS) utime.o : $(SDEPS) write.o : $(SDEPS) -install: $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT) $(SCRIPTS) - for c in $(CRT) $(SIM_BSP) $(LIBNOSYS) $(LIB_CRT); do \ +install: $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT) $(SCRIPTS) + for c in $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT); do \ $(INSTALL_DATA) $$c $(tooldir)/lib${MULTISUBDIR}/$$c ;\ done for c in $(SCRIPTS); do \ diff --git a/libgloss/msp430/nosyscalls.S b/libgloss/msp430/ciosyscalls.S similarity index 100% rename from libgloss/msp430/nosyscalls.S rename to libgloss/msp430/ciosyscalls.S