From patchwork Fri Jun 27 09:10:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 1787 Received: (qmail 766 invoked by alias); 27 Jun 2014 09:51:57 -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 749 invoked by uid 89); 27 Jun 2014 09:51:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 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, 27 Jun 2014 09:51:55 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5R9AQxE014802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 27 Jun 2014 05:10:27 -0400 Received: from blade.nx (ovpn-116-77.ams2.redhat.com [10.36.116.77]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5R9APYG017716 for ; Fri, 27 Jun 2014 05:10:25 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 02C672640C2 for ; Fri, 27 Jun 2014 10:10:22 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 7/7] Tidy #include lists Date: Fri, 27 Jun 2014 10:10:09 +0100 Message-Id: <1403860209-475-8-git-send-email-gbenson@redhat.com> In-Reply-To: <1403860209-475-1-git-send-email-gbenson@redhat.com> References: <1403860209-475-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit tidies up the #include lists in {i386,amd64}-linux-nat.c, removing headers that are no longer required and reordering some lines so that both files roughly match. Additionally, an unused definition was removed from the middle of the #include list in i386-linux-nat.c. gdb/ 2014-06-27 Gary Benson * amd64-linux-nat.c (gdbcore.h): Removed include. (regset.h): Likewise. (nat/linux-btrace.h): Likewise. (btrace.h): Likewise. (gdb_assert.h): Likewise. (string.h): Likewise. (sys/uio.h): Likewise. (sys/debugreg.h): Likewise. (sys/syscall.h): Likewise. (sys/procfs.h): Likewise. (sys/user.h): Likewise. (asm/ptrace.h): Likewise. (i386-nat.h): Likewise. * i386-linux-nat.c (i386-nat.h): Likewise. (regset.h): Likewise. (target.h): Likewise. (linux-nat.h): Likewise. (nat/linux-btrace.h): Likewise. (btrace.h): Likewise. (gdb_assert.h): Likewise. (string.h): Likewise. (sys/uio.h): Likewise. (sys/user.h): Likewise. (sys/procfs.h): Likewise. (sys/reg.h): Likewise. (sys/debugreg.h): Likewise. (ORIG_EAX): Removed definition. --- gdb/ChangeLog | 30 ++++++++++++++++++++++++++++++ gdb/amd64-linux-nat.c | 32 +++++--------------------------- gdb/i386-linux-nat.c | 33 +++------------------------------ 3 files changed, 38 insertions(+), 57 deletions(-) diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c index bd03ea3..5ac09c6 100644 --- a/gdb/amd64-linux-nat.c +++ b/gdb/amd64-linux-nat.c @@ -20,42 +20,20 @@ #include "defs.h" #include "inferior.h" -#include "gdbcore.h" #include "regcache.h" -#include "regset.h" -#include "linux-nat.h" -#include "amd64-linux-tdep.h" -#include "nat/linux-btrace.h" -#include "btrace.h" - -#include "gdb_assert.h" -#include #include "elf/common.h" -#include #include -#include -#include -#include -#include #include -/* FIXME ezannoni-2003-07-09: we need to be included after - because the latter redefines FS and GS for no apparent - reason, and those definitions don't match the ones that libpthread_db - uses, which come from . */ -/* ezannoni-2003-07-09: I think this is fixed. The extraneous defs have - been removed from ptrace.h in the kernel. However, better safe than - sorry. */ -#include #include -#include "gdb_proc_service.h" - -/* Prototypes for supply_gregset etc. */ #include "gregset.h" +#include "gdb_proc_service.h" +#include "amd64-nat.h" +#include "linux-nat.h" +#include "x86-linux-nat.h" #include "amd64-tdep.h" +#include "amd64-linux-tdep.h" #include "i386-linux-tdep.h" -#include "amd64-nat.h" -#include "i386-nat.h" #include "i386-xstate.h" #include "x86-linux-nat.h" diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 3778c77..91c91a6 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -18,46 +18,19 @@ along with this program. If not, see . */ #include "defs.h" -#include "i386-nat.h" #include "inferior.h" #include "gdbcore.h" #include "regcache.h" -#include "regset.h" -#include "target.h" -#include "linux-nat.h" -#include "nat/linux-btrace.h" -#include "btrace.h" - -#include "gdb_assert.h" -#include #include "elf/common.h" -#include #include -#include -#include - -#ifdef HAVE_SYS_REG_H -#include -#endif - -#ifndef ORIG_EAX -#define ORIG_EAX -1 -#endif - -#ifdef HAVE_SYS_DEBUGREG_H -#include -#endif - -/* Prototypes for supply_gregset etc. */ #include "gregset.h" +#include "gdb_proc_service.h" +#include "x86-linux-nat.h" +#include "i386-linux-nat.h" #include "i387-tdep.h" #include "i386-tdep.h" #include "i386-linux-tdep.h" - -/* Defines ps_err_e, struct ps_prochandle. */ -#include "gdb_proc_service.h" - #include "i386-xstate.h" #include "x86-linux-nat.h"