From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30050.outbound.protection.outlook.com [40.107.3.50]) by sourceware.org (Postfix) with ESMTPS id 0A75E3858280 for ; Tue, 5 Jul 2022 14:49:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0A75E3858280 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=NSTMJetwL14vnlfYiDFmREzIj6EwmnZfSzRG2UvLqs/E3oOCz4RaWJ4Oq3dMa9srhZHgk39BLRd6nGvZd4djzqBM1ZWQTGueczy3BACpVTw/DeKKVi5aX59bfX0a0Kp23nvX+ZVxTBJCm7Jj9HsOe+y/WsA2xIPkO0Qgy6koLTTavz2kDoBciCDOZ9LmNO6nYDfYsItDYS7NCGlU9A1GwdjYIt/jS2FEwAUaCU6h4EtLefHk1c/XL2zSTv6ThXA9LyhxaPzXklYK3oWkgDrf8e+Zc7Q/e8zfkNkLth8o0Lx2kUVf2wNRpaHinDkftGikusfsHooDNFOpJMRCqpnJ3Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=coQTbIqypj7Smh7TEotTco0q4fMH96qpnBKf3pJ0HVI=; b=Co4Bbh9G3Xyp67tqDv10tkV02hIv/URagK6btREACxsDODhB2o5TS7cPqg1jhLaceC+RTrUaJsPNQoE0JDof9XrUfkp1FmPnvuBsMGyhELYNJFM7BbpV9hpumjwti1SgookV3NGaFu3gUD+5FYH5JZzvAhETUXITlNE4fprW6IMik3QF1MwCaGqzzfujMovhqkGAYv/Fgwyb08l8DLF9FdiEpEYFf7u/dcqmgNUm8cBeL3mUUcP8MGv3FkbtnfkN8L49YL/vJEVrjsDml31SrYoo2/HqAHBGS1f0MFGuw2H4Wl+oyJstSTZk/ish6bpPCCsGdTPCZ3iS/qj3cqzJcQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) Received: from AS9PR06CA0315.eurprd06.prod.outlook.com (2603:10a6:20b:45b::26) by VE1PR08MB4686.eurprd08.prod.outlook.com (2603:10a6:802:af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14; Tue, 5 Jul 2022 14:49:45 +0000 Received: from VE1EUR03FT034.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45b:cafe::5e) by AS9PR06CA0315.outlook.office365.com (2603:10a6:20b:45b::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14 via Frontend Transport; Tue, 5 Jul 2022 14:49:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT034.mail.protection.outlook.com (10.152.18.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.14 via Frontend Transport; Tue, 5 Jul 2022 14:49:45 +0000 Received: ("Tessian outbound 9336577968ca:v121"); Tue, 05 Jul 2022 14:49:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: fd2ac4dd73d4c66e X-CR-MTA-TID: 64aa7808 Received: from b32cfad57d81.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id D15865E6-14AC-4296-A2CA-CFAC69B82012.1; Tue, 05 Jul 2022 14:49:37 +0000 Received: from EUR04-DB3-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b32cfad57d81.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 05 Jul 2022 14:49:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OfT4kSOuFQOhnHt02NfQ5oUV+Foi2IMKxokInnFUKI7uN+WccIK52MVTg5iRNgpqM8C7zeYHW7PrS7crEBqxycAODhcsq69tNcIPi423yXOuPqb+Ln5y6a9oft4/7yzMK1qE2mkwApJtiezrqR8QtuSzM/Mou8tB9FLeghWKk49atQnxLrK3UgldKJjrJPP1GKU6PfdczCi7HTkllA/9xSkY9rPL6ByFUYqG2kab5yGpux6I0to3D8XOUMF3mLA8GUETEiIOlrl2rE/+TGIydZCe5M1A1BXUOcVHLQzpocXMu2q3i+DO8FWJXSk/Wy4qDllCCKIaoBoDpv5CtLxiSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=coQTbIqypj7Smh7TEotTco0q4fMH96qpnBKf3pJ0HVI=; b=gt/F1Gg3lgu361s7OX1f4zCkcwCQHmimERzRBcVFZzyzocHZ1d+FeC3/WUnszkwEJsH16IxhMoJ0mY/5MKKqI5F5+MIlQN3Tnh7ZCoF73tiLWyWbu68tvSQDRpUvfBX/UXLO00s9I9kKfodAzopDSLB2sFwY7uxz+A7LI1boBb2ch/ulQZvBxorz47AvqBh/llSI7CYJdv6xqq+lsIAxT54xAZOsGj4GyC8l/aCwp84rnv7VwaIbHECkov0QdY/48hVCcBfocZCaIHDGDI7Jk0ilKGUTa0cBhXy1ReoFuF5zmNuivF7GZJymr+bKcJPZIjTKqWi3iIfUeb5eeG6AzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; Received: from VI1PR08MB3919.eurprd08.prod.outlook.com (2603:10a6:803:c4::31) by AS8PR08MB8087.eurprd08.prod.outlook.com (2603:10a6:20b:54c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 14:49:34 +0000 Received: from VI1PR08MB3919.eurprd08.prod.outlook.com ([fe80::1cda:8ca1:6353:572c]) by VI1PR08MB3919.eurprd08.prod.outlook.com ([fe80::1cda:8ca1:6353:572c%4]) with mapi id 15.20.5395.021; Tue, 5 Jul 2022 14:49:33 +0000 Message-ID: <7c7d4037-72a4-1345-74d3-39360e3cdc88@arm.com> Date: Tue, 5 Jul 2022 15:49:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: [PATCH] [AArch64] Fix testcase compilation failure Content-Language: en-US To: gdb-patches@sourceware.org References: <20220705133729.132750-1-luis.machado@arm.com> From: Luis Machado In-Reply-To: <20220705133729.132750-1-luis.machado@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-ClientProxiedBy: LO4P123CA0471.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1a8::8) To VI1PR08MB3919.eurprd08.prod.outlook.com (2603:10a6:803:c4::31) MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 1f7aa5ea-1c9b-471c-765a-08da5e9599f5 X-MS-TrafficTypeDiagnostic: AS8PR08MB8087:EE_|VE1EUR03FT034:EE_|VE1PR08MB4686:EE_ x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: A3YZL2f5EWMLUXAicguGd3vMlOnUJUz8ozcqKaG8lOmcoE5Y8U8J2Vm0Y3HgVrU9kVv31BJ5YUWPb7X2+BcHnoDjIRxG1jTfWDugQcmZMFcCtCijXA23hS+XqGKtGkEhrHdMulvG6KPvl5j1WKMqCkPzHDtAL2OxFL+qzgbYIx3p9zVcOi4MEwPMGzi4QrEweHTupBmIrjSINmr0TFbjeX2aGSzAVtCDx/ftN7lSYJF+JRErJhR/OtuuB1NxF3WhMabdiLP4d7kuPjbKfXcCj0iF8+hrYD9lgbhhHO75YwxmTdrdVeJGwXHe9RY0nkyVRjaymxdg2nDBOWiQvMkWBCquoUQvfKr076Z7iGPwLnI6JjZ1K8sGXOq8g0aajyZbPaK7/XIEp8GuA0MwNQeK0PvnSGO5+8AndtiZifdbNul0QN55HODRuXfqs+4XS4B3Z401RpU0YUpYHD7aw3IQdXS62EotZdw+zEV/93Bit6xF4r+S++4o5F45KYxXQYUX1RlMAP4qjcd223gbkDY8o7n9S3uEeEBJPPfilQI+RGaxcuzYiQW9MxC4uDsiz3MQe6st01mAN3PJPLUBQJY4DPiYB5uKm0uVhqN2low51VDutIJaKjAJKWo8k/3biyP/xJVD8QaT5L4pyfa+/qg74JbfDcPC5ET8pmDD0FliPnZBMBQu4LSaw8bmwNerI1rxZa9OFkFmZ90OQ/tjElaxR2HRudcMb3RJ/3T7mt4eSIJXra3Is1A/gPiPUig3lG/h4btHjV72Xe4FVhhhFNFNopxSx13buLUnoIvKezuekkObefrlhcDxkGPK6qQdkRYYxsALf/xGimUhhjThlPc3Sw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR08MB3919.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(376002)(366004)(346002)(136003)(39860400002)(396003)(6506007)(66476007)(66946007)(2616005)(186003)(66556008)(44832011)(8676002)(36756003)(53546011)(6512007)(316002)(26005)(31686004)(83380400001)(6916009)(478600001)(2906002)(38100700002)(41300700001)(31696002)(6486002)(86362001)(8936002)(5660300002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB8087 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT034.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: dda8fcbb-5690-45fc-01b6-08da5e959298 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Im4KxnhLiMkVKCXg5ywYzl1NxBu2e75pMaMG5v/vyTG7xNK8c0yh14dquuw1iK9reoaSNnKfb2TFKKr8U1ySdNvLMvvXWv2OeBbq500+CR9Kxl/uDklREmQDJ+5tJL/QbeGtFQtU1p8GMgeUzd5LlTKSijHKT9OGPQPAtnc6kTrHBiyrM/iXotSwrK/6uZaUTAblABL2p7OaVV3/VpcKFX5y4rQZYc9pxQIA2wGHKbAIf6dNLjce1nbudB2NSTYgSaYHIR71/MWGiUTz0ep+wo0kgwW7aIBeGftyi/x2h9ywao1/CeqNIBfuMkutksabOr1A2rSSvykjfZDBIBECepGS3iNCeEpSEHZAYKLoC9+dVbPKNfb+9fPlRDsQ+1yvXsXAaobod5OYC5YAYLXnMXTo2NOVaZq2qW9N46Zs+CQC+4XBebeCXf/BCCxNevrlMRJ1ybVKCr/N4KP1gYVFw8wDhz6G0y1XIcjWIkigBtohI78LdNuHezILXqy7Sq0Onmd/AWN7re9nF0/rR18Vvf14/XIre06QaRcEDKYTx33UPNwREjihMXyj3vndPYoH6AcpGXhpnGJV6DEMzmPuIrbG9h3hO4Q8W/yfjJIl6mSSKT+x1v0G3yZskYNbkXvskxRJEO5G1wKQBs5SoUb/yXL9BpY4OzEKOhBabnXDRVgAvEpIRGPjLKFIwi4j2q1I5Qz6jp831lry8tYRaxJ+Wv8PhaDJ+Bg/WxxIgktrgFMpGo33YAgPVCddoHLOIBpxzhdzKmNe0+evkq5trsYGlBqTqfp8Hy2OSeZ8SP8tdVOsCOs3bFa7dt/V0PfmI00UsyZt4vD7ptOM9KxQH9kOr7JfTeVscO3ljzo1JNDoTyE= X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230016)(4636009)(396003)(136003)(39860400002)(376002)(346002)(40470700004)(36840700001)(46966006)(8676002)(81166007)(2616005)(31686004)(186003)(82310400005)(82740400003)(356005)(83380400001)(2906002)(6506007)(36756003)(70586007)(47076005)(70206006)(336012)(40480700001)(40460700003)(26005)(44832011)(6512007)(6486002)(478600001)(41300700001)(36860700001)(31696002)(5660300002)(86362001)(53546011)(316002)(6916009)(8936002)(43740500002); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 14:49:45.1372 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f7aa5ea-1c9b-471c-765a-08da5e9599f5 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT034.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4686 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2022 14:49:51 -0000 Oops... This actually fixes a testcase that I'm re-working for the MTE corefile submission (aarch64-mte-gcore.c), which is local to my tree. I'll incorporate that hunk to the upcoming v5 iteration of the MTE corefile patch. The remaining hunk (fixing aarch64-mte.c) is what should be pushed. On 7/5/22 14:37, Luis Machado via Gdb-patches wrote: > Newer distros carry newer headers that contain MTE definitions. Account > for that fact in the MTE testcases and define constants conditionally to > prevent compilation failures. > --- > gdb/testsuite/gdb.arch/aarch64-mte-gcore.c | 9 ++++++++- > gdb/testsuite/gdb.arch/aarch64-mte.c | 11 ++++++++++- > 2 files changed, 18 insertions(+), 2 deletions(-) > > diff --git a/gdb/testsuite/gdb.arch/aarch64-mte-gcore.c b/gdb/testsuite/gdb.arch/aarch64-mte-gcore.c > index 6840acac33a..d19b5217e16 100644 > --- a/gdb/testsuite/gdb.arch/aarch64-mte-gcore.c > +++ b/gdb/testsuite/gdb.arch/aarch64-mte-gcore.c > @@ -39,14 +39,21 @@ > #define PROT_MTE 0x20 > #endif > > -/* From include/uapi/linux/prctl.h */ > #ifndef PR_SET_TAGGED_ADDR_CTRL > #define PR_SET_TAGGED_ADDR_CTRL 55 > #define PR_GET_TAGGED_ADDR_CTRL 56 > #define PR_TAGGED_ADDR_ENABLE (1UL << 0) > +#endif > + > +/* From include/uapi/linux/prctl.h */ > +#ifndef PR_MTE_TCF_SHIFT > #define PR_MTE_TCF_SHIFT 1 > +#define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) > #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) > +#define PR_MTE_TCF_ASYNC (2UL << PR_MTE_TCF_SHIFT) > +#define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) > #define PR_MTE_TAG_SHIFT 3 > +#define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) > #endif > > void > diff --git a/gdb/testsuite/gdb.arch/aarch64-mte.c b/gdb/testsuite/gdb.arch/aarch64-mte.c > index bd7f1a6cf53..14057253035 100644 > --- a/gdb/testsuite/gdb.arch/aarch64-mte.c > +++ b/gdb/testsuite/gdb.arch/aarch64-mte.c > @@ -30,15 +30,23 @@ > #include > > /* From arch/arm64/include/uapi/asm/hwcap.h */ > +#ifndef HWCAP2_MTE > #define HWCAP2_MTE (1 << 18) > +#endif > > /* From arch/arm64/include/uapi/asm/mman.h */ > +#ifndef PROT_MTE > #define PROT_MTE 0x20 > +#endif > > -/* From include/uapi/linux/prctl.h */ > +#ifndef PR_SET_TAGGED_ADDR_CTRL > #define PR_SET_TAGGED_ADDR_CTRL 55 > #define PR_GET_TAGGED_ADDR_CTRL 56 > #define PR_TAGGED_ADDR_ENABLE (1UL << 0) > +#endif > + > +/* From include/uapi/linux/prctl.h */ > +#ifndef PR_MTE_TCF_SHIFT > #define PR_MTE_TCF_SHIFT 1 > #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT) > #define PR_MTE_TCF_SYNC (1UL << PR_MTE_TCF_SHIFT) > @@ -46,6 +54,7 @@ > #define PR_MTE_TCF_MASK (3UL << PR_MTE_TCF_SHIFT) > #define PR_MTE_TAG_SHIFT 3 > #define PR_MTE_TAG_MASK (0xffffUL << PR_MTE_TAG_SHIFT) > +#endif > > void > access_memory (unsigned char *tagged_ptr, unsigned char *untagged_ptr)