Message ID | 1401223884-30702-1-git-send-email-rth@twiddle.net |
---|---|
State | New |
Headers | show |
On 27 May 2014 21:51, Richard Henderson <rth@twiddle.net> wrote: > A collection of 4 patch sets accumulated over the last three weeks. > The final one fixes bugs visible in the s390 port, and (shortly) in > the ppc64 port. > > This time with Paolo's and Alex's Reviewed-by tags. > > Please pull. The merge of this fails to build for me (32 bit ARM host): CC lm32-softmmu/target-lm32/lm32-semi.o In file included from /root/qemu/target-lm32/lm32-semi.c:18:0: /root/qemu/target-lm32/helper.h:1:31: error: expected ‘)’ before ‘void’ make[1]: *** [target-lm32/lm32-semi.o] Error 1 (conflict with the lm32-semihosting branch which got applied first?) thanks -- PMM
On 05/28/2014 07:22 AM, Peter Maydell wrote: > The merge of this fails to build for me (32 bit ARM host): > CC lm32-softmmu/target-lm32/lm32-semi.o > In file included from /root/qemu/target-lm32/lm32-semi.c:18:0: > /root/qemu/target-lm32/helper.h:1:31: error: expected ‘)’ before ‘void’ > make[1]: *** [target-lm32/lm32-semi.o] Error 1 > > (conflict with the lm32-semihosting branch which got applied first?) Yep. It's a one-line fix. r~