Build msp430-specific libnosys

The MSP430 debuggers support I/O on hardware through CIO, so
we can use a CIO-enabled library as the "nosys" library (in
addition to the libsim library, which talks to our simulator)

* configure.in: Don't build default libnosys for msp430
* configure: Regenerate.
* msp430/Makefile: Rename libcio to libnosys.
This commit is contained in:
DJ Delorie 2015-12-17 16:49:08 -05:00
parent 06537f05d4
commit 7d5b16ab9a
4 changed files with 12 additions and 6 deletions

View File

@ -1,5 +1,9 @@
2015-12-17 DJ Delorie <dj@redhat.com> 2015-12-17 DJ Delorie <dj@redhat.com>
* configure.in: Don't build default libnosys for msp430
* configure: Regenerate.
* msp430/Makefile: Rename libcio to libnosys.
* msp430/cio.c: Remove, replace with... * msp430/cio.c: Remove, replace with...
* msp430/cio.S: New, this. * msp430/cio.S: New, this.

1
libgloss/configure vendored
View File

@ -2548,6 +2548,7 @@ case "${target}" in
msp430*-*-elf) msp430*-*-elf)
subdirs="$subdirs msp430" subdirs="$subdirs msp430"
config_libnosys=false
;; ;;
rl78*-*-elf) rl78*-*-elf)
subdirs="$subdirs rl78" subdirs="$subdirs rl78"

View File

@ -147,6 +147,7 @@ case "${target}" in
;; ;;
msp430*-*-elf) msp430*-*-elf)
AC_CONFIG_SUBDIRS([msp430]) AC_CONFIG_SUBDIRS([msp430])
config_libnosys=false
;; ;;
rl78*-*-elf) rl78*-*-elf)
AC_CONFIG_SUBDIRS([rl78]) AC_CONFIG_SUBDIRS([rl78])

View File

@ -63,7 +63,7 @@ SCRIPTS += $(srcdir)/intr_vectors.ld
CRT = gcrt0.o crt0.o crt0-minrt.o crtn.o crtn-minrt.o CRT = gcrt0.o crt0.o crt0-minrt.o crtn.o crtn-minrt.o
SIM_BSP = libsim.a SIM_BSP = libsim.a
LIB_CIO = libcio.a LIB_NOSYS = libnosys.a
LIB_CRT = libcrt.a LIB_CRT = libcrt.a
SIM_OBJS = syscalls.o \ SIM_OBJS = syscalls.o \
@ -71,7 +71,7 @@ SIM_OBJS = syscalls.o \
write.o \ write.o \
sbrk.o sbrk.o
CIO_OBJS = ciosyscalls.o \ NOSYS_OBJS = ciosyscalls.o \
cio.o \ cio.o \
write.o \ write.o \
unlink.o \ unlink.o \
@ -93,7 +93,7 @@ CRT_OBJS = \
@host_makefile_frag@ @host_makefile_frag@
all: $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT) copy_scripts_to_objdir all: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) copy_scripts_to_objdir
crt_%.o : crt0.S crt_%.o : crt0.S
$(CC) -DL$* -Wa,-gdwarf2 -Wa,-I$(srcdir) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $< -o $@ $(CC) -DL$* -Wa,-gdwarf2 -Wa,-I$(srcdir) $(CFLAGS_FOR_TARGET) $(INCLUDES) $(CFLAGS) -c $< -o $@
@ -112,7 +112,7 @@ $(SIM_BSP): $(SIM_OBJS)
$(AR) $(ARFLAGS) $@ $? $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
$(LIB_CIO): $(CIO_OBJS) $(LIB_NOSYS): $(NOSYS_OBJS)
$(AR) $(ARFLAGS) $@ $? $(AR) $(ARFLAGS) $@ $?
$(RANLIB) $@ $(RANLIB) $@
@ -153,9 +153,9 @@ unlink.o : $(SDEPS)
utime.o : $(SDEPS) utime.o : $(SDEPS)
write.o : $(SDEPS) write.o : $(SDEPS)
install: $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT) $(SCRIPTS) install: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) $(SCRIPTS)
mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}
for c in $(CRT) $(SIM_BSP) $(LIB_CIO) $(LIB_CRT); do \ for c in $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT); do \
$(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\ $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\
done done
for c in $(SCRIPTS); do \ for c in $(SCRIPTS); do \