* Remove the 2p0_ 2p0 string from riscV instr set specification else

BrunoLevy · BrunoLevy · commit d013077585ce · 2023-06-13T22:46:47.000+02:00
if does not find the right libgcc
* added libbase to the list of LiteX libs to be linked (has memspeed
and memtest)
diff --git a/LiteX/software/makefile.inc b/LiteX/software/makefile.inc
@@ -11,7 +11,6 @@ LITEX_PLATFORM?=radiona_ulx3s
 
 BUILD_DIR?=$(LEARN_FPGA_DIR)/LiteX/build/$(LITEX_PLATFORM)
 
-
 include $(BUILD_DIR)/software/include/generated/variables.mak
 include $(SOC_DIRECTORY)/software/common.mak
 
@@ -21,6 +20,14 @@ BIOS_SRC_DIR=$(LITEX_DIR)/litex/litex/soc/software/bios
 # some functions, e.g. floating-point) with libgcc (that has everything)
 LIBS:=$(LIBS:libcompiler_rt=libgcc)
 
+# add libbase, that has memspeed and memtest
+LIBS += -lbase 
+
+# Remove the 2p0_ 2p0 string from riscV instr set
+# definition from LDFLAGS, else it does not find the
+# right libgcc 
+LDFLAGS:=`echo $(LDFLAGS) | sed -E 's|2p0(_)?||'`
+
 # Include path 
 CFLAGS:=$(CFLAGS) -I../Libs  -I$(BIOS_SRC_DIR)
 CXXFLAGS:=$(CXXFLAGS) -I../Libs -I../Libs/imgui -I$(BIOS_SRC_DIR) -fno-threadsafe-statics -fno-rtti 
