From patchwork Wed Jul 9 10:37:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gary Benson X-Patchwork-Id: 1969 Received: (qmail 5350 invoked by alias); 9 Jul 2014 10:39:35 -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 5337 invoked by uid 89); 9 Jul 2014 10:39:34 -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; Wed, 09 Jul 2014 10:39:33 +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 s69AcEmP008727 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 9 Jul 2014 06:38:15 -0400 Received: from blade.nx (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s69AcCmk013307 for ; Wed, 9 Jul 2014 06:38:14 -0400 Received: from blade.nx (localhost [127.0.0.1]) by blade.nx (Postfix) with ESMTP id 941DC2640D4 for ; Wed, 9 Jul 2014 11:38:11 +0100 (BST) From: Gary Benson To: gdb-patches@sourceware.org Subject: [PATCH 15/15] Finally remove GDBSERVER (mostly) from linux-btrace.c Date: Wed, 9 Jul 2014 11:37:35 +0100 Message-Id: <1404902255-11101-16-git-send-email-gbenson@redhat.com> In-Reply-To: <1404902255-11101-1-git-send-email-gbenson@redhat.com> References: <1404902255-11101-1-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes This applies the usual GDBSERVER treatment to linux-btrace.c. Now it is used only to find the gnulib header. gdb/ 2014-07-09 Tom Tromey Gary Benson * nat/linux-btrace.c: Don't include defs.h or server.h. * nat/linux-btrace.h (struct target_ops): Declare. --- gdb/ChangeLog | 6 ++++++ gdb/nat/linux-btrace.c | 13 ++++++++++--- gdb/nat/linux-btrace.h | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c index dd7744b..3fd80bb 100644 --- a/gdb/nat/linux-btrace.c +++ b/gdb/nat/linux-btrace.c @@ -19,17 +19,24 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include + #ifdef GDBSERVER -#include "server.h" +#include "build-gnulib-gdbserver/config.h" #else -#include "defs.h" +#include "build-gnulib/config.h" #endif +#include "common-types.h" +#include "common-utils.h" +#include "target/waitstatus.h" +#include "errors.h" +#include "gdb_locale.h" +#include "gdb_signals.h" #include "linux-btrace.h" #include "common-utils.h" #include "gdb_assert.h" #include "regcache.h" -#include "gdbthread.h" #include "gdb_wait.h" #include "i386-cpuid.h" diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h index 85cd88b..708476f 100644 --- a/gdb/nat/linux-btrace.h +++ b/gdb/nat/linux-btrace.h @@ -22,6 +22,8 @@ #ifndef LINUX_BTRACE_H #define LINUX_BTRACE_H +struct target_ops; + #include "btrace-common.h" #include "config.h" #include "vec.h"