From patchwork Fri Jan 19 17:22:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jessica Clarke X-Patchwork-Id: 25460 Received: (qmail 10092 invoked by alias); 19 Jan 2018 17:23:14 -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 10063 invoked by uid 89); 19 Jan 2018 17:23:13 -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=H*r:501 X-HELO: mail-wr0-f196.google.com Received: from mail-wr0-f196.google.com (HELO mail-wr0-f196.google.com) (209.85.128.196) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 19 Jan 2018 17:23:12 +0000 Received: by mail-wr0-f196.google.com with SMTP id o7so2216923wro.8 for ; Fri, 19 Jan 2018 09:23:11 -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:to:cc:subject:date:message-id; bh=Phan0FB0yvG4orBW5kMhOabUSMGE4PX7IMhSQe1TnoI=; b=FcSP0L9EvI8+pfPgWfwYXDAlsvtE46IpkOUkpr6jhhWRcoZ9KJLc6AMu8r+pLJzzbM 7553Vfi8JPZuH6QvNEF2icDvQ22SLE56SPtP+WeUZwRyloiCh46AOG2b8JrZUNAIFAx0 xoPyiW4gQjR8t7oV2pxkXBO5Z2ZJ4Hz9StGcakRmNbvinXyOetL7MkGH5MuOZe4hb2LE sMLTWC1YsiFc6I00ol+cSyOR5yQojZxtiuRgr0qjXxuxoxwM2fenBykVAd2u8rY48PAo a3YCp6DFWPrf6COxRxDxFwjuXT7FFAegy9diTPsJxLCg9cx2pOGqbjW1McaaQMuDJ1rD f0CQ== X-Gm-Message-State: AKwxytcGgKGTv4kf62Wo2bSWU4DjSZJnMBpKs/R/PHnIr9sBl4ktX9mP NxteG0cl0DA1kb9PhVdysSWXD6VDqs0= X-Google-Smtp-Source: ACJfBos3/ZrXBZA37zDtGuJpr//2KEyo7wY3WJZb1lbW1UmLeE/GDb8ZCjcRPfuCZetD0fY1KJGXIA== X-Received: by 10.223.186.76 with SMTP id t12mr9112797wrg.219.1516382590024; Fri, 19 Jan 2018 09:23:10 -0800 (PST) Received: from Jamess-MacBook.local (global-184-7.nat-1.net.cam.ac.uk. [131.111.184.7]) by smtp.gmail.com with ESMTPSA id h194sm5367832wma.8.2018.01.19.09.23.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2018 09:23:08 -0800 (PST) Received: by Jamess-MacBook.local (Postfix, from userid 501) id B1014200EC3623; Fri, 19 Jan 2018 17:23:07 +0000 (GMT) From: James Clarke To: gdb-patches@sourceware.org Cc: James Clarke Subject: [PATCH v2 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h Date: Fri, 19 Jan 2018 17:22:49 +0000 Message-Id: <20180119172250.91520-1-jrtc27@jrtc27.com> 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. --- Changes since v2: * Added undefined reference linker error to commit message for patch 2/2. Please commit+push on my behalf if this series is approved. Thanks, James gdb/nat/linux-ptrace.c | 2 -- gdb/nat/linux-ptrace.h | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) -- 1.8.5.3 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__))