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.
This commit is contained in:
Pedro Alves 2016-04-15 21:14:07 +01:00
parent 6fd8e7c249
commit d7abe1019d
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
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

View File

@ -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;