From patchwork Fri Apr 15 23:31:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 11772 Received: (qmail 56613 invoked by alias); 15 Apr 2016 23:31:52 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 56590 invoked by uid 89); 15 Apr 2016 23:31:51 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=HContent-Transfer-Encoding:8bit X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 15 Apr 2016 23:31:50 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A68D2811DF for ; Fri, 15 Apr 2016 23:31:49 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u3FNVmJ8030982 for ; Fri, 15 Apr 2016 19:31:49 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [ob/pushed] Fix gdb C++ build when libipt is available Date: Sat, 16 Apr 2016 00:31:48 +0100 Message-Id: <1460763108-24964-1-git-send-email-palves@redhat.com> MIME-Version: 1.0 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 * btrace.c (pt_btrace_insn_flags): Change return type to btrace_insn_flags. Use btrace_insn_flags for local. --- 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 + * btrace.c (pt_btrace_insn_flags): Change return type to + btrace_insn_flags. Use btrace_insn_flags for local. + +2016-04-15 Pedro Alves + * 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;