Introduce arch/x86/lib/, and make it the home for the somewhat misplaced x86-specific file that lived in the arch-independent lib/.
Signed-off-by: Jan Beulich <[email protected]> --- xen/arch/x86/Makefile | 1 + xen/arch/x86/arch.mk | 2 ++ xen/arch/x86/lib/Makefile | 1 + .../x86-generic-hweightl.c => arch/x86/lib/generic-hweightl.c} | 0 xen/lib/Makefile | 1 - 5 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 xen/arch/x86/lib/Makefile rename xen/{lib/x86-generic-hweightl.c => arch/x86/lib/generic-hweightl.c} (100%) diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile index 300cc67407e9..61e2293a467e 100644 --- a/xen/arch/x86/Makefile +++ b/xen/arch/x86/Makefile @@ -5,6 +5,7 @@ obj-y += efi/ obj-y += genapic/ obj-$(CONFIG_GUEST) += guest/ obj-$(CONFIG_HVM) += hvm/ +obj-y += lib/ obj-y += mm/ obj-$(CONFIG_XENOPROF) += oprofile/ obj-$(CONFIG_PV) += pv/ diff --git a/xen/arch/x86/arch.mk b/xen/arch/x86/arch.mk index 16368a498bb7..a0ee050c931b 100644 --- a/xen/arch/x86/arch.mk +++ b/xen/arch/x86/arch.mk @@ -3,6 +3,8 @@ export XEN_IMG_OFFSET := 0x200000 +ALL_LIBS-y += arch/x86/lib/lib.a + CFLAGS += -DXEN_IMG_OFFSET=$(XEN_IMG_OFFSET) # Prevent floating-point variables from creeping into Xen. diff --git a/xen/arch/x86/lib/Makefile b/xen/arch/x86/lib/Makefile new file mode 100644 index 000000000000..ddf7e19bdc1d --- /dev/null +++ b/xen/arch/x86/lib/Makefile @@ -0,0 +1 @@ +lib-y += generic-hweightl.o diff --git a/xen/lib/x86-generic-hweightl.c b/xen/arch/x86/lib/generic-hweightl.c similarity index 100% rename from xen/lib/x86-generic-hweightl.c rename to xen/arch/x86/lib/generic-hweightl.c diff --git a/xen/lib/Makefile b/xen/lib/Makefile index 5ccb1e5241c5..38c1c7d6845c 100644 --- a/xen/lib/Makefile +++ b/xen/lib/Makefile @@ -38,7 +38,6 @@ lib-y += strtol.o lib-y += strtoll.o lib-y += strtoul.o lib-y += strtoull.o -lib-$(CONFIG_X86) += x86-generic-hweightl.o lib-$(CONFIG_X86) += xxhash32.o lib-$(CONFIG_X86) += xxhash64.o
