From patchwork Wed Aug  6 09:32:50 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yao Qi <yao@codesourcery.com>
X-Patchwork-Id: 2314
Received: (qmail 31378 invoked by alias); 6 Aug 2014 09:36:47 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Unsubscribe: <mailto:gdb-patches-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Delivered-To: mailing list gdb-patches@sourceware.org
Received: (qmail 31367 invoked by uid 89); 6 Aug 2014 09:36:46 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,
	BAYES_00 autolearn=ham version=3.3.2
X-HELO: relay1.mentorg.com
Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131)
	by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with
	ESMTP; Wed, 06 Aug 2014 09:36:44 +0000
Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58])	by
	relay1.mentorg.com with esmtp id 1XExeB-0005fX-Nw from
	Yao_Qi@mentor.com ; Wed, 06 Aug 2014 02:36:39 -0700
Received: from SVR-ORW-FEM-06.mgc.mentorg.com ([147.34.97.120]) by
	SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft
	SMTPSVC(6.0.3790.4675); Wed, 6 Aug 2014 02:36:39 -0700
Received: from qiyao.dyndns.org (147.34.91.1) by
	SVR-ORW-FEM-06.mgc.mentorg.com (147.34.97.120) with Microsoft
	SMTP Server id 14.2.247.3; Wed, 6 Aug 2014 02:36:38 -0700
Message-ID: <53E1F642.70207@codesourcery.com>
Date: Wed, 6 Aug 2014 17:32:50 +0800
From: Yao Qi <yao@codesourcery.com>
User-Agent: Mozilla/5.0 (X11; Linux i686;
	rv:24.0) Gecko/20100101 Thunderbird/24.4.0
MIME-Version: 1.0
To: Gary Benson <gbenson@redhat.com>, <gdb-patches@sourceware.org>
CC: Mark Kettenis <mark.kettenis@xs4all.nl>, Pedro Alves <palves@redhat.com>
Subject: Re: [PATCH 7/7 v2] Tidy #include lists
References: <1403878351-22974-1-git-send-email-gbenson@redhat.com>
	<1403878351-22974-8-git-send-email-gbenson@redhat.com>
In-Reply-To: <1403878351-22974-8-git-send-email-gbenson@redhat.com>
X-IsSubscribed: yes

On 06/27/2014 10:12 PM, Gary Benson wrote:
> +#include "x86-linux-nat.h"

x86-linux-nat.h is included ....

>  #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"

... here.  We can remove one of the two includes.

>  
> +#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"

Likewise.  How about the patch below?

diff --git a/gdb/amd64-linux-nat.c b/gdb/amd64-linux-nat.c
index 0885a0a..def12ee 100644
--- a/gdb/amd64-linux-nat.c
+++ b/gdb/amd64-linux-nat.c
@@ -30,7 +30,6 @@

 #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"
diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c
index bb0f2c8..8227d4a 100644
--- a/gdb/i386-linux-nat.c
+++ b/gdb/i386-linux-nat.c
@@ -26,7 +26,6 @@
 #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"