Now that the build system supports it, build the $(ARCH)/lib/ directories
actually into libraries, thus permitting unreferenced objects to be
omitted.

Signed-off-by: Jan Beulich <[email protected]>
---
v2: New.
---
 xen/arch/arm/arch.mk            |  2 ++
 xen/arch/arm/arm32/lib/Makefile | 10 +++++-----
 xen/arch/arm/arm64/lib/Makefile |  8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/xen/arch/arm/arch.mk b/xen/arch/arm/arch.mk
index 9c4bedfb3bd4..dea8dbd18a44 100644
--- a/xen/arch/arm/arch.mk
+++ b/xen/arch/arm/arch.mk
@@ -1,6 +1,8 @@
 ########################################
 # arm-specific definitions
 
+ARCH_LIBS-y += arch/arm/$(ARCH)/lib/lib.a
+
 $(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
 $(call cc-option-add,CFLAGS,CC,-Wnested-externs)
 
diff --git a/xen/arch/arm/arm32/lib/Makefile b/xen/arch/arm/arm32/lib/Makefile
index 18326b284e3b..f5ff7f92d195 100644
--- a/xen/arch/arm/arm32/lib/Makefile
+++ b/xen/arch/arm/arm32/lib/Makefile
@@ -1,5 +1,5 @@
-obj-y += memcpy.o memmove.o memset.o memchr.o
-obj-y += findbit.o
-obj-y += bitops.o
-obj-y += strchr.o strrchr.o
-obj-y += lib1funcs.o lshrdi3.o div64.o
+lib-y += memcpy.o memmove.o memset.o memchr.o
+lib-y += findbit.o
+lib-y += bitops.o
+lib-y += strchr.o strrchr.o
+lib-y += lib1funcs.o lshrdi3.o div64.o
diff --git a/xen/arch/arm/arm64/lib/Makefile b/xen/arch/arm/arm64/lib/Makefile
index 66cfac435ab4..d6b231dc6193 100644
--- a/xen/arch/arm/arm64/lib/Makefile
+++ b/xen/arch/arm/arm64/lib/Makefile
@@ -1,4 +1,4 @@
-obj-y += memcpy.o memcmp.o memmove.o memset.o memchr.o
-obj-y += clear_page.o
-obj-y += bitops.o
-obj-y += strchr.o strcmp.o strlen.o strncmp.o strnlen.o strrchr.o
+lib-y += memcpy.o memcmp.o memmove.o memset.o memchr.o
+lib-y += clear_page.o
+lib-y += bitops.o
+lib-y += strchr.o strcmp.o strlen.o strncmp.o strnlen.o strrchr.o


Reply via email to