From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3736 invoked by alias); 6 Aug 2014 18:35:16 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 3726 invoked by uid 89); 6 Aug 2014 18:35:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qg0-f73.google.com Received: from mail-qg0-f73.google.com (HELO mail-qg0-f73.google.com) (209.85.192.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 06 Aug 2014 18:35:15 +0000 Received: by mail-qg0-f73.google.com with SMTP id q107so386905qgd.0 for ; Wed, 06 Aug 2014 11:35:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:mime-version:content-type :content-transfer-encoding:message-id:date:to:cc:subject:in-reply-to :references; bh=MEgaXLjSf4D/A/stHLhhmVeJar/qjMwCslrVdJotXEw=; b=aa0YvWd1s8qioTQaQx1Ps0o5bCieJPnKo/yWS7k86ZfCEivCTS6DbYYgmYR3qizXGI ucS/08xvaFiQFni8Ps7ozT0My70yvI+Rx6R0ZgAHfeKsBlmOyneEMFVrhmDTNv+9KlzL v2LfkhQ4AjOZdVLLv2boYHDf6fvOA8D86Jz7UzR0qNlqBl5HzQaxytiH/ZWj6jCL5927 DwZ0e0k0HvU1YR+v3egwKLDPykgMXmerj3N3tRVeyfhJRXdzJ7JUEI3bJhkp7CiJN/gX ZwhQTfZbmpxqG7ko0UKHSIIYikyUeFzu1BVg668/XjKwlQ4gHflLtiFOClKrSbzL1G5I blrA== X-Gm-Message-State: ALoCoQkU/cOpJPk4GL5oxtuWQZbopBgvu4QxwLYrOTqzqdTiwZV3ZbpXPmdjBoK9nGB5MombackH X-Received: by 10.236.209.97 with SMTP id r61mr6509571yho.33.1407350112699; Wed, 06 Aug 2014 11:35:12 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id o69si118153yhp.6.2014.08.06.11.35.12 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 11:35:12 -0700 (PDT) Received: from ruffy.mtv.corp.google.com (ruffy.mtv.corp.google.com [172.17.128.44]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id D0C2831C2B1; Wed, 6 Aug 2014 11:35:11 -0700 (PDT) From: Doug Evans MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <21474.30047.278277.20526@ruffy.mtv.corp.google.com> Date: Wed, 06 Aug 2014 18:35:00 -0000 To: Gary Benson Cc: gdb-patches@sourceware.org, Pedro Alves , Tom Tromey Subject: Re: [PATCH 11/11 v5] Remove one GDBSERVER use from linux-waitpid.c In-Reply-To: <1406888377-25795-12-git-send-email-gbenson@redhat.com> References: <1406888377-25795-1-git-send-email-gbenson@redhat.com> <1406888377-25795-12-git-send-email-gbenson@redhat.com> X-IsSubscribed: yes X-SW-Source: 2014-08/txt/msg00117.txt.bz2 Gary Benson writes: > This commit makes nat/linux-waitpid.c include common-defs.h rather > than defs.h or server.h. A use of GDBSERVER had to be left in to > support some some thread_db debug code. This hack will be removed > when the Linux thread_db code is unified and made shared. > > gdb/ > 2014-08-01 Gary Benson > > * nat/linux-waitpid.c: Include common-defs.h. > Don't include defs.h or server.h. > (linux_debug) [GDBSERVER]: Declare debug_threads. > --- > gdb/ChangeLog | 6 ++++++ > gdb/nat/linux-waitpid.c | 10 +++------- > 2 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/gdb/nat/linux-waitpid.c b/gdb/nat/linux-waitpid.c > index 53847ac..d04a3af 100644 > --- a/gdb/nat/linux-waitpid.c > +++ b/gdb/nat/linux-waitpid.c > @@ -17,13 +17,7 @@ > 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 "signal.h" > -#endif > - > +#include "common-defs.h" > #include "linux-nat.h" > #include "linux-waitpid.h" > #include "gdb_wait.h" > @@ -35,6 +29,8 @@ static inline void > linux_debug (const char *format, ...) > { > #ifdef GDBSERVER > + extern int debug_threads; > + Recognizing that this is a temporary hack, ok by me. Can I ask you to add a FIXME here though? > if (debug_threads) > { > va_list args; > -- > 1.7.1 > -- /dje