On Tue, Aug 29, 2023 at 11:30 AM Peter Maydell <peter.maydell@linaro.org>
wrote:
> On Tue, 29 Aug 2023 at 14:51, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> >
> > Applied, thanks. In the future, please invoke git-request-pull(1) with
> > the public HTTPS repo URL to make it easier for anyone to fetch the
> > changes:
> >
> > > are available in the Git repository at:
> > >
> > > git@gitlab.com:bsdimp/qemu.git tags/2023q3-bsd-user-pull-request
> > ^^^^^^^^^^^^^^
>
> Hi; it looks like this broke the clang-user build. Here's
> a gitlab CI run on my local branch:
> https://gitlab.com/pm215/qemu/-/jobs/4975956600
>
> In file included from ../../linux-user/arm/cpu_loop.c:21:
> ../../linux-user/qemu.h:210:9: error: 'PRAGMA_DISABLE_PACKED_WARNING'
> macro redefined [-Werror,-Wmacro-redefined]
> #define PRAGMA_DISABLE_PACKED_WARNING \
> ^
> /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/include/qemu/compiler.h:42:9:
> note: previous definition is here
> #define PRAGMA_DISABLE_PACKED_WARNING \
> ^
> 1 error generated.
>
> Looks like commit 15b950ecd16ecc added definitions
> of PRAGMA_DISABLE_PACKED_WARNING and PRAGMA_REENABLE_PACKED_WARNING
> to compiler.h without reconciling them with the
> slightly different ones in linux-user/qemu.h.
>
> Can we have a revert (or a quick fix), please ?
>
I'll look into right now. I think the solution is simple and I can have
something quickly (1-2 hours tops)
Warner