From b34adcf929d74dd521b706e20d086e732ad23572 Mon Sep 17 00:00:00 2001
From: Michal Sieron <msieron@internships.antmicro.com>
Date: Thu, 29 Jul 2021 15:16:11 +0200
Subject: [PATCH] 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.
---
 litex/soc/integration/builder.py    | 3 ---
 litex/soc/software/demo/Makefile    | 2 +-
 litex/soc/software/libbase/Makefile | 9 +++------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index e50c4a8e0..0b4eb9ae3 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -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):
diff --git a/litex/soc/software/demo/Makefile b/litex/soc/software/demo/Makefile
index a71fcc295..7bf22c6bf 100644
--- a/litex/soc/software/demo/Makefile
+++ b/litex/soc/software/demo/Makefile
@@ -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
diff --git a/litex/soc/software/libbase/Makefile b/litex/soc/software/libbase/Makefile
index f9370f71e..94a90c9af 100755
--- a/litex/soc/software/libbase/Makefile
+++ b/litex/soc/software/libbase/Makefile
@@ -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 .*~ *~