Remove libbase-nofloat.a variant

As vsnprintf is no longer compiled it was
identical to libbase.a.

Picolibc defines levels of printf and scanf
https://github.com/picolibc/picolibc/blob/main/doc/printf.md#printf-and-scanf-levels-in-picolibc
so those should probably be used.
This commit is contained in:
Michal Sieron 2021-07-29 15:16:11 +02:00
parent c4ba313b86
commit b34adcf929
3 changed files with 4 additions and 10 deletions

View file

@ -114,9 +114,6 @@ class Builder:
for name in soc_software_packages:
self.add_software_package(name)
if name == "libbase":
name += "-nofloat"
self.add_software_library(name)
def add_software_package(self, name, src_dir=None):

View file

@ -25,7 +25,7 @@ demo.elf: $(OBJECTS)
$(OBJECTS) \
-L$(BUILD_DIR)/software/libbase \
-L$(BUILD_DIR)/software/libcompiler_rt \
-lbase-nofloat -lcompiler_rt
-lbase -lcompiler_rt
chmod -x $@
main.o: main.c

View file

@ -15,14 +15,11 @@ OBJECTS = exception.o \
memtest.o \
sim_debug.o
all: crt0.o libbase.a libbase-nofloat.a
all: crt0.o libbase.a
libbase.a: $(OBJECTS)
$(AR) crs libbase.a $(OBJECTS)
libbase-nofloat.a: $(OBJECTS)
$(AR) crs libbase-nofloat.a $(OBJECTS)
# pull in dependency info for *existing* .o files
-include $(OBJECTS:.o=.d)
@ -38,5 +35,5 @@ crt0.o: $(CPU_DIRECTORY)/crt0.S
.PHONY: all clean
clean:
$(RM) $(OBJECTS) crt0.o vsnprintf.o vsnprintf-nofloat.o
$(RM) libbase.a libbase-nofloat.a .*~ *~
$(RM) $(OBJECTS) crt0.o
$(RM) libbase.a .*~ *~