From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80079.outbound.protection.outlook.com [40.107.8.79]) by sourceware.org (Postfix) with ESMTPS id EE98F3858412 for ; Mon, 11 Jul 2022 11:58:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org EE98F3858412 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=eNoKSIkpcJ7eG25R1ehSq3v+mgS3lzXVYtS2CdO2SSSa4Yt6KOPGTAgfFgGvWIybfDKxCKLxtcBO4IWCWH7ltCikEGG0pjKshHD56TgXXUB0fTC7sDzBtYVaY5eYPpg/yckwsHty7yosh8LHnSE+ckvEJk6nCY2g0EyEQmkG23MbJciN71NxXfbqz3H1mFSlrJTbdN+2K7xd/MvOztt0LXdN2ohTJtXluDR6Y+hckKTsdIwsrPN1a+J4ZCrGywtiHuPoff/0D3HYGIZ0YtqPr4C4VYJaS3Z0KJWYhw0ZTLwkKWYPfj5Eo/l44wx1DzG/cyAqBxd7wIx/HdWtCduAww== 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=4mIdck7ueVViCtsibaB+E2WJjpan23yvoXy+UO0DvGs=; b=fyJH6XKNXa8cvwC5S0Jt0+7G8B4cxJRxRN6HrcKi80AHno+S9E/l7HU2S/Fn56uJgjzlwijP7vr4a0V529dqEbCQ30GxZs9F3ZFm2vbkgWD7Yqx12NptU0vkXEK7/FIKMIK8FwKoSG2shB5VKeDpkVZv3g2yQdE48byl6U9STXalrIksUXMrQRKRPgog0DWYsvepFKr4NrlAl8mQrJpHqYwFalvHK8JmK7lgQmd6JfnqkO5Lgznn7dPvoHIJA6k+h5o4ytttpJUfaO0fsOUt+ynLmQbX41ARBSCiNqeMmpcdDJ14XwQ06hjNLPQcLYQbDG7QJTIjYVmEEJ61qDfrVg== 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] dmarc=[1, 1, header.from=arm.com]) Received: from AM6PR10CA0048.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::25) by DB9PR08MB7424.eurprd08.prod.outlook.com (2603:10a6:10:36f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.25; Mon, 11 Jul 2022 11:58:49 +0000 Received: from AM5EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:80:cafe::e2) by AM6PR10CA0048.outlook.office365.com (2603:10a6:209:80::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Mon, 11 Jul 2022 11:58:49 +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 AM5EUR03FT038.mail.protection.outlook.com (10.152.17.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.15 via Frontend Transport; Mon, 11 Jul 2022 11:58:48 +0000 Received: ("Tessian outbound 0ba541f03a2a:v122"); Mon, 11 Jul 2022 11:58:48 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 44f9704c2628c84a X-CR-MTA-TID: 64aa7808 Received: from 36163e028976.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 4C33B1AA-A077-4757-AFEA-2C1DAB852ABD.1; Mon, 11 Jul 2022 11:58:41 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 36163e028976.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 11 Jul 2022 11:58:41 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e+JicjO36JepvGW/+v94KRkTrDmeu4es5GzfBqMW6BbEWghHc2oZFb6O2lzIkDR+J3wHe74uu0adNbnLt+t/ffHk9ZT8E5He/PS6yVhQ61V/2uREvK1cDfH5s4ltCmgG4l9fUgPSLHraGgFWqEjy39kBVq3vlUmZyoTVQsDQRM6Q3biO2sG1D1HHFmPuhHJcjEqqhYT00h4iOQTTOOqa6E9SsE27E9dk0uvI3xaikpH5M+L4ZRD/S/cVVVwpxhWY9eYNDAKBsO6LTZLhOloNsan/Om0jE5C3S1Q1Djv8uvYzR5IPVudqr9JStMTCJyZ+uKZNChEugvEU31uPTJzEDQ== 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=4mIdck7ueVViCtsibaB+E2WJjpan23yvoXy+UO0DvGs=; b=l4f98aipE9lj7kvIj2QGETtHbH/IJJkE0zlfV3QVBg4bNzwb9D/DzulnOtLLe+A0TMu0245pLoH5pFw2u398fFLfrTgtKah9QG2JcoucRYAsHsLwxcv/Z0uMEvkBx+Y5O/WqxdghfVVee3/QiwbZIQgq4SPICVOQD5tE1+5wbTMquBlF+WtdG3Q6QpguG1H8tVgbsj26QNt7T/UKgtVAmr687sSjRY40LUX7AhqXCVatshEHL21bivKLauBE4LNjeTuUx4wdJOB08ZM+f8fhdgxc2BHPOG4jOKJ97vRmyhPx8pYQpFBNyzQ/1v0PAUSHSsPVdBgW/mf8vrjYfxqt3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none Received: from DU2PR04CA0165.eurprd04.prod.outlook.com (2603:10a6:10:2b0::20) by AM8PR08MB6612.eurprd08.prod.outlook.com (2603:10a6:20b:368::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.16; Mon, 11 Jul 2022 11:58:40 +0000 Received: from DBAEUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b0:cafe::17) by DU2PR04CA0165.outlook.office365.com (2603:10a6:10:2b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.26 via Frontend Transport; Mon, 11 Jul 2022 11:58:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT030.mail.protection.outlook.com (100.127.142.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5417.15 via Frontend Transport; Mon, 11 Jul 2022 11:58:40 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Mon, 11 Jul 2022 11:58:39 +0000 Received: from e129171.cambridge.arm.com (10.1.38.26) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.9 via Frontend Transport; Mon, 11 Jul 2022 11:58:39 +0000 From: Luis Machado To: Subject: [PATCH,v2] [AArch64] Fix testcase compilation failure Date: Mon, 11 Jul 2022 12:58:35 +0100 Message-ID: <20220711115835.23981-1-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220705133729.132750-1-luis.machado@arm.com> References: <20220705133729.132750-1-luis.machado@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 74aa005d-b904-4eea-5ac2-08da6334b737 X-MS-TrafficTypeDiagnostic: AM8PR08MB6612:EE_|AM5EUR03FT038:EE_|DB9PR08MB7424: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: DfYDb38Qou3Gw/D+e/Yf9SMa/KLzhSiPfik9TR4aBg3UoLKu9Uu0qKcmGXW60OLdlJ8mu5H+q0JL/cdjgPJW/n8QTGKTD5YSb1QtLuI2liucWr4Ve8MlFeVBRBVLzC/gANJ/92VAXGsscBIZ5ndP9t/fNzGYfKyPj9cKRPZHUoNQlN2WoviZ+3MolLGxLjl3gMUJiQ4jE3QBWZNi97UDVbplVflFS9owyrLhOI+QK8jjy/3HGHqNG0hTHK7hxZclm34kKyrMRm2qj9ESj4mZ2nmUMA5RrWJpwewIpWYZED0PTSzvtZUz5NA00wcb6VcWSQxqnPHPq6IBM9nP0uoBRrcIoYblSkJOthZ57UEKwPYt3gm0/teF95qWRI0dS0EbCMuTplFiLmIga5KR2lLolSS+ORT/b3OH0Cb4dFcDgORckzibDmIRYZQ9RLzjTtxdC2NpFzY7F1lcCAyAR8Zq6GaTX+DC7ptCrEQv82DqiryjVRGfFQbWVg6h1zBPMzBsg5eAUaTKD7flpEqC1EWHM1bFE4OiT2MtbmFx6ugwNcRP1GjfgCJ7wZxXw06O/VXakPOnj8O6Iu44eWk2gHbs7qgX5Q+9k2vdymuYd3/OucYdhBbE4Vg1MAKI/HzjLLHGFvc8aewjsOezWjYYgVu/+Hnlo9+tgkqh/khasixK60S2wOo+W1d/ff7cKK46a0cneZF9tSABM2xngatC4L8tsZoml4m9KOGOQWY/pRNON4/HuS3sP4S8K0x9CoCw0FW6MrrNr4GSxliAtzBx9l2LzoEUN414f6CH+kMy/oRGIivZlVEF8nsvvxjzfs1LyHJ6CcZPmVXfwWknZBkjQzNND+vMukYJIy/F85muU0CH2k8= X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230016)(4636009)(396003)(136003)(346002)(39860400002)(376002)(46966006)(40470700004)(36840700001)(356005)(8676002)(70206006)(82740400003)(81166007)(70586007)(36860700001)(26005)(478600001)(2616005)(1076003)(186003)(6666004)(41300700001)(7696005)(83380400001)(316002)(336012)(47076005)(426003)(2906002)(5660300002)(44832011)(40460700003)(82310400005)(40480700001)(86362001)(36756003)(8936002)(6916009)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR08MB6612 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT038.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 2c1e50cb-701f-430a-2360-08da6334b205 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EjduMVAH0M6ZtAL+d6Iw8LRFJx7OvKgs5yPadkI15ZlK9kfcpTgA2NB0hpPKUlkvGiMp2k22vNsPzLCLpcX1EDjdJi6q51xa1Znyer7VGi5UnEUI1wkrK7jGYCpXwUbP7Alv8UF4L03LaGPAzhBowJTIAlwUniznJCaz7azWYDXwYc9qSopt85vOFDTWEew4OVzzO+uBM04kFRKYkpRhOQUs8qE+DyaNV/tFXP+p625qYLfPDY5R2vvaoUDmIUS4dmzsdqjMYw3Z2e6qQ7TUEtUvzBe7u4gPtKRpBBPNeOXiljNXi1ghTM0lEd8s1+zmTDo5bVH3Byy3TvpRB8pPwNo44gWsSOANLktGfvyC8iinNvcvjVO6ceLEHWoZs4IFMTWbPwWiGk4BnTF6MrAg1BFxh2GQWEty0jDiqIhcw0GZzeRnGl3qoRPk6WyMxCW2OAuJKfujlj7pglvSK1fkN0H4uym8IF91nt2pnRwCRZva6LC0J8fUPrwTp94T8bDbMXvHiaa1sdeTSyCX97mq4gNLErrt5hxoKGx/eDCivvkLr4kDNjONRagyEtNqrEsdphCXYf5B94wcC4E3RFRUjhzHJgd+cDzb7QZInY6EYXpqdw20XMW6RooKItogk7yQkS3KwjeM+8flyzeYtX0XnJ5SD8hGsWvpRaGNGoS9cc03smsghKt9QuCts607NtgNrFxmZn8ZqaTEEMXbPFZymii2zAllc2TqQpZbbyeCN6osQc5RrI3bBB23EDEFUhX/UrJsEc9A5jc7SBMxkRaqcHWLLOhnUNUll+9edxxrJYPopNdQwn1hYqMxRLdn+Dh0 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)(39860400002)(346002)(396003)(376002)(136003)(46966006)(36840700001)(40470700004)(316002)(1076003)(2616005)(36756003)(40480700001)(26005)(6666004)(36860700001)(8676002)(41300700001)(70586007)(70206006)(6916009)(40460700003)(186003)(81166007)(2906002)(82740400003)(86362001)(44832011)(336012)(426003)(47076005)(83380400001)(5660300002)(8936002)(478600001)(82310400005)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2022 11:58:48.9028 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 74aa005d-b904-4eea-5ac2-08da6334b737 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: AM5EUR03FT038.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB7424 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, 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: Mon, 11 Jul 2022 11:58:53 -0000 v2: - Removed unused constants -- Newer distros carry newer headers that contains MTE definitions. Account for that fact in the MTE testcases and define constants conditionally to prevent compilation failures. --- gdb/testsuite/gdb.arch/aarch64-mte.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gdb/testsuite/gdb.arch/aarch64-mte.c b/gdb/testsuite/gdb.arch/aarch64-mte.c index bd7f1a6cf53..fc38d58fe5e 100644 --- a/gdb/testsuite/gdb.arch/aarch64-mte.c +++ b/gdb/testsuite/gdb.arch/aarch64-mte.c @@ -30,22 +30,27 @@ #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) #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 access_memory (unsigned char *tagged_ptr, unsigned char *untagged_ptr) -- 2.25.1