From: Gavin Shan <gshan@redhat.com>
To: qemu-arm@nongnu.org
Cc: peter.maydell@linaro.org, richard.henderson@linaro.org,
qemu-devel@nongnu.org, shan.gavin@gmail.com
Subject: [PATCH 1/2] disas/arm-a64.cc: Fix build error
Date: Sat, 20 Mar 2021 12:18:54 +0800 [thread overview]
Message-ID: <20210320041854.68668-1-gshan@redhat.com> (raw)
This fixes the following build error with gcc v11.0.0:
# gcc --version
gcc (GCC) 11.0.0 20210210 (Red Hat 11.0.0-0)
[969/2604] Compiling C++ object libcommon.fa.p/disas_arm-a64.cc.o
FAILED: libcommon.fa.p/disas_arm-a64.cc.o
:
In file included from /usr/include/glib-2.0/glib/gmacros.h:241,
from /usr/lib64/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 /home/gavin/sandbox/qemu.main/include/glib-compat.h:32,
from /home/gavin/sandbox/qemu.main/include/qemu/osdep.h:126,
from ../disas/arm-a64.cc:21:
/usr/include/c++/11/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" {
| ^~~~~~~~~~
Signed-off-by: Gavin Shan <gshan@redhat.com>
---
disas/arm-a64.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/disas/arm-a64.cc b/disas/arm-a64.cc
index 9fa779e175..8545c04038 100644
--- a/disas/arm-a64.cc
+++ b/disas/arm-a64.cc
@@ -17,13 +17,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "vixl/a64/disasm-a64.h"
+
extern "C" {
#include "qemu/osdep.h"
#include "disas/dis-asm.h"
}
-#include "vixl/a64/disasm-a64.h"
-
using namespace vixl;
static Decoder *vixl_decoder = NULL;
--
2.23.0
next reply other threads:[~2021-03-20 4:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 4:18 Gavin Shan [this message]
2021-03-22 11:33 ` [PATCH 1/2] disas/arm-a64.cc: Fix build error Miroslav Rezanina
2021-03-22 13:18 ` Philippe Mathieu-Daudé
2021-04-06 14:27 ` [PATCH-for-6.0 " Philippe Mathieu-Daudé
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=20210320041854.68668-1-gshan@redhat.com \
--to=gshan@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=shan.gavin@gmail.com \
/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).