This is the mail archive of the
gdb-cvs@sourceware.org
mailing list for the GDB project.
[binutils-gdb] Fix gdb C++ build when libipt is available
- From: Pedro Alves <palves at sourceware dot org>
- To: gdb-cvs at sourceware dot org
- Date: 15 Apr 2016 23:31:32 -0000
- Subject: [binutils-gdb] Fix gdb C++ build when libipt is available
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=d7abe1019dbff66b6abfb32df90d0c13328710ee
commit d7abe1019dbff66b6abfb32df90d0c13328710ee
Author: Pedro Alves <palves@redhat.com>
Date: Fri Apr 15 21:14:07 2016 +0100
Fix gdb C++ build when libipt is available
With libipt's headers installed, a build with --enable-build-with-cxx
fails with:
.../src/gdb/btrace.c: In function â??btrace_insn_flag pt_btrace_insn_flags(const pt_insn*)â??:
.../src/gdb/btrace.c:734:33: error: invalid conversion from â??intâ?? to â??btrace_insn_flagâ?? [-fpermissive]
enum btrace_insn_flag flags = 0;
^
.../src/gdb/btrace.c:737:11: error: invalid conversion from â??intâ?? to â??btrace_insn_flagâ?? [-fpermissive]
flags |= BTRACE_INSN_FLAG_SPECULATIVE;
^
gdb/ChangeLog:
2016-04-15 Pedro Alves <palves@redhat.com>
* btrace.c (pt_btrace_insn_flags): Change return type to
btrace_insn_flags. Use btrace_insn_flags for local.
Diff:
---
gdb/ChangeLog | 5 +++++
gdb/btrace.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d628bc1..f879b8a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
2016-04-15 Pedro Alves <palves@redhat.com>
+ * btrace.c (pt_btrace_insn_flags): Change return type to
+ btrace_insn_flags. Use btrace_insn_flags for local.
+
+2016-04-15 Pedro Alves <palves@redhat.com>
+
* nat/linux-ptrace.h [__mips__] (GDB_ARCH_IS_TRAP_BRKPT): Also
accept TRAP_BRKPT.
[__mips__] (GDB_ARCH_IS_TRAP_HWBKPT): Also accept TRAP_HWBKPT.
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 7c4da09..f2cb750 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -728,10 +728,10 @@ pt_reclassify_insn (enum pt_insn_class iclass)
/* Return the btrace instruction flags for INSN. */
-static enum btrace_insn_flag
+static btrace_insn_flags
pt_btrace_insn_flags (const struct pt_insn *insn)
{
- enum btrace_insn_flag flags = 0;
+ btrace_insn_flags flags = 0;
if (insn->speculative)
flags |= BTRACE_INSN_FLAG_SPECULATIVE;