[Xen-changelog] [qemu-upstream-unstable] disas/libvixl: prepend the include path of libvixl header files

[patchbot@xxxxxxx]

commit 978c62ba67704c6b93070aa467c8b31c0d07d1f9
Author:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
AuthorDate: Mon Jul 7 16:25:07 2014 +0100
Commit:     Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
CommitDate: Tue Jul 8 18:51:58 2014 +0000

    disas/libvixl: prepend the include path of libvixl header files
    
    Currently the Makefile of disas/libvixl appends
    -I$(SRC_PATH)/disas/libvixl to QEMU_CFLAGS. As a consequence C++ files
    that #include "utils.h", such as disas/libvixl/a64/instructions-a64.cc,
    are going to look for utils.h on all the other include paths first.
    
    When building QEMU as part of the Xen make system, another unrelated
    utils.h file is going to be chosen for inclusion, causing a build
    failure:
    
    In file included from disas/libvixl/a64/instructions-a64.cc:27:0:
    /qemu/disas/libvixl/a64/instructions-a64.h:88:64: error:
    'rawbits_to_float' was not declared in this scope
     const float kFP32PositiveInfinity = rawbits_to_float(0x7f800000);
    
    Fix the problem by prepending (rather than appending) the libvixl
    include path to QEMU_CFLAGS.
    
    upstream-commit-id: 834fb1b269f4c9eb0ffc058fd6ab5a018c3bce1f
    
    Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
---
 disas/libvixl/Makefile.objs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs
index 0adb3ce..17e6565 100644
--- a/disas/libvixl/Makefile.objs
+++ b/disas/libvixl/Makefile.objs
@@ -3,6 +3,6 @@ libvixl_OBJS = utils.o \
                a64/decoder-a64.o \
                a64/disasm-a64.o
 
-$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += 
-I$(SRC_PATH)/disas/libvixl
+$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := 
-I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS)
 
 common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog