From patchwork Wed Jul 16 14:17:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 2092 Received: (qmail 23294 invoked by alias); 16 Jul 2014 17:20:23 -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 23226 invoked by uid 89); 16 Jul 2014 17:20:19 -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, 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; Wed, 16 Jul 2014 17:20:17 +0000 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJaDl019431 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 16 Jul 2014 12:19:36 -0400 Received: from blade.nx (ovpn-116-36.ams2.redhat.com [10.36.116.36]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s6GGJZ8W003251; Wed, 16 Jul 2014 12:19:35 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 34D522640CD; Wed, 16 Jul 2014 15:17:31 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Cc: Tom Tromey , Doug Evans Subject: [PATCH 07/15 v2] Remove GDBSERVER use from nat/i386-dregs.c Date: Wed, 16 Jul 2014 15:17:15 +0100 Message-Id: <1405520243-17282-8-git-send-email-gbenson@redhat.com> In-Reply-To: <1405520243-17282-1-git-send-email-gbenson@redhat.com> References: <1405520243-17282-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This removes the use of GDBSERVER from nat/i386-dregs.c. Neither defs.h or server.h are included: the specific files required are listed instead. Also, a declaration previously made only outside of gdbserver is made unconditional. gdb/ 2014-07-16 Gary Benson * gdb/nat/i386-dregs.c: Don't include server.h or defs.h; update includes. (debug_hw_points): Declare regardless of GDBSERVER. --- gdb/ChangeLog | 6 ++++++ gdb/nat/i386-dregs.c | 17 +++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gdb/nat/i386-dregs.c b/gdb/nat/i386-dregs.c index e3272cd..d43fbcf 100644 --- a/gdb/nat/i386-dregs.c +++ b/gdb/nat/i386-dregs.c @@ -17,12 +17,15 @@ 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 "config.h" +#include "common-utils.h" +#include "common-types.h" +#include "break-common.h" +#include "common-debug.h" +#include "print-utils.h" +#include "errors.h" +#include "gdb_locale.h" +#include "gdb_assert.h" #include "i386-dregs.h" /* Support for hardware watchpoints and breakpoints using the i386 @@ -175,10 +178,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. */