From patchwork Thu Jul 21 09:04:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Corallo X-Patchwork-Id: 56217 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 58D1E385AE69 for ; Thu, 21 Jul 2022 09:05:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 58D1E385AE69 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1658394303; bh=TPxiMPBoNlLiwxj9bBPctzEOfLW1CandEmu4X1ZRBVE=; h=To:Subject:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=BrSJcvEA/k23hMHWh/KK11MvXkBu9unsmVfTSarAh2ZkwHUq/Rls6Z1NpCBeVoajL v4ybKZJ/FqWoRYCpLYu6t1/tEIni4qlQ7Yq86wfcc2uDkjEVSGI5DCNQ5xOd8Cu71D yoqDLHJ3i1UfGt+glUTXXA71X3JN+FgrJcs0GHBg= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80078.outbound.protection.outlook.com [40.107.8.78]) by sourceware.org (Postfix) with ESMTPS id 25B78385AE40 for ; Thu, 21 Jul 2022 09:04:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 25B78385AE40 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=CxfyNrvZqNeZJ8gWGGxOVWSwrmHDAK+yZk/WSI2oskOSvdyhXObkX/OEsZi3bjI7xZl3BCX+zeW5EQh99LEHwvzHrR84bqjiWXeiYZocsPwxIZGncaY/LroJaJKFOaMCEoDwCzPZChOt5fcYzqFcRyuGRsQ0NiABfolwL3RpGEQV3XVu4eQxwRZIHin5G8pKVNZbDe+VFfefSAxyeVkILxjuURmP12S1D9ptz++DG5dA6zNOJgiePlJDQsl0JjgBWB5NZD+GLVJ//fX9OuGcBpEqft7uT/9ZZnRU8DRqDW3H7HGFyw7AtihpZOUnHE08jGZ5bncod21PhUaaVSUYNg== 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=TPxiMPBoNlLiwxj9bBPctzEOfLW1CandEmu4X1ZRBVE=; b=LdkcN1AHnosCq6okYGEKLHqnP4N4GhnupszJT1vgXOsm9xO0Uuvt6rJeyf5EYWtgGZ4p3pKeOjgqYWnDFPdwC/FmcvvI6jcRA1L71f8MC9yMfuMy7pSZInWrE2kChlBJHbfhyIU2nXcnzqUUzjV4Qx6G8BzMefFXsHIGKJcMKtjBzMTMgcAV3L/10XWL7Ee/p01FjVMhenZ9//4sFPsrZaWF/Zy52J+7Yp6ISe2sgBJPbuiwOmQmRDhl419FdAwL+Z/kBOF7i2ZONCuSEqZ61KGeHuvhYtagep2hkDXQEQktf8kkNwSR/tL7QqvQ1BX8gQNf2W60PBPXXLWPvb+24g== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.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 DU2PR04CA0053.eurprd04.prod.outlook.com (2603:10a6:10:234::28) by AM0PR08MB5425.eurprd08.prod.outlook.com (2603:10a6:208:17d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Thu, 21 Jul 2022 09:04:24 +0000 Received: from DBAEUR03FT023.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:234:cafe::5f) by DU2PR04CA0053.outlook.office365.com (2603:10a6:10:234::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18 via Frontend Transport; Thu, 21 Jul 2022 09:04:24 +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 DBAEUR03FT023.mail.protection.outlook.com (100.127.142.253) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.12 via Frontend Transport; Thu, 21 Jul 2022 09:04:24 +0000 Received: ("Tessian outbound fa99bf31ee7d:v123"); Thu, 21 Jul 2022 09:04:24 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: fdc4f55e09c70887 X-CR-MTA-TID: 64aa7808 Received: from 1adc075eb472.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1FFA7BFE-8EE7-4386-BB3C-41077A5C6227.1; Thu, 21 Jul 2022 09:04:17 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 1adc075eb472.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 21 Jul 2022 09:04:17 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PbawtAE/N7yeJoVRLStYuQ0PrsyzUUg8bewZtTNPQZ4LgxF1Syg7B5Ip4xe9/rCcd1nq4/hgELBnKg2wrd4Fv/oX3lKpT/jo7DVUVmU9fCK8O3AKEl3nW/kzF5xGYGgZFYlCTs0i8dAjOulmm/K1FoodkCcQofXrmx62uBCgiSnKexwRHz78d4MQCwKDWPVF7244DAU0TQEzhi0riDopybR5YUtt4U1b1AiatJEuTnoaCJpyPs5hGouwe+ULLijxD69YSfuvGaRGomwIc4haKfbL8ds3u2PLaqvsIFK2vBrAKZLKMSKR9t5pP4CkqySAZ0eTxJjqfKYQZw2RwIqjsQ== 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=TPxiMPBoNlLiwxj9bBPctzEOfLW1CandEmu4X1ZRBVE=; b=Eo+oGgXJmK3Ec1lYG1gC0AzILF9wNmYz9wPLztzkyyaFoY8vjERwGm9BEswLzpEIf0Ddp4gDF8hDEXjWGlNeG6Yamhwh2LPG/IvVxqxTKT07yZbxdx7zvDl2fuBkk/tBsRxPUE4NwW3cRDY3hrY3pXHozApKh2k9jYRVtYQn2DxZwovliALIsD70g6Vt+EIHZli2Sq5BHG4TeLGAl7OfQ9h/T2CLaYHo+m8WKJsfq1REOdzTSMQ/azNhR2yOxZ1DGC+VNcpjRxj24g+A/K4AdmvANM+1QPqcGercVTxMjZMtA9Nkg1R2py1qAf8kL9l3S5lHxy/LSGtNj4iJDoowgg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=gcc.gnu.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 AS9PR06CA0482.eurprd06.prod.outlook.com (2603:10a6:20b:49b::7) by VI1PR08MB4528.eurprd08.prod.outlook.com (2603:10a6:803:fd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.20; Thu, 21 Jul 2022 09:04:15 +0000 Received: from VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:49b:cafe::95) by AS9PR06CA0482.outlook.office365.com (2603:10a6:20b:49b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.17 via Frontend Transport; Thu, 21 Jul 2022 09:04:15 +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 VE1EUR03FT017.mail.protection.outlook.com (10.152.18.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5438.12 via Frontend Transport; Thu, 21 Jul 2022 09:04:15 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Thu, 21 Jul 2022 09:04:06 +0000 Received: from e124257 (10.34.105.24) by mail.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 via Frontend Transport; Thu, 21 Jul 2022 09:04:06 +0000 To: Richard Earnshaw Subject: [PATCH 8/12 V3] arm: Introduce multilibs for PACBTI target feature References: <075cc158-d681-65b9-4d87-22c8800661fd@foss.arm.com> Date: Thu, 21 Jul 2022 11:04:05 +0200 In-Reply-To: (Richard Earnshaw's message of "Fri, 1 Jul 2022 15:57:25 +0100") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.50 (gnu/linux) MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: ed5a1a72-6edb-49bd-4a38-08da6af80235 X-MS-TrafficTypeDiagnostic: VI1PR08MB4528:EE_|DBAEUR03FT023:EE_|AM0PR08MB5425: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: /gvnLTnQXmVrjTMWuqMu5KxbrY1q33JDKaYc+fINRVRGlEcO38OmeQnSPKi+vV76jGVCbmwr5l0QqgvRr2W78wNnaltBL5N3oZyABJkAIscjYH1c2d3adO5N9rPXbjK0Xx4KCZaY5PZH6x8e1DjNatV4bXncr/Sftpx5Py5HXD4AE4LEHSU65G2ML8Raw5ZYBY6T7hQmv74vdGq3EpXZG8SJfGQU68XrvyV9jBfcNkf1aPQ7EUf6YdozkayjOgE/VKUHnZNZqEUEMFUzqd6i8h4jlgwf41pHFeUs1rUqNfBaYCkjtj+hNUNNUw4q1D7KH0TrdunvMyPfkzUUexIHs57gAi/PRxoyQY6k+A/gC+UZvUqc1Ksk6tns2MLyIHTxoK2GOWTsZZG9ViAyTIfQV8yg92ejmS5cdmnAt1IxXEboujMioqIcdJvwLEBeK2ZipLeZdiNxW9wcqr6dVLuJ/5XFZ3yV+RSDEp+G/WotYm1BjatVut4T350hSBMNjXowoxGJvf0mZmLoJqnNAdp5wZnNL7sgD1/hnaEMXRnHu9rI064X2KNUfFUNPbDbJaPhL4UWS9AGo7qr1w6W2BplmTyV6y/Lr5D7xLLw8kkEwht8kO1j7WhuWjBlYniI1khZ87Zz9QmRpRb6sqpRROM0AlaHNb8YTxswjJBSF/OJAje1qxtieOQOnTqBXIJlzufkmrj+TyHOQQZ7b0Enp3yzELIsP3j/OcmNZBc4piIIc0Udt8IotPOLw5XuHo3ryxFH6UpIEWkCfA7dxBoo1kSoNaeCfUc3HdluTQeol2GGutJZBGWvxl/MZBp19KWJxy2NvxuUY63821p9HTS1oIgBfw== 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)(136003)(39860400002)(396003)(36840700001)(40470700004)(46966006)(40480700001)(70206006)(6862004)(8936002)(4326008)(8676002)(81166007)(36756003)(47076005)(2906002)(82740400003)(40460700003)(54906003)(356005)(70586007)(426003)(33964004)(41300700001)(26005)(186003)(316002)(478600001)(2616005)(44832011)(36860700001)(336012)(86362001)(235185007)(5660300002)(82310400005)(83380400001)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4528 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 1c225059-31df-450f-08aa-08da6af7fcb5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T7oy6hAwCoBjmxUPV8h1SWFrIfu/15HUuEHZXNu65okOo15plp7suinEWS4n6vk21BqBmkzaAIcchAp348kLko0pz0gnTrZcBgobOma6WRHmrKhUFut7WpKjreiFZ8282l9mc3HddwoNh+LleoZF4FtsGdVgyNB97204LRjpPZ9Ewqtk/Kl+YSOMLACV5zYngfNdBlApwv8c7BCylLlOzkstWD/8OchuQWhnq8EZuy68lgDX1mRqO3pTzeKKlzrYT2LZO5FwvvKxTp54vmS0wg1r11mZX8n4a13aE0drJRgD1txsmQtFM+MfLzZ/o76qlkObDyS+jL1N0mdVunLSd0oJTPuAMjBKWD903pZG7Q7qrAiLZDytbuCMFvE/Q+NCVXc4iCwX3MyodeUPny4mlxQjOizoHQU+iHRijrgNSYF/91JtWJszpeirRxS+E4C7umxxIxvNIrQ3/guhI7cAjc6womThY9/nTy/POuH6G2JpnxTuOkPx0hGWZg9JPlBb5D2ktj0KS6w5u3MvdsfLPy1kR3NecBAMvSznOI1gt+KaYiBxfXIL8itKJr97nXPaYxqetaCYDX0yXay2Kpl2U0fL1BdHsGB0C/j4DO8rFnHTxLjtugYH2oMHfHyUTYhLsTlZClqkxi/o3lho7y8HI4pXcfMRHAAtEGIS370LPDhIN50t8qR51xtz1LxE6kPmGDILdege5ZtHPzgM7U2ya2KDbO9pjnwhgLU+DpvRPrkM4uZzeZKzA5mgf+YaL3kj1bPjqNuTbKFgDiaIQMAY52QUWnk5nGX24z/sH7aW6WjzP5918n8wEkDd2EB6nmYe 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)(346002)(39860400002)(376002)(136003)(46966006)(36840700001)(40470700004)(336012)(2906002)(41300700001)(33964004)(47076005)(2616005)(5660300002)(26005)(316002)(82310400005)(426003)(83380400001)(82740400003)(235185007)(40480700001)(186003)(36860700001)(8936002)(86362001)(8676002)(40460700003)(54906003)(4326008)(6862004)(70586007)(478600001)(81166007)(70206006)(44832011)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2022 09:04:24.7670 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed5a1a72-6edb-49bd-4a38-08da6af80235 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: DBAEUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5425 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrea Corallo via Gcc-patches From: Andrea Corallo Reply-To: Andrea Corallo Cc: Richard Earnshaw , nd , Andrea Corallo via Gcc-patches Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Richard Earnshaw writes: [...] >> The documentation mentions -mbranch-protection=standard+leaf, so >> you're missing a mapping for that. >> OK with that change. >> R. > > Oh, and please add some tests to gcc/testsuite/gcc.target/arm/multilib.exp > > R. Hi Richard, thanks, here the updated patch. PS I've also added three mlibarch -> march matches that were missing. BR Andrea From bbd0efb375c08981be7632319b24830196429e9b Mon Sep 17 00:00:00 2001 From: Andrea Corallo Date: Mon, 6 Dec 2021 11:42:59 +0100 Subject: [PATCH] [PATCH 8/12] arm: Introduce multilibs for PACBTI target feature This patch add the following new multilibs. thumb/v8.1-m.main+pacbti/mbranch-protection/nofp thumb/v8.1-m.main+pacbti+dp/mbranch-protection/soft thumb/v8.1-m.main+pacbti+dp/mbranch-protection/hard thumb/v8.1-m.main+pacbti+fp/mbranch-protection/soft thumb/v8.1-m.main+pacbti+fp/mbranch-protection/hard thumb/v8.1-m.main+pacbti+mve/mbranch-protection/hard Triggering the following compiler flags: -mthumb -march=armv8.1-m.main+pacbti -mbranch-protection=standard -mfloat-abi=soft -mthumb -march=armv8.1-m.main+pacbti+fp -mbranch-protection=standard -mfloat-abi=softfp -mthumb -march=armv8.1-m.main+pacbti+fp -mbranch-protection=standard -mfloat-abi=hard -mthumb -march=armv8.1-m.main+pacbti+fp.dp -mbranch-protection=standard -mfloat-abi=softfp -mthumb -march=armv8.1-m.main+pacbti+fp.dp -mbranch-protection=standard -mfloat-abi=hard -mthumb -march=armv8.1-m.main+pacbti+mve -mbranch-protection=standard -mfloat-abi=hard gcc/ * config/arm/t-rmprofile: Add multilib rules for march +pacbti and mbranch-protection. gcc/testsuite/ * gcc.target/arm/multilib.exp: Add pacbti related entries. --- gcc/config/arm/t-rmprofile | 29 +++++++++++++++++++++-- gcc/testsuite/gcc.target/arm/multilib.exp | 6 +++++ 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/gcc/config/arm/t-rmprofile b/gcc/config/arm/t-rmprofile index eb321e832f1..c50bf4b3557 100644 --- a/gcc/config/arm/t-rmprofile +++ b/gcc/config/arm/t-rmprofile @@ -27,8 +27,11 @@ # Arch and FPU variants to build libraries with -MULTI_ARCH_OPTS_RM = march=armv6s-m/march=armv7-m/march=armv7e-m/march=armv7e-m+fp/march=armv7e-m+fp.dp/march=armv8-m.base/march=armv8-m.main/march=armv8-m.main+fp/march=armv8-m.main+fp.dp/march=armv8.1-m.main+mve -MULTI_ARCH_DIRS_RM = v6-m v7-m v7e-m v7e-m+fp v7e-m+dp v8-m.base v8-m.main v8-m.main+fp v8-m.main+dp v8.1-m.main+mve +MULTI_ARCH_OPTS_RM = march=armv6s-m/march=armv7-m/march=armv7e-m/march=armv7e-m+fp/march=armv7e-m+fp.dp/march=armv8-m.base/march=armv8-m.main/march=armv8-m.main+fp/march=armv8-m.main+fp.dp/march=armv8.1-m.main+mve/march=armv8.1-m.main+pacbti/march=armv8.1-m.main+pacbti+fp/march=armv8.1-m.main+pacbti+fp.dp/march=armv8.1-m.main+pacbti+mve +MULTI_ARCH_DIRS_RM = v6-m v7-m v7e-m v7e-m+fp v7e-m+dp v8-m.base v8-m.main v8-m.main+fp v8-m.main+dp v8.1-m.main+mve v8.1-m.main+pacbti v8.1-m.main+pacbti+fp v8.1-m.main+pacbti+dp v8.1-m.main+pacbti+mve + +MULTI_ARCH_OPTS_RM += mbranch-protection=standard +MULTI_ARCH_DIRS_RM += mbranch-protection # Base M-profile (no fp) MULTILIB_REQUIRED += mthumb/march=armv6s-m/mfloat-abi=soft @@ -50,6 +53,14 @@ MULTILIB_REQUIRED += mthumb/march=armv8-m.main+fp.dp/mfloat-abi=hard MULTILIB_REQUIRED += mthumb/march=armv8-m.main+fp.dp/mfloat-abi=softfp MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+mve/mfloat-abi=hard +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti/mbranch-protection=standard/mfloat-abi=soft +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp/mbranch-protection=standard/mfloat-abi=softfp +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp/mbranch-protection=standard/mfloat-abi=hard +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp.dp/mbranch-protection=standard/mfloat-abi=softfp +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+fp.dp/mbranch-protection=standard/mfloat-abi=hard +MULTILIB_REQUIRED += mthumb/march=armv8.1-m.main+pacbti+mve/mbranch-protection=standard/mfloat-abi=hard + + # Arch Matches MULTILIB_MATCHES += march?armv6s-m=march?armv6-m @@ -87,9 +98,23 @@ MULTILIB_MATCHES += $(foreach FP, $(v8_1m_sp_variants), \ MULTILIB_MATCHES += $(foreach FP, $(v8_1m_dp_variants), \ march?armv8-m.main+fp.dp=mlibarch?armv8.1-m.main$(FP)) +# Map all mbranch-protection values other than 'none' to 'standard'. +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?bti +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?pac-ret +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?pac-ret+leaf +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?pac-ret+bti +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?pac-ret+leaf+bti +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?bti+pac-ret +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?bti+pac-ret+leaf +MULTILIB_MATCHES += mbranch-protection?standard=mbranch-protection?standard+leaf + # For all the MULTILIB_REQUIRED for v8-m and above, add MULTILIB_MATCHES which # maps mlibarch with march for multilib linking. MULTILIB_MATCHES += march?armv8-m.main=mlibarch?armv8-m.main MULTILIB_MATCHES += march?armv8-m.main+fp=mlibarch?armv8-m.main+fp MULTILIB_MATCHES += march?armv8-m.main+fp.dp=mlibarch?armv8-m.main+fp.dp MULTILIB_MATCHES += march?armv8.1-m.main+mve=mlibarch?armv8.1-m.main+mve +MULTILIB_MATCHES += march?armv8.1-m.main+pacbti=mlibarch?armv8.1-m.main+pacbti +MULTILIB_MATCHES += march?armv8.1-m.main+pacbti+fp=mlibarch?armv8.1-m.main+pacbti+fp +MULTILIB_MATCHES += march?armv8.1-m.main+pacbti+fp.dp=mlibarch?armv8.1-m.main+pacbti+fp.dp +MULTILIB_MATCHES += march?armv8.1-m.main+pacbti+mve=mlibarch?armv8.1-m.main+pacbti+mve diff --git a/gcc/testsuite/gcc.target/arm/multilib.exp b/gcc/testsuite/gcc.target/arm/multilib.exp index ddbb4439314..52e67446453 100644 --- a/gcc/testsuite/gcc.target/arm/multilib.exp +++ b/gcc/testsuite/gcc.target/arm/multilib.exp @@ -832,6 +832,12 @@ if {[multilib_config "rmprofile"] } { {-march=armv8.1-m.main+mve.fp+fp.dp -mfpu=auto -mfloat-abi=softfp} "thumb/v8-m.main+dp/softfp" {-march=armv8.1-m.main+mve+fp.dp -mfpu=auto -mfloat-abi=hard} "thumb/v8-m.main+dp/hard" {-march=armv8.1-m.main+mve.fp+fp.dp -mfpu=auto -mfloat-abi=hard} "thumb/v8-m.main+dp/hard" + {-march=armv8.1-m.main+pacbti -mbranch-protection=standard -mfloat-abi=soft} "thumb/v8.1-m.main+pacbti/mbranch-protection/nofp" + {-march=armv8.1-m.main+pacbti+fp -mbranch-protection=standard -mfloat-abi=softfp} "thumb/v8.1-m.main+pacbti+fp/mbranch-protection/soft" + {-march=armv8.1-m.main+pacbti+fp -mbranch-protection=standard -mfloat-abi=hard} "thumb/v8.1-m.main+pacbti+fp/mbranch-protection/hard" + {-march=armv8.1-m.main+pacbti+fp.dp -mbranch-protection=standard -mfloat-abi=softfp} "thumb/v8.1-m.main+pacbti+dp/mbranch-protection/soft" + {-march=armv8.1-m.main+pacbti+fp.dp -mbranch-protection=standard -mfloat-abi=hard} "thumb/v8.1-m.main+pacbti+dp/mbranch-protection/hard" + {-march=armv8.1-m.main+pacbti+mve -mbranch-protection=standard -mfloat-abi=hard} "thumb/v8.1-m.main+pacbti+mve/mbranch-protection/hard" {-mcpu=cortex-m55+nomve -mfpu=auto -mfloat-abi=soft} "thumb/v8-m.main/nofp" {-mcpu=cortex-m55+nomve -mfpu=auto -mfloat-abi=softfp} "thumb/v8-m.main+dp/softfp" {-mcpu=cortex-m55+nomve -mfpu=auto -mfloat-abi=hard} "thumb/v8-m.main+dp/hard"