From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2055.outbound.protection.outlook.com [40.107.21.55]) by sourceware.org (Postfix) with ESMTPS id 7447A3858292 for ; Tue, 5 Jul 2022 13:37:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7447A3858292 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=AEyBIJsBShzVkdnjK2lcbt6sEeavQZbX7Yort6YAHXQecULdHcHwHWN9GB5HOoYW9GfKaytVZsxZy1sIt6ZvvQIsGqW68BVNmSHy7jPjvW+cXTSzX5FcwA7xcuvPoWthh20H387jUR84E690MH4cc7gcwiBVl1YIa9Ha5fUYJ6mnJSB9cs7jJ4/QahQbOCM8E9w/y+Wl8A7qT9KjuF+CWlIhGmbBGZG0nBc1NyAtzz01NNS+6A+CaGbOk6gSg6ucXWDBUi6TGtOYm2dzUI/yKBga/xUjrX8i5nohjKdd+zAXmfJc9IxNuYCm2FUPN/cq5diYdTahLO3NdH1WEdUucg== 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=ZbLEkEZvhORngwoPkNoWAk8kXQZ7g+o9suKpujqHeos=; b=MzVTwVfQMSS3GWZYMzWAJHHEKQcCoLRg82FNDgZaxHWhDXNB2WPQDK3hVNwD7E8ER3W452mtvg3+gXJE8FVuRKBohrGQlbaxaWjPJ5pMnxhMD1w8Un+NrwK3STkK1sajknfN1oW5FA+SkwBCDbzdkRzhlngC5Vp+ksYyPkjgX1iNkogZeLXUyulTAtNddV+438aYD+Kgbga0RY1tXA2QUokkNLEcX2pjt9b4/g/XzumI3tseTcKEnvVSTFyA4hEP/d7fiJpU5c5PAixvL4PYoBSTs4YSu5aGFWf8xyO5opXbH/3IJQZDPaZR3EWXJq7/3+nt7jYwpdsNkCkLLrLHVQ== 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 AS8PR07CA0029.eurprd07.prod.outlook.com (2603:10a6:20b:451::30) by AM6PR08MB3862.eurprd08.prod.outlook.com (2603:10a6:20b:8c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.19; Tue, 5 Jul 2022 13:37:41 +0000 Received: from VE1EUR03FT028.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:451:cafe::5a) by AS8PR07CA0029.outlook.office365.com (2603:10a6:20b:451::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5417.13 via Frontend Transport; Tue, 5 Jul 2022 13:37:41 +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 VE1EUR03FT028.mail.protection.outlook.com (10.152.18.88) 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 13:37:41 +0000 Received: ("Tessian outbound 3c5325c30453:v121"); Tue, 05 Jul 2022 13:37:40 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d8417cea13d1273f X-CR-MTA-TID: 64aa7808 Received: from 6146f358c4a3.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FD649C5F-0F5D-4AE8-9019-3195657157E4.1; Tue, 05 Jul 2022 13:37:33 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 6146f358c4a3.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 05 Jul 2022 13:37:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nc58xIfc9Ex4ogIHzknS+6wihRTdrspUQSpGkZZRKfryjEdn/kqsz5VCIlu1K/2V37kypf4KDSdkMPEol5WW7Zs1as2fUOdqP+iL/v1uIQeItVkvs7f7vX04JfvlJ++C9kseKVMETD4J7tZxPRMrOrYoOZ0Johrg5g1w5ql246g+BdRwdyt4x9IC/zKcuoO7nJElUb3GyufGxLpLsas9k2vI2BKKe82eUl7Q1y6YInOpeflCwMv6MXDh7llJ8+I6kVDNWtrKmpWsXuT6rorDyan0cbGyCaqrNLg+BG+TfwLQ1uFF12eQU/e/rsltC05tMusvX0IAppNs9b0bWyL1kQ== 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=ZbLEkEZvhORngwoPkNoWAk8kXQZ7g+o9suKpujqHeos=; b=hvp+mrBu8Ur0KAWEe86wOmqIem1F3jxvUcqHMZFS8OrVlW97XtbyLdUnN2evFvYPZ77Oq6kBhmsBAvgUjYxBJqdBT3tTuB7XEgLmtnO6Gz7SCg2cHLaiLZIO4H7bbmjc05mdHtmW1OI625NUYraBrwgslTI49xDn0fpxvnCr60ZL5xn7mvUl8JAFrMBGf57A9/H3FVCK46YjKm08L6Umyw/yqbLNVhFwyvKWXgUxEt0tmKU/bYtK5ZvD+NJr05xbWRd03Tl867XElNV0r10V9HapbReA+bGOKTMcHtjqwXWu6j5iotvTjDtjmQ5TgnZGjlyKQPZhLyeqeJb+tKSZrw== 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 AS9P194CA0027.EURP194.PROD.OUTLOOK.COM (2603:10a6:20b:46d::22) by AM6PR08MB4229.eurprd08.prod.outlook.com (2603:10a6:20b:70::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.17; Tue, 5 Jul 2022 13:37:32 +0000 Received: from VE1EUR03FT047.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:46d:cafe::5a) by AS9P194CA0027.outlook.office365.com (2603:10a6:20b:46d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.17 via Frontend Transport; Tue, 5 Jul 2022 13:37:32 +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 VE1EUR03FT047.mail.protection.outlook.com (10.152.19.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5395.14 via Frontend Transport; Tue, 5 Jul 2022 13:37:31 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) 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; Tue, 5 Jul 2022 13:37:31 +0000 Received: from e129171.cambridge.arm.com (10.1.39.37) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2507.9 via Frontend Transport; Tue, 5 Jul 2022 13:37:30 +0000 From: Luis Machado To: Subject: [PATCH] [AArch64] Fix testcase compilation failure Date: Tue, 5 Jul 2022 14:37:29 +0100 Message-ID: <20220705133729.132750-1-luis.machado@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 6dd2c7b3-8dd5-4f89-1b2a-08da5e8b88ad X-MS-TrafficTypeDiagnostic: AM6PR08MB4229:EE_|VE1EUR03FT028:EE_|AM6PR08MB3862: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: d0e8zvfte1gG1FGrxjY1eEisCSoDL/iIhNojfp8g5QBA0pwWcdSlyrDG41IcFSSrSpDiOiyKZYGNjQj7GJqvERUM/dKHUov7eDjD2qMnKi6zntICmOvb754wkMgVBjMqIHlBt381Et0TBpjCbZtIE2+8x1eWPx7dS52icWevk07BbQh0gjcY27yq22KjfJasNMYZdShf2NoLlQDwfeaRYAzAbusupi0YxUEAf7CnRyPbt0VJprFDlGLwaVdjjL3CcefXig9kAvGO8DjHEMUIVNDxQseqy871A8JGWvpt3ZCkslRu3HuQOkjXyULjr/SXw9UrWDhVHDjtM9Iilqm/qB28RBzLBSyJzF/yuqViZ8n+mYcYPe6sHG+dQe4lpYeZrb8SqUzmxdKi/vyQC0px8p8XREicmMhF2vc3Gvg48i+47JbYw8vv7JgvbehFI80p5oZfeGnJCQKUUtNCX/FiFWTvvmrOlRkh7x2csdw64y/UK9M6ADj6xyslXodum3MXoAU6P6ok/dhnFGrTC80GTtyk8cUSp8ZRTNWAxBt5GziO5LXwD07uhwv8UYhyPEPlurdHQuULXBMmm0+wIib+kO5LXoYxTUEHIBaL9EQxg/2ULbLdkelylfLONeLLuFa4ym8aHSrXuaip7ykgzykT+owwcjP0QB+bPM0gDYGS73zpfbzM3zwx6QcEvVHOgdpB95I2kxQQ7TUStNhiQgMlGyp7RM1QCiop5IldlMAu3slAOzHoKEAwpjCJ/NxH/hQsE1a36B0fvrTbKyXbuxLrQWCumKbrFWdeMGZ1HkfpUismB3O6CqgE3sTMOAfCbV6pJAjOSiTyyL5bXAOAv7783gHFd8ZDueETzsB5xI+NI9U= 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)(346002)(376002)(396003)(136003)(39860400002)(36840700001)(46966006)(40470700004)(44832011)(478600001)(5660300002)(8936002)(7696005)(40460700003)(86362001)(26005)(41300700001)(2906002)(36860700001)(82740400003)(356005)(81166007)(82310400005)(47076005)(426003)(336012)(2616005)(186003)(1076003)(40480700001)(83380400001)(70206006)(70586007)(6916009)(36756003)(316002)(8676002)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4229 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT028.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: d5ed86b0-8e03-463a-c10f-08da5e8b82e0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vru46HaEUecEEngqmDA+j3VnDTppM1feqy1rNrEtwu/WBYbpKm6AoKNpy6m4u7lACFpmpUct0PFZhA+4jlIAZS/qBSWaZHdm9LcSqPWXV2T+UTK6uGr4ZFPs/FAL8CgA6A9zc8acvwbNpinZ2x+J22Y8SIzKhba2Z1+Wjh4XgIomlivJC+ordzY07tczjngNpYbmBIPj8h1Mpw0D5M2tNQNLnS/djkSYBcT2ZcdTnDPkt2dFW4jyeeDFm82MYQ+H265g3sx+zHcpohXpIPP9WuFzyHliOQVOE3hbC3Kpgo4lE5isTAZY3BIKXNEK0rZXHkECohUp0t/qLTmBlZL1ILDc6RFfDHualUV2/BAeE3DD3eCSME/LJ8sP96qwYNlwqEI/z1V5313YZwGbHdqltIovDVOAiuj1G2U03NqmOc/hyrrrNYjSQ0l9MGDBOFzVyOpHl9eNeT115xBgviO4vBu95f+e2np1xHYOZS2yYA3z4LlkTlj06SUe76NV4jzFTT9+mplBQU394qUSuxsmq9fh7mc80JsmGDYdEW2S1P0Sn2mUc5njl6ndOmOKU4PHXHM+60JCzMmsjzeXOatR5edxwYroRLjkRImtkW8wV/w1xqCXKMoStaVtmpVHdLp/8aI8TPy9BzwjN5KTqDpFhmHj3GnbOu4kZXKWE0WTcTl8aT0Q+I8iEtooQU95fcFupglzxqZZj4DQG5U9J91cQzUwojBvQ6tmv4+lcK8sAjgUqHbsCTxxEvVfjyYphigEdnBHJXjG6DGGDUaDxiTQPzIXFgZM4k2fHKXXwgqYyFL7G64muGsHF5kf8ieMI4RM 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)(376002)(396003)(136003)(39860400002)(346002)(46966006)(36840700001)(40470700004)(1076003)(8936002)(86362001)(478600001)(82310400005)(44832011)(70206006)(70586007)(8676002)(36860700001)(82740400003)(5660300002)(40480700001)(2616005)(40460700003)(26005)(81166007)(186003)(316002)(36756003)(47076005)(6916009)(7696005)(2906002)(336012)(426003)(41300700001)(83380400001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 13:37:41.1763 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dd2c7b3-8dd5-4f89-1b2a-08da5e8b88ad 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: VE1EUR03FT028.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3862 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: Tue, 05 Jul 2022 13:37:47 -0000 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) -- 2.25.1