From patchwork Thu Aug 11 11:04:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 14484 Received: (qmail 77950 invoked by alias); 11 Aug 2016 11:04:48 -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 77526 invoked by uid 89); 11 Aug 2016 11:04:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1514 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; Thu, 11 Aug 2016 11:04:43 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (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 EACD381F01 for ; Thu, 11 Aug 2016 11:04:41 +0000 (UTC) Received: from cascais.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7BB4e41032538 for ; Thu, 11 Aug 2016 07:04:41 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [pushed master+7.12] Fix fallout from gdb/20413's fix (x32: linux_ptrace_test_ret_to_nx: Cannot PTRACE_PEEKUSER) Date: Thu, 11 Aug 2016 12:04:40 +0100 Message-Id: <1470913480-21372-1-git-send-email-palves@redhat.com> Fixes, on NIOS GNU/Linux: In file included from /scratch/mbilal/nois-lite/src/gdb-trunk/gdb/gdbserver/../nat/linux-ptrace.c:26:0: /scratch/mbilal/nois-lite/src/gdb-trunk/gdb/gdbserver/../gregset.h:27:23: error: unknown type name 'gregset_t' #define GDB_GREGSET_T gregset_t ^ Fix this by including sys/procfs.h directly. We shouldn't really be including a gdb-only header in a gdb/nat/ file, anyway. Whoops. gdb/ChangeLog: 2016-08-11 Pedro Alves PR gdb/20413 * nat/linux-ptrace.c: Include instead of "gregset.h". --- gdb/ChangeLog | 6 ++++++ gdb/nat/linux-ptrace.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 61cc8c1..0f08ec0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2016-08-11 Pedro Alves + + PR gdb/20413 + * nat/linux-ptrace.c: Include instead of + "gregset.h". + 2016-08-10 Pedro Alves PR gdb/19187 diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c index 980ed53..f00f179 100644 --- a/gdb/nat/linux-ptrace.c +++ b/gdb/nat/linux-ptrace.c @@ -23,7 +23,7 @@ #include "buffer.h" #include "gdb_wait.h" #include "gdb_ptrace.h" -#include "gregset.h" +#include /* Stores the ptrace options supported by the running kernel. A value of -1 means we did not check for features yet. A value