* [Qemu-devel] [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl
@ 2014-07-09 20:49 ` Stefano Stabellini
0 siblings, 0 replies; 6+ messages in thread
From: Stefano Stabellini @ 2014-07-09 20:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, xen-devel, Stefano Stabellini
The following commit:
commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
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 <stefano.stabellini@eu.citrix.com>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl
@ 2014-07-09 20:49 ` Stefano Stabellini
0 siblings, 0 replies; 6+ messages in thread
From: Stefano Stabellini @ 2014-07-09 20:49 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, xen-devel, Stefano Stabellini
The following commit:
commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
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 <stefano.stabellini@eu.citrix.com>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl
2014-07-09 20:49 ` Stefano Stabellini
@ 2014-07-09 21:54 ` Peter Maydell
-1 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2014-07-09 21:54 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel@lists.xensource.com Devel, QEMU Developers
On 9 July 2014 21:49, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> The following commit:
>
> commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
> Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 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 <stefano.stabellini@eu.citrix.com>
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl
@ 2014-07-09 21:54 ` Peter Maydell
0 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2014-07-09 21:54 UTC (permalink / raw)
To: Stefano Stabellini; +Cc: xen-devel@lists.xensource.com Devel, QEMU Developers
On 9 July 2014 21:49, Stefano Stabellini
<stefano.stabellini@eu.citrix.com> wrote:
> The following commit:
>
> commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
> Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 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 <stefano.stabellini@eu.citrix.com>
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl
2014-07-09 21:54 ` Peter Maydell
@ 2014-07-09 22:02 ` Stefano Stabellini
-1 siblings, 0 replies; 6+ messages in thread
From: Stefano Stabellini @ 2014-07-09 22:02 UTC (permalink / raw)
To: Peter Maydell
Cc: qemu-stable, xen-devel@lists.xensource.com Devel,
QEMU Developers, Stefano Stabellini
On Wed, 9 Jul 2014, Peter Maydell wrote:
> On 9 July 2014 21:49, Stefano Stabellini
> <stefano.stabellini@eu.citrix.com> wrote:
> > The following commit:
> >
> > commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
> > Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > 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 <stefano.stabellini@eu.citrix.com>
> >
> > 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?
I am happy either way. I imagine that having it in stable would make the
life of distro packagers a bit easier. However that predicates on you
being happy with the change :-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl
@ 2014-07-09 22:02 ` Stefano Stabellini
0 siblings, 0 replies; 6+ messages in thread
From: Stefano Stabellini @ 2014-07-09 22:02 UTC (permalink / raw)
To: Peter Maydell
Cc: qemu-stable, xen-devel@lists.xensource.com Devel,
QEMU Developers, Stefano Stabellini
On Wed, 9 Jul 2014, Peter Maydell wrote:
> On 9 July 2014 21:49, Stefano Stabellini
> <stefano.stabellini@eu.citrix.com> wrote:
> > The following commit:
> >
> > commit 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
> > Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> > 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 <stefano.stabellini@eu.citrix.com>
> >
> > 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?
I am happy either way. I imagine that having it in stable would make the
life of distro packagers a bit easier. However that predicates on you
being happy with the change :-)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-07-09 22:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-09 20:49 [Qemu-devel] [PATCH QEMU-2.0/qemu-xen] disas/Makefile.objs: prepend -Idisas/libvixl Stefano Stabellini
2014-07-09 20:49 ` Stefano Stabellini
2014-07-09 21:54 ` [Qemu-devel] " Peter Maydell
2014-07-09 21:54 ` Peter Maydell
2014-07-09 22:02 ` [Qemu-devel] " Stefano Stabellini
2014-07-09 22:02 ` Stefano Stabellini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.