>>> On 09.01.19 at 16:02, <roger....@citrix.com> wrote:
> From: Xen-devel <xen-devel-boun...@lists.xenproject.org> on behalf of Jan 
> Beulich 
> <jbeul...@suse.com>:
> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -21,7 +21,7 @@ obj-$(CONFIG_KEXEC) += kimage.o
>  obj-y += lib.o
>  obj-$(CONFIG_NEEDS_LIST_SORT) += list_sort.o
>  obj-$(CONFIG_LIVEPATCH) += livepatch.o livepatch_elf.o
> -obj-y += lzo.o
> +obj-$(CONFIG_TMEM) += lzo.o
> 
> Here you completely disable the build of lzo if tmem is not enabled.
> 
>  obj-$(CONFIG_MEM_ACCESS) += mem_access.o
>  obj-y += memory.o
>  obj-y += monitor.o
> @@ -66,8 +66,9 @@ obj-bin-y += warning.init.o
>  obj-$(CONFIG_XENOPROF) += xenoprof.o
>  obj-y += xmalloc_tlsf.o
> 
> -obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma unlzo 
> unlz4 earlycpio,$(n).init.o)
> -
> +lzo-y := lzo
> +lzo-$(CONFIG_TMEM) :=
> +obj-bin-$(CONFIG_X86) += $(foreach n,decompress bunzip2 unxz unlzma $(lzo-y) 
> unlzo unlz4 earlycpio,$(n).init.o)
> 
> Here however you always build unlzo.c, which AFAICT makes use of the 
> lzo1x_decompress_safe function that's defined in lzo.c.

Note the (new) definition and use of lzo-y, so together with unlzo.init.o
lzo.init.o will also be built. (I can assure you that I did test with TMEM
enabled and disabled.)

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Reply via email to