diff options
| author | Pedro Alves <palves@redhat.com> | 2016-04-15 21:14:07 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-04-16 00:29:08 +0100 |
| commit | d7abe1019dbff66b6abfb32df90d0c13328710ee (patch) | |
| tree | 90d7c9db02f3dbe1322e1fad710f2a3a6fc7d0ff /gdb | |
| parent | 6fd8e7c249dcefd937897f743e886751adb90c90 (diff) | |
| download | fsf-binutils-gdb-d7abe1019dbff66b6abfb32df90d0c13328710ee.zip fsf-binutils-gdb-d7abe1019dbff66b6abfb32df90d0c13328710ee.tar.gz fsf-binutils-gdb-d7abe1019dbff66b6abfb32df90d0c13328710ee.tar.bz2 | |
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.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | 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; |