From patchwork Fri Aug 1 10:19:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2276 Received: (qmail 31675 invoked by alias); 1 Aug 2014 10:27:25 -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 31650 invoked by uid 89); 1 Aug 2014 10:27:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS 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, 01 Aug 2014 10:27:21 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s71AJmIb032267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 1 Aug 2014 06:19:48 -0400 Received: from blade.nx (ovpn-116-104.ams2.redhat.com [10.36.116.104]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s71AJkoj027018; Fri, 1 Aug 2014 06:19:47 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 071152640DF; Fri, 1 Aug 2014 11:19:45 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Doug Evans , Pedro Alves , Tom Tromey Subject: [PATCH 10/11 v5] Remove GDBSERVER uses from i386-dregs.c Date: Fri, 1 Aug 2014 11:19:36 +0100 Message-Id: <1406888377-25795-11-git-send-email-gbenson@redhat.com> In-Reply-To: <1406888377-25795-1-git-send-email-gbenson@redhat.com> References: <1406888377-25795-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This commit makes nat/i386-dregs.c include common-defs.h rather than defs.h or server.h. A couple of minor changes were required in order to support this change. gdb/ 2014-08-01 Gary Benson * nat/i386-dregs.c: Include common-defs.h and break-common.h. Don't include defs.h or server.h. (debug_hw_points): Declare unconditionally. --- gdb/ChangeLog | 6 ++++++ gdb/nat/i386-dregs.c | 10 ++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c index e3272cd..7905c44 100644 --- a/gdb/nat/i386-dregs.c +++ b/gdb/nat/i386-dregs.c @@ -17,13 +17,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifdef GDBSERVER -#include "server.h" -#else -#include "defs.h" -#include "inferior.h" -#endif +#include "common-defs.h" #include "i386-dregs.h" +#include "break-common.h" /* Support for hardware watchpoints and breakpoints using the i386 debug registers. @@ -175,10 +171,8 @@ /* Types of operations supported by i386_handle_nonaligned_watchpoint. */ typedef enum { WP_INSERT, WP_REMOVE, WP_COUNT } i386_wp_op_t; -#ifndef GDBSERVER /* Whether or not to print the mirrored debug registers. */ extern int debug_hw_points; -#endif /* Print the values of the mirrored debug registers. */