From patchwork Tue Feb 27 16:31:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Hayward X-Patchwork-Id: 26105 Received: (qmail 14306 invoked by alias); 27 Feb 2018 16:31: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 14291 invoked by uid 89); 27 Feb 2018 16:31:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.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_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: EUR01-DB5-obe.outbound.protection.outlook.com Received: from mail-db5eur01on0088.outbound.protection.outlook.com (HELO EUR01-DB5-obe.outbound.protection.outlook.com) (104.47.2.88) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 27 Feb 2018 16:31:42 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com (10.160.211.19) by AM3PR08MB0278.eurprd08.prod.outlook.com (10.161.35.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.527.15; Tue, 27 Feb 2018 16:31:39 +0000 Received: from AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::fc60:4b4d:7de8:f8b7]) by AM3PR08MB0101.eurprd08.prod.outlook.com ([fe80::fc60:4b4d:7de8:f8b7%16]) with mapi id 15.20.0527.017; Tue, 27 Feb 2018 16:31:39 +0000 From: Alan Hayward To: "gdb-patches@sourceware.org" CC: nd Subject: [PUSHED OBV] Explicitly specify common tdesc.h for use with aarch64.h Date: Tue, 27 Feb 2018 16:31:39 +0000 Message-ID: <86F6D3B6-ABB4-4391-A7E5-172D94D5C49C@arm.com> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM3PR08MB0278; 7:EJ57AeojuvGk+xLIaDLEvs4/Uu80iBq4C0bhALLCKayOblTFgzxpRjShhWcOgOan9eeT2CpjHyeJBNzaiDlin6QbwQSdSxwWfLryuI4EOr/09kk9dDSSiyPq9VG1QsEyun8nBuAdJDlpAl4pz+EWy82u/8S4nvBqlh6pROWyNQgstoLZancA0Sf/dKbFhY7nmLlj2PORLMs84KdcpFS/I09BdEhoCP4CgK08ePjUHL0Hm9NguYpcGu5/CZigIJYO x-ms-exchange-antispam-srfa-diagnostics: SSOS; x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: e7aab2ef-795d-4c95-a0c4-08d57dff9404 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7153060)(7193020); SRVR:AM3PR08MB0278; x-ms-traffictypediagnostic: AM3PR08MB0278: nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(10201501046)(3231220)(944501198)(52105095)(93006095)(93001095)(3002001)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123560045)(20161123564045)(6072148)(201708071742011); SRVR:AM3PR08MB0278; BCL:0; PCL:0; RULEID:; SRVR:AM3PR08MB0278; x-forefront-prvs: 05961EBAFC x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(376002)(346002)(396003)(39380400002)(366004)(189003)(199004)(6346003)(316002)(105586002)(3846002)(3660700001)(5660300001)(68736007)(4326008)(6506007)(86362001)(36756003)(25786009)(2906002)(6116002)(186003)(26005)(102836004)(6916009)(82746002)(305945005)(14454004)(6486002)(478600001)(3280700002)(2900100001)(83716003)(6512007)(2501003)(5250100002)(7736002)(99286004)(72206003)(8936002)(97736004)(81156014)(33656002)(81166006)(66066001)(6436002)(2351001)(5640700003)(8676002)(106356001)(53936002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR08MB0278; H:AM3PR08MB0101.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alan.Hayward@arm.com; x-microsoft-antispam-message-info: dp7KBQqyMHAQjk0YBf1kQu+r8s36lxeFnj62Qndxj+5a9Dzhtx9SbMejV4GNlySk5tux0btbLuWoX6hX+6355E2QahwSUf3JSOc/jzzb5gPXOT7HtIYZT4hXbQldFkUtQbVVzOW47k6ez8HvSmpQWMh5ogJTrimeWyzn7xpm3vU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: <9E75008EF4CD714CAC51AC2FC8725D9F@eurprd08.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-Network-Message-Id: e7aab2ef-795d-4c95-a0c4-08d57dff9404 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Feb 2018 16:31:39.5631 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR08MB0278 X-IsSubscribed: yes Previously aarch64.h did not specify which tdesc.h to include, and automatically ended up with the arch/ version. arch/tdesc.h has moved to common/. This caused aarch64.h to try and pull in the gdbserver version. Not sure why this worked when I originally tested it. Fix pushed as obvious. Alan. gdb/ * arch/aarch64.h: Use common/tdesc.h. diff --git a/gdb/arch/aarch64.h b/gdb/arch/aarch64.h index 1ca83114f621cc298c55673d5060965466941251..86185f596a398b8e5048b99da4128ca61c442adf 100644 --- a/gdb/arch/aarch64.h +++ b/gdb/arch/aarch64.h @@ -20,7 +20,7 @@ #ifndef ARCH_AARCH64_H #define ARCH_AARCH64_H -#include "tdesc.h" +#include "common/tdesc.h" target_desc *aarch64_create_target_description ();