From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2067.outbound.protection.outlook.com [40.107.22.67]) by sourceware.org (Postfix) with ESMTPS id 229163858D28 for ; Fri, 12 Aug 2022 15:33:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 229163858D28 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=SF4Frn2mxwUBLa98OFfvjMsE05vGHl+gxjzFstEJ9tq7YiUkUHuq2VDLnIEL0ssk108Y9i3PY24UPc4qtJCK91StcvCAI97G2e8wr5tSxxDElbVqv60DKewzsT9WJgNQEcHXhMCtWI4YHMn98CJdvjAOOiNDLUU5HYS1Y8ioSLjCx8EuSY402BKXKRsSa6x/3IADZ69eUCvUgyMXu1m8234VILhB02FpqYyILXpmjvSGoin7q2qFRV9mJKBA5UALRpAp4bwGNdQj2C7XaQLjli3MBYMwHvHSEo1Zkp1rxiT9+uyNwnC/INuIGPuaYxDOkEx3MLSynogibeJAfULgWQ== 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=pPraAZAyHcaLKTBwTZ7QQouQ3LeFC9NmTrgmUmWdDp0=; b=WhTx/pBrN7q4f2/Wq+61KEoYVa9xXfTZkxSXUNc8GUiSBrUp9Xoe4260MBPdfYhyO9FiyHaXtCsSNogy0OpWT04AFVHM6w92p0tEiEKY32cc5LCCaNES03StHaTrQVFYkKNX7tUUweFHZEDePbOQfdpORKcvLa9btWy0fCCVVolbzHvv+MdyGk40EoinDmCmzp8hH114svEJtFIa39mqxGBiz+kZYrQcHWkL+xr++IF8RjETA5D1kti4eNj77Qmt/IoY4mzG8/HF8HBFNPHtfaWVzB7zTZ4557Chv8eKfCKES0jmmnSi6COb0K1zjaBQEhzspkVzD/kxNNt6Gx1Vzg== 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 AS9PR01CA0013.eurprd01.prod.exchangelabs.com (2603:10a6:20b:540::24) by AM4PR08MB2931.eurprd08.prod.outlook.com (2603:10a6:205:9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.10; Fri, 12 Aug 2022 15:33:21 +0000 Received: from AM7EUR03FT038.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:540:cafe::2b) by AS9PR01CA0013.outlook.office365.com (2603:10a6:20b:540::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14 via Frontend Transport; Fri, 12 Aug 2022 15:33:21 +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 AM7EUR03FT038.mail.protection.outlook.com (100.127.140.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.11 via Frontend Transport; Fri, 12 Aug 2022 15:33:21 +0000 Received: ("Tessian outbound 63c09d5d38ac:v123"); Fri, 12 Aug 2022 15:33:21 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c9d98248537acd76 X-CR-MTA-TID: 64aa7808 Received: from 388b98bbb559.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C59274B8-5D5B-41C7-854D-80D45B61F5F0.1; Fri, 12 Aug 2022 15:33:15 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 388b98bbb559.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 12 Aug 2022 15:33:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CtSwwjhxqi2atid3eqUKT9jAswm0kYOplc2AWjCgDlRU1FjQbiKRTwA+akXWiXqN0ADU2wK2xWEffGlb7iIUUVMhSeVqG2jnribmRIqpgfQRyCUwJ++8Q1vtKmH47bxU4SO/OznqLBsDYM3HCujBI9SKoRIdR1EHiaVsSOedyedUtkMyMqO8x2aFPzRLttXEPCnaYGngtZkRcpCTnXNr0zeMTaEkR8hJ7uNcOm4Ngc2JvWTZXjzxaajud8AH6DNHf08iolQogvL79waaZIHzCRlgp8wgYgtcW6Ejw6JkGzA+YR9jvKBTT6QQKp6wMfkgmAuqL0lCjayGqNyb+dKggw== 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=pPraAZAyHcaLKTBwTZ7QQouQ3LeFC9NmTrgmUmWdDp0=; b=g3PjfAoDnTTDjcUxUOIrTjVFrCYYTGBpR231mnOXhR+Wnt7z6aU9fzp+l1JPAx1DRJhaHMWktsjyMBz4hHj1oNqXhmXjysmJ8rHNQg4/HmDJXpseqwmrP3nnhFZbgVqORaQNwdtDftqh495P30HogEYRiJU0YQCIttszlZSIFqrAElSIcWSgD9CNfDpZV6KDkNISfR2IMO+wztw9+w2y1FBzTRMnK+iRLTTzL8ZWseQEPaoQPVQgdpRy9rGPkrvd7n9VZcmWtntl+PNjlv91sdBaZzlqng4MufqeVOqrYSfqPBV71vKCKqojOc0gUSyETzCpIep9+RTY4q9tUsPD0A== 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 DU2PR04CA0223.eurprd04.prod.outlook.com (2603:10a6:10:2b1::18) by PAXPR08MB6751.eurprd08.prod.outlook.com (2603:10a6:102:136::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Fri, 12 Aug 2022 15:33:13 +0000 Received: from DBAEUR03FT052.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b1:cafe::1c) by DU2PR04CA0223.outlook.office365.com (2603:10a6:10:2b1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5525.14 via Frontend Transport; Fri, 12 Aug 2022 15:33:13 +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 DBAEUR03FT052.mail.protection.outlook.com (100.127.142.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5525.11 via Frontend Transport; Fri, 12 Aug 2022 15:33:13 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2507.9; Fri, 12 Aug 2022 15:33:13 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.9; Fri, 12 Aug 2022 15:33:12 +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; Fri, 12 Aug 2022 15:33:12 +0000 From: Andrea Corallo To: Andrea Corallo via Gcc-patches CC: Richard Earnshaw , nd Subject: [PATCH 8/15] arm: Introduce multilibs for PACBTI target feature References: Date: Fri, 12 Aug 2022 17:33:12 +0200 In-Reply-To: (Andrea Corallo via Gcc-patches's message of "Fri, 12 Aug 2022 16:26:49 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 2d4f9b96-14b7-4d77-7e29-08da7c77fd31 X-MS-TrafficTypeDiagnostic: PAXPR08MB6751:EE_|AM7EUR03FT038:EE_|AM4PR08MB2931: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: fNlVbWKZkYmO2Bfg8D98ye5MRz0Or8D73t74pmeLPSufmW7tTsg3vbld9t1ZgqwtGZSNFCtjONtwttvTBorn9rEzHG1LoujJOXDEfw/WyLtODIlIV6l7BTjOnrXvqFmvBtljfwroe73xc4UGfdaLCZ1s8mzPxQZ1Ek6gI84acsy0GOhvJLvmGXFlparORHzB6vAPD/x58U6eiTIqTFv5mSvO9Yoc/4Iu5JSdsbM3WQ7nDlsLUMMXpZo6PSpbyW933hDnIe/2LCm86HV4CVBEYzSICRNgo2+vwOffsA4782AZlV9ZmITKCha+5Y3fn56o0GAog+4YEQ2YAUXJNGzjA2GwmiaRSuENRGyDgWQOcmbijDPIWWQWqJzbq+SGxPbaRvVhXE+lNGmgrTIH6vlG+pmrXOZ8QkdMaIXXA3Nn28k/oViJYsPFPLcDjyhdVWHnRV4KoJhaZdlplcxnrqozxafq2iLNiqUBviGRSRweL6v2wjga/nz3g+f0Fte8Cwyvo+2tEB3nADllQGNh6AITFs0MLi+tJzvV0QKCwkWqNyIgEzVXcz9t4HvksAm+gEpR5YmrEwbBijvTG4IxgrnjpW09TXPn5/9lSucbzt3P+6rjA94+qiDBc3DhtIzYaPomX9xra8vEq1+j6wrKzfmxl409vhvdCIZiMJ1KAg4h5myjDShGonoPuolJTGppBa/PKMs8okQvgeOWvwpxk38/0j6aW4p7oRQvEBAC/lanvBOOB7z/xYQkDCw6IbiOL9i+Q2kxecd2dvWO0ym/4P/O7MMu0ZTYGyWafj1h9HseNUPVa7ZfXXe4J9H7F9g7l/2DRbivWwCrvhWbyGcfFh4jKrNbbKnnYtvZ5VMc9Iu8mX0ilc29fEzcH7A7mDmdPkx7uduKv5gCh97WMI055KmkNg== 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)(39860400002)(376002)(136003)(396003)(346002)(40470700004)(36840700001)(46966006)(336012)(44832011)(478600001)(81166007)(6916009)(54906003)(47076005)(26005)(84970400001)(426003)(40460700003)(70206006)(316002)(86362001)(70586007)(82740400003)(8676002)(356005)(40480700001)(235185007)(4326008)(5660300002)(8936002)(33964004)(36756003)(41300700001)(36860700001)(186003)(2906002)(2616005)(82310400005)(4226005)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6751 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT038.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: b15868c9-e101-40b2-43d8-08da7c77f85b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l2ecNL7FxHzGukOqTL9CHNwdCgzTZ0kAnjITyQiS6IEYZ0MJfcdrcrLQXPGU+yhtaAfIckFjpHyNqyZA5PlgCBFsp7rasVHsGxyVOaRm5eNsiVu9v5fytjBpCLPw0yIZCwW1MJJY54RhcWEPxO5/ykVZ6jdRAeGKj8rCbuCSM1iphZIDDvxClsESKCCDwIH0ZjmJsjt/xLHBD91IfrffbQ57wGs90kjKqf7Eg6ylTkpktY8oV+/Yijp3XeTOb1WU31LOsbsmAIf9n+bC8VN+EZBfLA/mJ8RloSZEH8M51k2m9BjwAeWewJr62PpA39ICsCSzdGXk2/MPGC6di0GiRNwFBhG8MzFC96dS85bSIaSApZbPvhZedEXDUpy9jW/OIfZDRqXeqLAuH2H1/ynRX70pWXalHiECZEqD3pqlV2WjnfbsQEe1ksp3/8tf2p3RfgVuUVk66eKroIwMRv9xByxFvj2K5MwfbHlxXPtzM6IOvyE6oCJMnX5ZlQiEbKLXmgaZllR7vQwY6iIAb/vMKazDMqCzjuwLsSJpe1tZakpptsQRL0eZpB0Ckr49tTBJSKmAvTEJdpgmRNrocaz13HfAGv/4UrKwJcnp5XPyZy5cmeqiCzdZDFISojVfmZ5Slmnm4czy6aF106buEs9YfikgzYJ6pcMpV42DBjqHcfcS2mQjr+gb5Hy5hytImrrakymNXt8e8ZFBjqtd0yjmwdPZS599OYwDPF5sSXAGpZE0gC0NVQ9visoqFIcd4clYxclM9OGFwksYcFw9ut3e3yI1BLYVQZNs0mSIaywPUHksjkV/LofaAIr/z8ceG0cj4kr7Uq9t485Z3vz48Xwyi6txbBqykqa1esM7FjLnOZ4= 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)(396003)(136003)(376002)(346002)(46966006)(40470700004)(36840700001)(40460700003)(36860700001)(336012)(47076005)(82310400005)(426003)(2616005)(186003)(81166007)(40480700001)(478600001)(82740400003)(235185007)(70586007)(316002)(41300700001)(6916009)(70206006)(54906003)(5660300002)(44832011)(2906002)(8936002)(26005)(33964004)(8676002)(84970400001)(4326008)(86362001)(36756003)(4226005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2022 15:33:21.6553 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d4f9b96-14b7-4d77-7e29-08da7c77fd31 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: AM7EUR03FT038.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2931 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, 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-List-Received-Date: Fri, 12 Aug 2022 15:33:26 -0000 --=-=-= Content-Type: text/plain 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 Approved here: 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. --=-=-= Content-Type: text/plain; charset="utf-8" Content-Disposition: attachment; filename="8-15.patch" diff --git a/gcc/config/arm/t-rmprofile b/gcc/config/arm/t-rmprofile index eb321e832f1..fe46a1efa1a 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,13 @@ 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 +97,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" --=-=-=--