From patchwork Fri Dec 15 00:04:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jessica Clarke X-Patchwork-Id: 24953 Received: (qmail 60927 invoked by alias); 15 Dec 2017 00:04:45 -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 60899 invoked by uid 89); 15 Dec 2017 00:04:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.0 required=5.0 tests=AWL, 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= X-HELO: mail-wr0-f195.google.com Received: from mail-wr0-f195.google.com (HELO mail-wr0-f195.google.com) (209.85.128.195) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 15 Dec 2017 00:04:43 +0000 Received: by mail-wr0-f195.google.com with SMTP id u19so219454wrc.3 for ; Thu, 14 Dec 2017 16:04:42 -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=d28aKYtAsROyJJonPl536A4dMNDbazoFeccgzdRYDXQ=; b=UZGWs4m37ioFzpMy3ipej4DeGlBhVFH1l3kN8OuW3ffYLsE7ei2zUAwojjNtuy0pXH 2+s69M4YJmX13Q2hWRhyMRvk+BdN1+gMWZPVxtUb3sXe5p8Bhyjg+Cbm0btg7nSPvxwU /Tv1QCBROUh7oAujX1LBtdEYd3am0Bx4EoE2cT8/wmiZUQpF3NY0zBCNTLoDyzkrl7NK JXE0JaRCY+tQsXnNYg83ZcR8OgVT8KOxWMSUgKLivrWHVXlJNap5FZlIiQZCcYGMgyFI KpaQ4+tFDYjXV8rKjeQ2NLJfW0I6hXAm7NyzkFahz3NKICPUltIY8hXVtRQ8SU70EB1G IcPQ== X-Gm-Message-State: AKGB3mLh9KyHoHqe8v+Hba740HPNYOghHxn2yh5BTJ7zvPlKe851rYDb BW+JgGgIU4ifAMonhhXFjKAJlzcYC9w= X-Google-Smtp-Source: ACJfBos5qsVO9VTF5nPr2vBa/FVGvifHAgOpQIz54eyMnQcIymJ9FBn1TJx2ci4eSgJN9k52P7p/lw== X-Received: by 10.223.152.178 with SMTP id w47mr8134595wrb.254.1513296280866; Thu, 14 Dec 2017 16:04:40 -0800 (PST) Received: from Jamess-MacBook.local (host81-134-41-189.in-addr.btopenworld.com. [81.134.41.189]) by smtp.gmail.com with ESMTPSA id i65sm16838533wme.20.2017.12.14.16.04.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 16:04:40 -0800 (PST) Received: by Jamess-MacBook.local (Postfix, from userid 501) id 29266200A9851F; Fri, 15 Dec 2017 00:04:39 +0000 (GMT) From: James Clarke To: gdb-patches@sourceware.org Cc: James Clarke Subject: [PATCH 1/2] gdb: Fix ia64 defining TRAP_HWBKPT before including gdb_wait.h Date: Fri, 15 Dec 2017 00:04:33 +0000 Message-Id: <20171215000434.47315-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. --- [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(-) -- 1.7.10.4 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__))