diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d628bc10725..f879b8ad346 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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
diff --git a/gdb/btrace.c b/gdb/btrace.c
index 7c4da093b2f..f2cb7504e47 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;