From patchwork Wed Jun 1 12:32:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Corallo X-Patchwork-Id: 54675 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 819F5382FE56 for ; Wed, 1 Jun 2022 12:34:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 819F5382FE56 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1654086876; bh=UvSp1/UmTO5TsLaQLliugo/Es9Ds1HiyKwOAyJ0FCSI=; 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=PrhvaUkO5LlMpWgITOC1vq5zz+Bl7+k+iyERP+gDgkw84dZBU6DkXjxaOMO54dtUO nSE4pUQfKgM9Vhm/9RiWuPfuGuxGuEwaugGfwQ+DKrRQqm6kFulcgIinXqoe+ud6l8 t5pgMAdWKTCs7xYoZ2NnzSCCdzNl+VUu4T+m0yB0= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60041.outbound.protection.outlook.com [40.107.6.41]) by sourceware.org (Postfix) with ESMTPS id D26F4382FE4A for ; Wed, 1 Jun 2022 12:32:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D26F4382FE4A ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=fli4txV4RtRHri8uplamTZeaUa5W0SYjSuoJg0JpvIzD3zlE9YMuMGpujcUyj4zQOLFe+UoiBzzRFCCdpKCYMMuwxj3q7ThsbG56A2I3KvGYm0BqYUBraIjbooT2t2FS7tRRHIBrPbWoaIOV7w+C94VIfDHLJvZCBHcAzqcDTKY5KqgkaNEBXmJT8X635CnFojf5Tir3p3VA0rqhncYPGFZL8ADC/8mMddEgytnRqL3prj0TpWCI162TZILutGN1VkHArJGnq6JjnJSCL9INsaLpXlxSJCv7wAwXmSfCON9kK8wC//Ll6HjRyX0NYGK5Lia5dByhNXEqCa4B/qlmeg== 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=UvSp1/UmTO5TsLaQLliugo/Es9Ds1HiyKwOAyJ0FCSI=; b=il2rOZYZ69BePeKQhm3dc5VuUUpGlr+G5V9Cm8+JiYYuiuhhjiE087DhOjji0HAeHq6KBs8oJ4jBI7yO9FWTFM8OIOx2uVNOTJr1QK5G4B6l3qHZ+ml13njXgWuskhghYPNG+LVczNF8ae+T5ya05EEei0BXpNCOl/28UsVCyzBeL7U+T3ETyc0iewyfue8+S+/IsuEBH/td7ZJF4EGETUx3LJ6eOt2cIXKSY1UTu5soQp8TbzfqLSjaoA3an9vEUGIu79xrJENn8wRRb724vQre76nW8N3WvdyP9lD0wIls50p8lCs5bdJtCj5QCwb87vU7VpVAkrn806e496PBEA== 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 AM6PR08CA0048.eurprd08.prod.outlook.com (2603:10a6:20b:c0::36) by AM0PR08MB3058.eurprd08.prod.outlook.com (2603:10a6:208:5a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 1 Jun 2022 12:32:44 +0000 Received: from AM5EUR03FT024.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:c0:cafe::ff) by AM6PR08CA0048.outlook.office365.com (2603:10a6:20b:c0::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13 via Frontend Transport; Wed, 1 Jun 2022 12:32:44 +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 AM5EUR03FT024.mail.protection.outlook.com (10.152.16.175) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 12:32:44 +0000 Received: ("Tessian outbound 5b5a41c043d3:v120"); Wed, 01 Jun 2022 12:32:44 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 03dab09d7c5b31f5 X-CR-MTA-TID: 64aa7808 Received: from 61ec515702ce.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FCFDE5A7-D712-4AF5-AF5C-A31B53DB6B8B.1; Wed, 01 Jun 2022 12:32:37 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 61ec515702ce.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 01 Jun 2022 12:32:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AAhCGZy82qKuVu4ARkRI9MCpvKpN6BloRsMe6QijpvMhZmcTWjHaZeVtQFSj1Sx0WF4K7JB0sbDWAk9kmqOrJUIKIFdZ9JI3iygFOeJAcAGe/bmjPnwjDl6r9Zx+NCT6q5slaNyunZRMfymfC8AjRegSwIMmIcwZbDDXvh3OINO8moqH3buKrud+ZOFKHQf1igAUsYvRnUtFfXfJxbYfMuZLgiqhLH+C6yow8cj2UJY4npqll+S4//mIgBu8t941QG3ypV5d1MHnNUpIUNZr+uYc7ywqnbAi7bTwack7iXgkMx1n4L1ZOlj3Nk50Wsl8ZCqWtE1Xynkl+KQg6xn8xA== 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=UvSp1/UmTO5TsLaQLliugo/Es9Ds1HiyKwOAyJ0FCSI=; b=P8lnYeUCoKZiCEsOwTliUr6lg3HAvBKcp3dW0YfJUYdY8G/bMOUMbJr/nSNwPzcA+Rj4XW0JcLaWojgU+irYV8yLesLInbIXu1jGs9ToDiy4loyt5HrXUY1O+/V3JW4k5ZlkRbawXe/DeIU7DLaQYNLEhwcM8OWZP7mFbI+y0ZqmzWjld9ShyzWPK8EQMkmPiWbFBY2g2+LrSAsfVjNabvdayCyqwk3bHsVhGeaK/YmAkG1H0IhJ+oe55MJEIsSjunUaTBIVPKacTPsd16svjRgwMPWwW498A17xLGHtREWsAClsft+75gs6c5QCj/ji1ZTMMKV6lHfIF97iZXc4Gg== 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 AS9PR06CA0277.eurprd06.prod.outlook.com (2603:10a6:20b:45a::33) by PR2PR08MB4857.eurprd08.prod.outlook.com (2603:10a6:101:1c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.13; Wed, 1 Jun 2022 12:32:35 +0000 Received: from AM5EUR03FT013.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:45a:cafe::1d) by AS9PR06CA0277.outlook.office365.com (2603:10a6:20b:45a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.13 via Frontend Transport; Wed, 1 Jun 2022 12:32:35 +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 AM5EUR03FT013.mail.protection.outlook.com (10.152.16.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5314.12 via Frontend Transport; Wed, 1 Jun 2022 12:32:34 +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.2308.27; Wed, 1 Jun 2022 12:32:35 +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.2308.27 via Frontend Transport; Wed, 1 Jun 2022 12:32:35 +0000 To: Andrea Corallo via Gcc-patches Subject: [PATCH 8/12 V2] arm: Introduce multilibs for PACBTI target feature References: Date: Wed, 1 Jun 2022 14:32:33 +0200 In-Reply-To: (Andrea Corallo via Gcc-patches's message of "Thu, 28 Apr 2022 11:46:26 +0200") 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: 1941505e-99d9-4195-f28e-08da43cad3e0 X-MS-TrafficTypeDiagnostic: PR2PR08MB4857:EE_|AM5EUR03FT024:EE_|AM0PR08MB3058:EE_ X-Microsoft-Antispam-PRVS: 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: F5mZ2SEPAdZwOG+IAzUl4WaOtV/UmWgJpxYaECs/nIg8UHCW45Vu1si/arVmwjvZ0rvMQUWJ8jmP/MItbtFhcU6c1IHTkqS1rrOkWBtgR/8p8I1ur4zgtaPOkWqXl630VWexOjDMKaoNYsoHBlvMnULLilZ3D2yw+TObVBq5i20+jGIQYoZ8k0waa3xdNR4pRfg2rw0MoRRU9nW1aCTe69d6QWqwCdev+k1GinKGHc8NKuC2v7A1llJhWfawSvZJ1RbvH2bjhgAzehnK0ggbIk+g0BaLYxHrgbY24XSRBTuAc1b+jNc3UlVq6rXDgT0nkdzFgWutkYMvI9iH6lc7HLuI9HXyplA45on3fCw7r2M15MGn4/abwml/Cm/zt1ZJO9+P5TmUjG8WBLHopzKKKvnMu2otYpFPMiKHZL9WZjdFxy8vVSU2WeMTlKKJ4POzBKthvhTBa0RYyua9a432DSm107iMJA6CaLrD93Zs0tJjopxRumHgJ9OXqTK2F9RZipKPTgblYvTsijLM5KuPWJBX7IuDCWm05YqH+sYCZb0KQZy8mQb0efjMaUociFaW6TXCPEUke3ObZyNn6sZDqGEy1iomQkrw8vCzifIlrMl2BkppIjNPnCtRMmJ9coWUyONMPLZsgClbPZUT7mn88WvZJzdGcoGgmyoHh2LfV2/q4LyEaOb5u/6R/JyP+4vWn3IemVEvnwb2m4h4vrcguQ== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(40460700003)(4326008)(508600001)(8676002)(26005)(33964004)(356005)(86362001)(44832011)(6916009)(5660300002)(316002)(235185007)(54906003)(36756003)(36860700001)(426003)(336012)(2906002)(186003)(82310400005)(2616005)(8936002)(70586007)(70206006)(81166007)(47076005)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB4857 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT024.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: d7c4a872-fd49-4e52-80e7-08da43cace4d X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZdjQFl7usAzroNYnbo90xCPDhaqsfhytq/GxBNsLle72XRi98FNcLYdG3Ea3odSp+uvbwUBBAstPqgAl+riZtEQjPs/OGeJ47JI3Mxk5c2d6V1T7qRTMK7c9Vdwz0c4GqVEfBoJU+OS1HsgEHh/mbAuIHSexFfbLyzXIN+jh7EkB8pr3AflQjFcQ5cq+CUrQMLi8CIfA+7j82jpB3nKAw8w8jlEGDHXB4Av/RnftX07Q0TIxZW7et3ItX4hVmFR3XSjeskXVHASqLG6u1+bJ10pAwSMjQpyllVLIP67VVnHwvtFzCbLVBCq2COyg+NjzlPXcvQTkYI723j8DWWe6nwY8yCPVCKT/jrs8s1tTVU6aN1c1tQFMc2TQpSEvDviACjLY8LXtSmwhunPfq8KslL7RVfSsOu3Yl1q6ipawBNG6Cz/Ah+8PD1v9iptwEfj/+MqM+j9WvUIxt9RTZ/8+NG6+B/PxShIDZ1Y0rDkhss4GHxPHUicoR3uhENwRMAI2O4WKmXDR6nBexSEHRn22yNmFiFNtibQ0D0Ir7N6MN/2TqfoIO+P2MRmIgEb2/+mUQfpNSOCGgrWcXqBc/nnRsQJlnnDBhUlF7N4IN/+LP1mCrIgL+jcqlJ8deSuTU/7MM5Gs8WyHze+qLxf6JsUpUdbUyzZ9/ITnl2a17/sJ4CXDiizA41CuZsenYgEpSBwy 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:(13230001)(4636009)(46966006)(36840700001)(40470700004)(186003)(40460700003)(86362001)(81166007)(70206006)(235185007)(5660300002)(336012)(4326008)(70586007)(36756003)(426003)(8936002)(44832011)(2616005)(8676002)(2906002)(54906003)(316002)(82310400005)(6916009)(33964004)(26005)(508600001)(47076005)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2022 12:32:44.2911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1941505e-99d9-4195-f28e-08da43cad3e0 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: AM5EUR03FT024.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3058 X-Spam-Status: No, score=-12.1 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: 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 Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi all, second iteration of the previous patch adding 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 To trigger 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/ChangeLog: * config/arm/t-rmprofile: Add multilib rules for march +pacbti and mbranch-protection. diff --git a/gcc/config/arm/t-rmprofile b/gcc/config/arm/t-rmprofile index eb321e832f1..77147dde2ea 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 8.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,19 @@ 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 + # 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