drivers: Changes in Makefile to make map file consistent in windows a…

…nd linux This patch is to generate consistent map files (same user object address values in the map files)across different OS platforms such as windows and linux. Signed-off-by: Arunima Mishra <anunima.mishra@xilinx.com> Acked-by: Anirudha Sarangi <anirudh@xilinx.com> Acked-by: Anirudha Sarangi <anirudh@xilinx.com>
Xilinx · May 22, 2019 · 6cb722e · 6cb722e
1 parent 564d8c1
commit 6cb722e
Show file tree

Hide file tree

Showing 36 changed files with 39 additions and 37 deletions.
diff --git a/XilinxProcessorIPLib/drivers/axicdma/src/Makefile b/XilinxProcessorIPLib/drivers/axicdma/src/Makefile
@@ -19,7 +19,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling axicdma"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/axidma/src/Makefile b/XilinxProcessorIPLib/drivers/axidma/src/Makefile
@@ -18,7 +18,7 @@ INCLUDEFILES=*.h
 libs:
 	echo "Compiling axidma"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/axiethernet/src/Makefile b/XilinxProcessorIPLib/drivers/axiethernet/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling axiethernet"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/axivdma/src/Makefile b/XilinxProcessorIPLib/drivers/axivdma/src/Makefile
@@ -17,7 +17,7 @@ INCLUDEFILES=*.h
 libs:
 	echo "Compiling axivdma"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/bram/src/Makefile b/XilinxProcessorIPLib/drivers/bram/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling bram"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/can/src/Makefile b/XilinxProcessorIPLib/drivers/can/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling can"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/canfd/src/Makefile b/XilinxProcessorIPLib/drivers/canfd/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling can"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/common/src/Makefile b/XilinxProcessorIPLib/drivers/common/src/Makefile
@@ -17,7 +17,7 @@ INCLUDEFILES=xbasic_types.h xenv.h xenv_none.h xenv_standalone.h xenv_vxworks.h
 libs:
 	echo "Compiling common"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/cpu/src/Makefile b/XilinxProcessorIPLib/drivers/cpu/src/Makefile
@@ -17,7 +17,7 @@ INCLUDEFILES=xio.h
 libs:
 	echo "Compiling cpu"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/emaclite/src/Makefile b/XilinxProcessorIPLib/drivers/emaclite/src/Makefile
@@ -16,7 +16,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling emaclite"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/gpio/src/Makefile b/XilinxProcessorIPLib/drivers/gpio/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling gpio"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/hwicap/src/Makefile b/XilinxProcessorIPLib/drivers/hwicap/src/Makefile
@@ -19,7 +19,7 @@ INCLUDEFILES=*.h
 libs:
 	echo "Compiling hwicap"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 #	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/iic/src/Makefile b/XilinxProcessorIPLib/drivers/iic/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling iic"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/intc/src/Makefile b/XilinxProcessorIPLib/drivers/intc/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling intc"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/iomodule/src/Makefile b/XilinxProcessorIPLib/drivers/iomodule/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling iomodule"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/llfifo/src/Makefile b/XilinxProcessorIPLib/drivers/llfifo/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling llfifo"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/mutex/src/Makefile b/XilinxProcessorIPLib/drivers/mutex/src/Makefile
@@ -17,7 +17,7 @@ INCLUDEFILES=*.h
 libs:
 	echo "Compiling mutex"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/rfdc/src/Makefile b/XilinxProcessorIPLib/drivers/rfdc/src/Makefile
@@ -13,12 +13,12 @@ INCLUDEFILES=xrfdc_hw.h xrfdc.h xrfdc_mts.h
 
 LIBSOURCES=*.c
 OUTS = *.o
-
+OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 
 libs:
 	echo "Compiling rfdc"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES) -D __BAREMETAL__
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/spi/src/Makefile b/XilinxProcessorIPLib/drivers/spi/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling spi"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/srio/src/Makefile b/XilinxProcessorIPLib/drivers/srio/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling srio"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/sysmon/src/Makefile b/XilinxProcessorIPLib/drivers/sysmon/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling sysmon"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/tft/src/Makefile b/XilinxProcessorIPLib/drivers/tft/src/Makefile
@@ -35,7 +35,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling tft"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/tmr_inject/src/Makefile b/XilinxProcessorIPLib/drivers/tmr_inject/src/Makefile
@@ -14,11 +14,12 @@ INCLUDEFILES=*.h
 LIBSOURCES=*.c
 
 OUTS = *.o
+OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 
 libs:
 	echo "Compiling tmr_inject"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/tmr_manager/src/Makefile b/XilinxProcessorIPLib/drivers/tmr_manager/src/Makefile
@@ -14,11 +14,12 @@ INCLUDEFILES=*.h
 LIBSOURCES=*.c *.S
 
 OUTS = *.o
+OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 
 libs:
 	echo "Compiling tmr_manager"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/tmrctr/src/Makefile b/XilinxProcessorIPLib/drivers/tmrctr/src/Makefile
@@ -17,7 +17,7 @@ INCLUDEFILES=*.h
 libs:
 	echo "Compiling tmrctr"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/trafgen/src/Makefile b/XilinxProcessorIPLib/drivers/trafgen/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling trafgen"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/uartlite/src/Makefile b/XilinxProcessorIPLib/drivers/uartlite/src/Makefile
@@ -18,7 +18,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling uartlite"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS} 
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include: 

diff --git a/XilinxProcessorIPLib/drivers/uartns550/src/Makefile b/XilinxProcessorIPLib/drivers/uartns550/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling uartns550"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/usb/src/Makefile b/XilinxProcessorIPLib/drivers/usb/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling usb"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/wdttb/src/Makefile b/XilinxProcessorIPLib/drivers/wdttb/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling wdttb"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OUTS)
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/XilinxProcessorIPLib/drivers/xxvethernet/src/Makefile b/XilinxProcessorIPLib/drivers/xxvethernet/src/Makefile
@@ -17,7 +17,7 @@ OBJECTS =	$(addsuffix .o, $(basename $(wildcard *.c)))
 libs:
 	echo "Compiling xxvethernet"
 	$(COMPILER) $(COMPILER_FLAGS) $(EXTRA_COMPILER_FLAGS) $(INCLUDES) $(LIBSOURCES)
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} $(OBJECTS)
 	make clean
 
 include:

diff --git a/lib/bsp/standalone/src/arm/ARMv8/32bit/gcc/Makefile b/lib/bsp/standalone/src/arm/ARMv8/32bit/gcc/Makefile
@@ -59,7 +59,7 @@ standalone_libs: $(LIBSOURCES)
 	echo "Compiling standalone"
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS) $(INCLUDES) $(filter-out _exit.c, $^)
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS_NO_FLTO) $(INCLUDES) _exit.c
-	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(ARCHIVER) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS}
 
 .PHONY: include
 include: standalone_includes

diff --git a/lib/bsp/standalone/src/arm/ARMv8/64bit/gcc/Makefile b/lib/bsp/standalone/src/arm/ARMv8/64bit/gcc/Makefile
@@ -57,7 +57,7 @@ standalone_libs: $(LIBSOURCES)
 	echo "Compiling standalone ARMv8 64 bit"
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS) $(INCLUDES) $(filter-out _exit.c, $^)
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS_NO_FLTO) $(INCLUDES) _exit.c
-	$(AR) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(AR) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS}
 
 .PHONY: include
 include: standalone_includes

diff --git a/lib/bsp/standalone/src/arm/cortexa9/gcc/Makefile b/lib/bsp/standalone/src/arm/cortexa9/gcc/Makefile
@@ -63,7 +63,7 @@ libs: $(LIBS)
 standalone_libs: $(LIBSOURCES)
 	echo "Compiling standalone"
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS) $(INCLUDES) $^
-	$(AR) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(AR) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS}
 
 profile_libs:
 	$(MAKE) -C profile COMPILER_FLAGS="$(COMPILER_FLAGS)" EXTRA_COMPILER_FLAGS="$(EXTRA_COMPILER_FLAGS)" COMPILER="$(CC)" ARCHIVER="$(AR)" libs

diff --git a/lib/bsp/standalone/src/arm/cortexr5/gcc/Makefile b/lib/bsp/standalone/src/arm/cortexr5/gcc/Makefile
@@ -63,7 +63,7 @@ standalone_libs: $(LIBSOURCES)
 	echo "Compiling standalone R5"
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS) $(INCLUDES) $(filter-out _exit.c, $^)
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS_NO_FLTO) $(INCLUDES) _exit.c
-	$(AR) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(AR) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS}
 
 .PHONY: include
 include: standalone_includes

diff --git a/lib/bsp/standalone/src/microblaze/Makefile b/lib/bsp/standalone/src/microblaze/Makefile
@@ -56,7 +56,7 @@ libs: $(LIBS)
 standalone_libs: $(LIBSOURCES)
 	echo "Compiling standalone";
 	$(CC) $(CC_FLAGS) $(ECC_FLAGS) $(INCLUDES) $^
-	$(AR) -r ${RELEASEDIR}/${LIB} ${OUTS}
+	$(AR) -r ${RELEASEDIR}/${LIB} ${OBJECTS} ${ASSEMBLY_OBJECTS}
 
 profile_libs:
 	$(MAKE) -C profile COMPILER_FLAGS="$(COMPILER_FLAGS)" EXTRA_COMPILER_FLAGS="$(EXTRA_COMPILER_FLAGS)" COMPILER="$(CC)" ARCHIVER="$(AR)" AS="$(AS)" libs