From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 105248 invoked by alias); 19 Jan 2018 16:34:03 -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 105197 invoked by uid 89); 19 Jan 2018 16:34:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-spam-relays-external:209.85.128.194, H*RU:209.85.128.194 X-HELO: mail-wr0-f194.google.com Received: from mail-wr0-f194.google.com (HELO mail-wr0-f194.google.com) (209.85.128.194) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 19 Jan 2018 16:34:00 +0000 Received: by mail-wr0-f194.google.com with SMTP id 100so2085584wrb.7 for ; Fri, 19 Jan 2018 08:34:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:date:references:to:in-reply-to:message-id; bh=BukOBQarePy8rWzLbLU6WvpQYKJRZWANnrCs8RXjpno=; b=hP2jVcp/ust4HAcmXEFv2WZZe3MBS+Dr6Wh/G4V352xTP/aB6p6myOjdceIBOLf6SL +i+MjRKjXT+ySz104H7VeEp5RXzmD5LUCn1vA0veKm7dx8VvGiEVKdxBqnJB6ts5JtVO CnTo/kUW9ytwxza0CYwyY7uEvAQ36oiuAjpVVLWZR92chKxPqkoO74WubrIaVlUWBWWa Y53WsXR0xPqIDQt5X7xhoeYj6EbMdPDPrC55Ad4s3G0U7WggUYqWhH0Vt69Nel1pQ8NF HgcXs5MImuFOBR2+PC+V+emFg43u7A528HfVqH1dd4LeBpqnkP3fs5DVbqLG+DcG2ttC hujQ== X-Gm-Message-State: AKwxytc0Vo7HlDgRsO9U0QQ/gQXMUeP6BmUQ/8+CK8q1mHnLHmfXKpwv 5KT7jQAL0Di7FDbMR5UI4EeAq1mzics= X-Google-Smtp-Source: ACJfBot24BEoQLdzW7GcHlfzwevftqjAlCWv3wD/6pIQD/6IfwbhAGEGPPGiNJ3KpfJDFcUX/lM8HA== X-Received: by 10.223.139.76 with SMTP id v12mr9736785wra.95.1516379638374; Fri, 19 Jan 2018 08:33:58 -0800 (PST) Received: from eduroam-jrtc4-35d43e-2.trin.private.cam.ac.uk (global-184-7.nat-1.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id w73sm26097645wrb.34.2018.01.19.08.33.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2018 08:33:57 -0800 (PST) From: James Clarke Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Mac OS X Mail 11.2 \(3445.5.20\)) Subject: Re: [PATCH 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h Date: Fri, 19 Jan 2018 16:34:00 -0000 References: <20171215000434.47315-1-jrtc27@jrtc27.com> To: gdb-patches@sourceware.org In-Reply-To: <20171215000434.47315-1-jrtc27@jrtc27.com> Message-Id: X-SW-Source: 2018-01/txt/msg00398.txt.bz2 On 15 Dec 2017, at 00:04, James Clarke wrote: > > On ia64, gdb_wait.h eventually includes siginfo-consts-arch.h, which > contains an enum with TRAP_HWBKPT, along with a #define. Thus we cannot > define TRAP_HWBKPT to 4 beforehand, and so gdb_wait.h must be included > earlier; include it from linux-ptrace.h so it can never come afterwards. > > gdb/ChangeLog: > > * nat/linux-ptrace.c: Remove unnecessary reinclusion of > gdb_ptrace.h, and move including gdb_wait.h ... > * nat/linux-ptrace.h: ... to here. Ping (for the series). James > --- > [Originally erroneously sent to the binutils mailing list] > > gdb/nat/linux-ptrace.c | 2 -- > gdb/nat/linux-ptrace.h | 1 + > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/gdb/nat/linux-ptrace.c b/gdb/nat/linux-ptrace.c > index 438177f..1240eea 100644 > --- a/gdb/nat/linux-ptrace.c > +++ b/gdb/nat/linux-ptrace.c > @@ -21,8 +21,6 @@ > #include "linux-procfs.h" > #include "linux-waitpid.h" > #include "buffer.h" > -#include "gdb_wait.h" > -#include "gdb_ptrace.h" > #ifdef HAVE_SYS_PROCFS_H > #include > #endif > diff --git a/gdb/nat/linux-ptrace.h b/gdb/nat/linux-ptrace.h > index 5954945..6faa89b 100644 > --- a/gdb/nat/linux-ptrace.h > +++ b/gdb/nat/linux-ptrace.h > @@ -21,6 +21,7 @@ > struct buffer; > > #include "nat/gdb_ptrace.h" > +#include "gdb_wait.h" > > #ifdef __UCLIBC__ > #if !(defined(__UCLIBC_HAS_MMU__) || defined(__ARCH_HAS_MMU__)) > -- > 1.7.10.4 >