Re: [Qemu-devel] [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl

[Peter Maydell]

On 9 July 2014 21:49, Stefano Stabellini
<address@hidden> wrote:
> The following commit:
>
> commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
> Author: Stefano Stabellini <address@hidden>
> Date:   Mon Jul 7 16:25:07 2014 +0100
>
>     disas/libvixl: prepend the include path of libvixl header files
>
> moves -Idisas/libvixl at the beginning of QEMU_CFLAGS.
> QEMU 2.0 needs one more fix to disas/Makefile.objs.
> QEMU 2.1 uses $($*.o-cflags) to accomplish the same thing, see:
>
> http://marc.info/?l=xen-devel&m=140493820011322
>
> I had to fix QEMU 2.0 too because qemu-xen is based on QEMU 2.0.
>
> Signed-off-by: Stefano Stabellini <address@hidden>
>
> diff --git a/disas/Makefile.objs b/disas/Makefile.objs
> index 41c2374..a70c592 100644
> --- a/disas/Makefile.objs
> +++ b/disas/Makefile.objs
> @@ -4,7 +4,7 @@ common-obj-$(CONFIG_ARM_DIS) += arm.o
>  common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o
>  common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/
>  libvixldir = $(SRC_PATH)/disas/libvixl
> -$(obj)/arm-a64.o: QEMU_CFLAGS += -I$(libvixldir)
> +$(obj)/arm-a64.o: QEMU_CFLAGS := -I$(libvixldir) $(QEMU_CFLAGS)
>  common-obj-$(CONFIG_CRIS_DIS) += cris.o
>  common-obj-$(CONFIG_HPPA_DIS) += hppa.o
>  common-obj-$(CONFIG_I386_DIS) += i386.o

Are you hoping for this to be committed to upstream QEMU's 2.0
branch? If so you should cc stable. Or are you just going to carry
it locally in qemu-xen?

thanks
-- PMM