On 5 May 2014 19:01, Michael Tokarev <m...@tls.msk.ru> wrote: > Here's another pull request for trival patches. > This time, it includes: > > - many cleanups from Stefan Weil, mostly adding `static' attrs > - some more trivial patches from glib cleanups, by me and Stefan Hajnoczi > - some more trivial changes for libcacard, from me and Alon Levy > - small fixes from Chen Gang (debug) and Peter Maydell (tests) > - little makefile cleanups and configure fix from me > - documentation fixes from Fam Zheng > - and some more random things > > All are little things here and there, just how -trivial tree should really be.
Hi; I'm afraid this pull breaks the build of the A64 disassembler: c++ -I/home/petmay01/linaro/qemu-for-merges/tcg -I/home/petmay01/linaro/qemu-for-merges/tcg/i386 -I/home/petmay01/linaro/qemu-for-merges/linux-headers -I/home/petmay01/linaro/qemu-for-merges/build/alldbg/linux-headers -I. -I/home/petmay01/linaro/qemu-for-merges -I/home/petmay01/linaro/qemu-for-merges/include -I/home/petmay01/linaro/qemu-for-merges/libcacard -I/home/petmay01/linaro/qemu-for-merges/disas -Idisas -D__STDC_LIMIT_MACROS -Werror -fPIE -DPIE -m64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wall -Wundef -Wwrite-strings -fno-strict-aliasing -fno-common -Wendif-labels -Wmissing-include-dirs -Wempty-body -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wtype-limits -fstack-protector-all -I/usr/include/p11-kit-1 -I/usr/include/libpng12 -I/usr/include/nss -I/usr/include/nspr -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/home/petmay01/linaro/qemu-for-merges/tests -MMD -MP -MT disas/arm-a64.o -MF disas/arm-a64.d -pthread -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -g -c -o disas/arm-a64.o /home/petmay01/linaro/qemu-for-merges/disas/arm-a64.cc /home/petmay01/linaro/qemu-for-merges/disas/arm-a64.cc:20:28: fatal error: a64/disasm-a64.h: No such file or directory compilation terminated. make: *** [disas/arm-a64.o] Error 1 > Makefiles: convert some obj-specific CFLAGS to use new foo.o-cflags > syntax git bisect says it's this makefile change. I think the problem here is that the rune for applying obj-specific CFLAGS is only in the Rules.make line for %.o: %.c, and not in the lines for building a .o file from a .cc, .cpp or .m file. That should probably be fixed. thanks -- PMM
