From: Peter Maydell <peter.maydell@linaro.org>
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Cc: qemu-devel <qemu-devel@nongnu.org>
Subject: Re: [PATCH] disas: Fix build with glib2.0 >=2.67.3
Date: Tue, 23 Feb 2021 15:43:48 +0000 [thread overview]
Message-ID: <CAFEAcA-LiCAK5EPCqwxOvJofhkoNpYs6UyrjrkOkYLTfJAxfmg@mail.gmail.com> (raw)
In-Reply-To: <20210223145646.4129643-1-christian.ehrhardt@canonical.com>
On Tue, 23 Feb 2021 at 15:03, Christian Ehrhardt
<christian.ehrhardt@canonical.com> wrote:
>
> glib2.0 introduced a change in 2.67.3 and later which triggers an
> issue [1] for anyone including it's headers in a "extern C" context
> which a few files in disas/* do. An example of such an include chain
> and error look like:
>
> ../../disas/arm-a64.cc
> In file included from /usr/include/glib-2.0/glib/gmacros.h:241,
> from /usr/lib/x86_64-linux-gnu/glib-2.0/include/glibconfig.h:9,
> from /usr/include/glib-2.0/glib/gtypes.h:32,
> from /usr/include/glib-2.0/glib/galloca.h:32,
> from /usr/include/glib-2.0/glib.h:30,
> from /<<BUILDDIR>>/qemu-5.2+dfsg/include/glib-compat.h:32,
> from /<<BUILDDIR>>/qemu-5.2+dfsg/include/qemu/osdep.h:126,
> from ../../disas/arm-a64.cc:21:
> /usr/include/c++/10/type_traits:56:3: error: template with C linkage
> 56 | template<typename _Tp, _Tp __v>
> | ^~~~~~~~
> ../../disas/arm-a64.cc:20:1: note: ‘extern "C"’ linkage started here
> 20 | extern "C" {
> | ^~~~~~~~~~
>
> To fix that move the include of osdep.h out of that section. It was added
> already as C++ fixup by e78490c44: "disas/arm-a64.cc: Include osdep.h first".
>
> [1]: https://gitlab.gnome.org/GNOME/glib/-/issues/2331
I'm not convinced by this as a fix, though I'm happy to be corrected
by somebody with a fuller understanding of C++. glib.h may be supposed
to work as a C++ header, but osdep.h as a whole is definitely a C header,
so I think it ought to be inside 'extern C'; and it has to be
the first header included; and it happens to want to include glib.h.
Fixing glib.h seems like it would be nicer, assuming they haven't
already shipped this breakage. Failing that, does it work to do:
/*
* glib.h expects to be included as a C++ header if we're
* building a C++ file, but osdep.h and thus glib-compat.h are
* C headers and should be inside an "extern C" block.
*/
#ifdef __cplusplus
extern "C++" {
#include <glib.h>
#if defined(G_OS_UNIX)
#include <glib-unix.h>
#endif
}
in include/glib-compat.h ?
thanks
-- PMM
next prev parent reply other threads:[~2021-02-23 15:45 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-23 14:56 [PATCH] disas: Fix build with glib2.0 >=2.67.3 Christian Ehrhardt
2021-02-23 15:43 ` Peter Maydell [this message]
2021-02-23 16:07 ` Daniel P. Berrangé
2021-02-24 7:38 ` Christian Ehrhardt
2021-02-24 11:04 ` Daniel P. Berrangé
2021-02-24 13:07 ` Peter Maydell
2021-02-24 13:15 ` Daniel P. Berrangé
2021-03-08 13:50 ` Christian Ehrhardt
2021-03-08 13:55 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFEAcA-LiCAK5EPCqwxOvJofhkoNpYs6UyrjrkOkYLTfJAxfmg@mail.gmail.com \
--to=peter.maydell@linaro.org \
--cc=christian.ehrhardt@canonical.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).