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
Signed-off-by: Christian Ehrhardt <christian.ehrha...@canonical.com>
---
disas/arm-a64.cc | 2 +-
disas/nanomips.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
index 9fa779e175..27613d4b25 100644
--- a/disas/arm-a64.cc
+++ b/disas/arm-a64.cc
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-extern "C" {
#include "qemu/osdep.h"
+extern "C" {
#include "disas/dis-asm.h"
}
diff --git a/disas/nanomips.cpp b/disas/nanomips.cpp
index 90e63b8367..3c202075cc 100644
--- a/disas/nanomips.cpp
+++ b/disas/nanomips.cpp
@@ -27,8 +27,8 @@
* Reference Manual", Revision 01.01, April 27, 2018
*/
-extern "C" {
#include "qemu/osdep.h"
+extern "C" {
#include "disas/dis-asm.h"
}
--
2.30.0
