From patchwork Fri Apr 8 14:48:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Przemyslaw Wirkus X-Patchwork-Id: 1614947 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=jEVcgCc/; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KZh3J0b2Fz9sFy for ; Sat, 9 Apr 2022 00:49:14 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 602853840C26 for ; Fri, 8 Apr 2022 14:49:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 602853840C26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1649429352; bh=5nwdGgwrB2HGBW2Im7TfAUrsHIA//7Drng5Aq0RbFfg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=jEVcgCc/ZrEurjk6IIPnTJbhyHkqSPf6pBrQgH9dA3V65n1BiUvrIr8ecGNDTSf/z k3CzCWbcETFE7DRLefwLvbIOOCivoDdJ3fB+FkTwObuhHufimcOr0XVoPBGOuW7JRu e0Q1RgWiTWbgKRsFThDL9ZVy0JV/ol0G7gh6Bq1M= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20059.outbound.protection.outlook.com [40.107.2.59]) by sourceware.org (Postfix) with ESMTPS id 606543857C4D for ; Fri, 8 Apr 2022 14:48:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 606543857C4D Received: from DB6PR1001CA0018.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:b7::28) by DB7PR08MB4585.eurprd08.prod.outlook.com (2603:10a6:10:7b::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.22; Fri, 8 Apr 2022 14:48:43 +0000 Received: from DB5EUR03FT056.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:b7:cafe::11) by DB6PR1001CA0018.outlook.office365.com (2603:10a6:4:b7::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.25 via Frontend Transport; Fri, 8 Apr 2022 14:48:43 +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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT056.mail.protection.outlook.com (10.152.21.124) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.21 via Frontend Transport; Fri, 8 Apr 2022 14:48:43 +0000 Received: ("Tessian outbound facaf1373bbd:v118"); Fri, 08 Apr 2022 14:48:43 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5c4877f4bb9e68c8 X-CR-MTA-TID: 64aa7808 Received: from ea6012caa9df.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C8E76C90-A4CB-4F57-8EFE-A26A7517F934.1; Fri, 08 Apr 2022 14:48:33 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id ea6012caa9df.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 08 Apr 2022 14:48:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OYfqvz38wpP4148PFekqGj6fxfNqAWMdIEr+uUPQ0rZY7d/Q5y1FTypBjwctgTkwBflGI7AcW4Wzu5IUYn58jBE8iAxnWXCbPFfSXSTAZa7EDUESDlw6P/gUeghX4zqyn4bXdhV5a9DmwV0hgYtcxCcIPRw0a6Me/Z2kyrNR9GAzpXWwT66QTF7wrsAJDOQx+ZehR98wW744pz52ixK4gdLJKxVrV4smVQhVjTJ0CxJ+mBDMB537LzeE8Ktv2BEQLxTrNk2xpBrb7GuZuIg35dIGioQ0vnaoZQapf4UC0MJAkwh4xbKZFMZJiWxPJPqy7U79DmdVy/4A5ESuGa8b8g== 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=5nwdGgwrB2HGBW2Im7TfAUrsHIA//7Drng5Aq0RbFfg=; b=C7P20kpHCYbEeVyVFKCLK2LlgSRfyKw3AYRtuarDFw2l4IU/1U2ISuTl1i6zfiGZ4Q4MFKsktJyCucgnGfaJKQcaxxVjoUE58r9nruoCezNG5S8Im1ZXvanQRbIdeeqGKqomKiM3fkP/LjQbE2K2U8JP3R4Mm3q8FYMc33mrxdJdYho+WE0XjJBXkn/xdqRm9+/DYTUlHJXapkgKYD4RUREQTRsDDI+GoxBsRJKJDyUUc90acRiAKGq5A4+DhCHaHhFbXqaHap/D1e8dXBr8OXWFMEAEw5eRf+mV1hP3+HVfsjc1pCCAtgeCRcxmRG26M+61tNd7c3jqiiHJbsakZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from HE1PR0801MB1785.eurprd08.prod.outlook.com (2603:10a6:3:81::21) by VI1PR0802MB2559.eurprd08.prod.outlook.com (2603:10a6:800:b4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.22; Fri, 8 Apr 2022 14:48:21 +0000 Received: from HE1PR0801MB1785.eurprd08.prod.outlook.com ([fe80::9115:f63a:3324:b131]) by HE1PR0801MB1785.eurprd08.prod.outlook.com ([fe80::9115:f63a:3324:b131%3]) with mapi id 15.20.5123.031; Fri, 8 Apr 2022 14:48:21 +0000 To: "gcc-patches@gcc.gnu.org" Subject: [PATCH][GCC] arm: remove unnecessary armv9-a multilib variant [PR104144] Thread-Topic: [PATCH][GCC] arm: remove unnecessary armv9-a multilib variant [PR104144] Thread-Index: AQHYS1aZaIFrDP8xLEegn65zy+cOUw== Date: Fri, 8 Apr 2022 14:48:21 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: 28f05465-12ba-a6df-cf18-cdbe3419e086 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-MS-Office365-Filtering-Correlation-Id: ac4b7b41-30f5-4d4f-202f-08da196ee095 x-ms-traffictypediagnostic: VI1PR0802MB2559:EE_|DB5EUR03FT056:EE_|DB7PR08MB4585:EE_ x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr 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: 6s3hnNAtLuHpLrYoaE4wn4dMVxNd+Pv0zhrRqHo8SVx2GK5mn47WBGPlAvXfXihkJzECuL8puYMaUdDgwBi5nAV+CQSPW38fCeCRK4BC84YNn/LNIYqDi3+uL2iLIkqU2ATBmkSYFKwgwzgRpJiSpw6WtLFKXm1wxPFGPUDhKBB1ygN8PR2a5Lu6OTNELv0NMwvwyoKYdQ12X5WF1/sb0P761AfiHbTTf1QTFztBaSMYQnW8/DVs7MLn29eSyEKQcgxyNYKqeGihQePmFEdIhrqrGqQZqDvlnDEo3W1h+xJfzj2u1lHbt2UtQkNU3xDtNm2FqtM9CDYdaCeEXlG2ymrZ7NBXQ82txaq0Sew6/J/Us7uLLisvlQFnqBrIQDnX08l/urmv64kR3QPNMEUCLVx+DtB3hKv/WzUtJbhfxfe7/aA2QMi8+VOCQL+ewCZVelLq9KYp+lypyvaxt1aouu8ueB0Xuz7t+Lv5FlX/82yGbGIgbrXFGRBKJxcRucfHNEC+Ugq8OhCdd0N8tGhfBUEr3sCc0pYwX9kyeNvXTrwjOOOhvpDOmlDfG2bI757/PhFEou3QA/Ud84/36ClZ35wH4384khHM9yEJe+GrKH8lGdkYmZ0PYOtZ1CdvuPf55gtS0hXGKmHIoWzkekxrzMq+seRRGUxMoeTogqIxjunhNx7vTPffoK0fexqzc7nnP9vrjiKWI0bqCh2EWNDNjL3ee0Sazc18/C2n6qhgqPWciG8vICZu+WV3SNxPeuImS7d/84VfRVAp4SwbUx9m92mOmsYqqU/yg4Nwa8GEjZw= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:HE1PR0801MB1785.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(71200400001)(508600001)(84970400001)(122000001)(2906002)(5660300002)(38070700005)(38100700002)(9686003)(316002)(6506007)(7696005)(6916009)(54906003)(86362001)(33656002)(91956017)(66556008)(76116006)(66946007)(66476007)(4326008)(66446008)(83380400001)(64756008)(8676002)(52536014)(8936002)(55016003)(186003)(26005); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2559 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT056.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 3a11cf2f-6ba9-47f5-a8b6-08da196ed3cf X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: upz1HTJhyFId3qbxezsp5Cr2lg4mpu1KOKPo0NPW19qD7sCMNKDmNrpYB9L7dLpY2n86yeXy9wL4NQVRzlL/A6h0F8GG+uj7X3/JrVkgUEqEai9PLCorWqOYCBZRLikB7d8UphzLmsKPE17QSPwrA6xwfU86VGWJgs1otzPYjhY4aswpmcTxyWR1MnnsKR2VsNdum8wa5+HTkEvEIYw8qDLfZnqll6Wal3e3HXRVt9R5iNwbr11WyT9zlHpg3r6rmtwCaLrZJG3X/NFS75GWK7XO+Xtss+eVG/JvQ5q6kvjkndkZU+nIeUOtrhCdSP3nwsW+OONDs+gdXv3ikt6d0GD9yEMjYzrHKuH0Afoa2eE9KcGMmq7JOu+kZIAVGhEU+KsJ5nwbbl9WBqyjSVYIwG3Hr6ufQYCbMXi6WEW+SiFWC5pKSEeGnniboKgpSDuM0aSjrBowr9Kn3oeExIkOOAaTiUIL2pkTTDMQVrYXJV9xxOlRQc2KGQDfV6Nplijm4+3b5lz2TOAgx2goOrT0ftLxUoplNYIBqUSQcvePTP4bYcU7V8QsrmUN1Sef4q9HfSlSMcGUpKxpxLMYZHp9uR2RfokDiapZHo5A+tf0e0shVKxYjy3g8BycUxJRX6cfdXm///BsJND4KUVI8J02ewmkMWjabw17TN9MGN6mYPUNgdZWwt+tozRCJ6WH6hcYPKzQ0bpPAHBCaVTNROxJ//ZrpWww+kiKwrzKtWBuXVhUnwIVnNlLrtmPTFt5EIE42S9X88abPgEZOf++eKGFpQ== 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)(36840700001)(46966006)(40470700004)(54906003)(2906002)(356005)(6916009)(81166007)(316002)(70586007)(86362001)(55016003)(36860700001)(82310400005)(47076005)(40460700003)(508600001)(186003)(26005)(5660300002)(8936002)(83380400001)(84970400001)(70206006)(52536014)(4326008)(336012)(8676002)(33656002)(6506007)(7696005)(9686003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Apr 2022 14:48:43.1156 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac4b7b41-30f5-4d4f-202f-08da196ee095 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: DB5EUR03FT056.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB4585 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_LOTSOFHASH, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Przemyslaw Wirkus via Gcc-patches From: Przemyslaw Wirkus Reply-To: Przemyslaw Wirkus Cc: Richard Earnshaw , Ramana Radhakrishnan Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi, This patch is removing unnecessary armv9-a multilib variant which was introduced in commit 32ba7860ccaddd5219e6dae94a3d0653e124c9dd (add armv9-a architecture to -march). Now armv9-a(+simd) multilibs point to already existing armv8-a(+simd) ones as there are no changes between the two. Users will no longer require Binutils supporting `armv9-a` to build toolchain. See multilib print below as well: $ for v in {7..9} do ./arm-gcc -march=armv$v-a test.c --specs=rdimon.specs -print-multi-directory done thumb/v7-a/nofp thumb/v8-a/nofp thumb/v8-a/nofp Regtested on arm-none-eabi cross and no issues. OK to install? PS: If approved can I ask for someone to commit in my name pretty please? gcc/ChangeLog: PR target/PR104144 * config/arm/t-aprofile: Remove armv9-a multilib. * config/arm/t-multilib: Remove armv9-a multilib. gcc/testsuite/ChangeLog: PR target/PR104144 * gcc.target/arm/multilib.exp: Updated tests. diff --git a/gcc/config/arm/t-aprofile b/gcc/config/arm/t-aprofile index 574951c5f0bcd6fe1a60b6b2421ae0970a4c0e48..fe2ec88d92de55813816deabd9da461c86c6c7e3 100644 --- a/gcc/config/arm/t-aprofile +++ b/gcc/config/arm/t-aprofile @@ -26,8 +26,8 @@ # Arch and FPU variants to build libraries with -MULTI_ARCH_OPTS_A = march=armv7-a/march=armv7-a+fp/march=armv7-a+simd/march=armv7ve+simd/march=armv8-a/march=armv8-a+simd/march=armv9-a/march=armv9-a+simd -MULTI_ARCH_DIRS_A = v7-a v7-a+fp v7-a+simd v7ve+simd v8-a v8-a+simd v9-a v9-a+simd +MULTI_ARCH_OPTS_A = march=armv7-a/march=armv7-a+fp/march=armv7-a+simd/march=armv7ve+simd/march=armv8-a/march=armv8-a+simd +MULTI_ARCH_DIRS_A = v7-a v7-a+fp v7-a+simd v7ve+simd v8-a v8-a+simd # ARMv7-A - build nofp, fp-d16 and SIMD variants @@ -46,11 +46,6 @@ MULTILIB_REQUIRED += mthumb/march=armv8-a/mfloat-abi=soft MULTILIB_REQUIRED += mthumb/march=armv8-a+simd/mfloat-abi=hard MULTILIB_REQUIRED += mthumb/march=armv8-a+simd/mfloat-abi=softfp -# Armv9-A - build nofp and SIMD variants. -MULTILIB_REQUIRED += mthumb/march=armv9-a/mfloat-abi=soft -MULTILIB_REQUIRED += mthumb/march=armv9-a+simd/mfloat-abi=hard -MULTILIB_REQUIRED += mthumb/march=armv9-a+simd/mfloat-abi=softfp - # Matches # Arch Matches @@ -135,14 +130,12 @@ MULTILIB_MATCHES += $(foreach ARCH, $(v8_6_a_simd_variants), \ march?armv8-a+simd=march?armv8.6-a$(ARCH)) # Armv9 without SIMD: map down to base architecture -MULTILIB_MATCHES += $(foreach ARCH, $(v9_a_nosimd_variants), \ - march?armv9-a=march?armv9-a$(ARCH)) +MULTILIB_MATCHES += march?armv8-a=march?armv9-a +# No variants without SIMD. # Armv9 with SIMD: map down to base arch + simd -MULTILIB_MATCHES += march?armv9-a+simd=march?armv9-a+crc+simd \ - $(foreach ARCH, $(filter-out +simd, $(v9_a_simd_variants)), \ - march?armv9-a+simd=march?armv9-a$(ARCH) \ - march?armv9-a+simd=march?armv9-a+crc$(ARCH)) +MULTILIB_MATCHES += $(foreach ARCH, $(v9_a_simd_variants), \ + march?armv8-a+simd=march?armv9-a$(ARCH)) # Use Thumb libraries for everything. @@ -150,13 +143,11 @@ MULTILIB_REUSE += mthumb/march.armv7-a/mfloat-abi.soft=marm/march.armv7-a/mfloa MULTILIB_REUSE += mthumb/march.armv8-a/mfloat-abi.soft=marm/march.armv8-a/mfloat-abi.soft -MULTILIB_REUSE += mthumb/march.armv9-a/mfloat-abi.soft=marm/march.armv9-a/mfloat-abi.soft - MULTILIB_REUSE += $(foreach ABI, hard softfp, \ - $(foreach ARCH, armv7-a+fp armv7-a+simd armv7ve+simd armv8-a+simd armv9-a+simd, \ + $(foreach ARCH, armv7-a+fp armv7-a+simd armv7ve+simd armv8-a+simd, \ mthumb/march.$(ARCH)/mfloat-abi.$(ABI)=marm/march.$(ARCH)/mfloat-abi.$(ABI))) # Softfp but no FP, use the soft-float libraries. MULTILIB_REUSE += $(foreach MODE, arm thumb, \ - $(foreach ARCH, armv7-a armv8-a armv9-a, \ + $(foreach ARCH, armv7-a armv8-a, \ mthumb/march.$(ARCH)/mfloat-abi.soft=m$(MODE)/march.$(ARCH)/mfloat-abi.softfp)) diff --git a/gcc/config/arm/t-multilib b/gcc/config/arm/t-multilib index ea258b1c21091ec1d5ae671aa4cd014ce3a3952c..6bb58d39ea90f717218b7e4fa5671c65a764ffc7 100644 --- a/gcc/config/arm/t-multilib +++ b/gcc/config/arm/t-multilib @@ -78,7 +78,6 @@ v8_4_a_simd_variants := $(call all_feat_combs, simd fp16 crypto i8mm bf16) v8_5_a_simd_variants := $(call all_feat_combs, simd fp16 crypto i8mm bf16) v8_6_a_simd_variants := $(call all_feat_combs, simd fp16 crypto i8mm bf16) v8_r_nosimd_variants := +crc -v9_a_nosimd_variants := +crc v9_a_simd_variants := $(call all_feat_combs, simd fp16 crypto i8mm bf16) ifneq (,$(HAS_APROFILE)) @@ -206,14 +205,10 @@ MULTILIB_MATCHES += $(foreach ARCH, $(v8_6_a_simd_variants), \ # Armv9 MULTILIB_MATCHES += march?armv7=march?armv9-a -MULTILIB_MATCHES += $(foreach ARCH, $(v9_a_nosimd_variants), \ - march?armv7=march?armv9-a$(ARCH)) # Armv9 with SIMD -MULTILIB_MATCHES += march?armv7+fp=march?armv9-a+crc+simd \ - $(foreach ARCH, $(v9_a_simd_variants), \ - march?armv7+fp=march?armv9-a$(ARCH) \ - march?armv7+fp=march?armv9-a+crc$(ARCH)) +MULTILIB_MATCHES += $(foreach ARCH, $(v9_a_simd_variants), \ + march?armv7+fp=march?armv9-a$(ARCH)) endif # Not APROFILE. # Use Thumb libraries for everything. diff --git a/gcc/testsuite/gcc.target/arm/multilib.exp b/gcc/testsuite/gcc.target/arm/multilib.exp index ddbb443931496cb2185f6aa9b337b37cd70b5a1f..2fa648c61dafebb663969198bf7849400a7547f6 100644 --- a/gcc/testsuite/gcc.target/arm/multilib.exp +++ b/gcc/testsuite/gcc.target/arm/multilib.exp @@ -135,14 +135,17 @@ if {[multilib_config "aprofile"] } { {-march=armv8.6-a+simd+fp16 -mfloat-abi=softfp} "thumb/v8-a+simd/softfp" {-march=armv8.6-a+simd+fp16+nofp -mfloat-abi=softfp} "thumb/v8-a/nofp" {-march=armv8.6-a+simd+nofp+fp16 -mfloat-abi=softfp} "thumb/v8-a+simd/softfp" - {-march=armv9-a+crypto -mfloat-abi=soft} "thumb/v9-a/nofp" - {-march=armv9-a+simd+crypto -mfloat-abi=softfp} "thumb/v9-a+simd/softfp" - {-march=armv9-a+simd+crypto+nofp -mfloat-abi=softfp} "thumb/v9-a/nofp" - {-march=armv9-a+simd+nofp+crypto -mfloat-abi=softfp} "thumb/v9-a+simd/softfp" - {-march=armv9-a+fp16 -mfloat-abi=soft} "thumb/v9-a/nofp" - {-march=armv9-a+simd+fp16 -mfloat-abi=softfp} "thumb/v9-a+simd/softfp" - {-march=armv9-a+simd+fp16+nofp -mfloat-abi=softfp} "thumb/v9-a/nofp" - {-march=armv9-a+simd+nofp+fp16 -mfloat-abi=softfp} "thumb/v9-a+simd/softfp" + {-march=armv9-a+crypto -mfloat-abi=soft} "thumb/v8-a/nofp" + {-march=armv9-a+simd+crypto -mfloat-abi=softfp} "thumb/v8-a+simd/softfp" + {-march=armv9-a+simd+crypto+nofp -mfloat-abi=softfp} "thumb/v8-a/nofp" + {-march=armv9-a+simd+nofp+crypto -mfloat-abi=softfp} "thumb/v8-a+simd/softfp" + {-march=armv9-a+fp16 -mfloat-abi=soft} "thumb/v8-a/nofp" + {-march=armv9-a+simd+fp16 -mfloat-abi=softfp} "thumb/v8-a+simd/softfp" + {-march=armv9-a+simd+fp16+nofp -mfloat-abi=softfp} "thumb/v8-a/nofp" + {-march=armv9-a+simd+nofp+fp16 -mfloat-abi=softfp} "thumb/v8-a+simd/softfp" + {-march=armv9-a+simd -mfpu=auto -mfloat-abi=hard} "thumb/v8-a+simd/hard" + {-march=armv9-a+simd -mfpu=auto -mfloat-abi=hard -marm} "thumb/v8-a+simd/hard" + {-march=armv9-a+simd -mfpu=auto -mfloat-abi=hard -mthumb} "thumb/v8-a+simd/hard" {-mcpu=cortex-a53+crypto -mfloat-abi=hard} "thumb/v8-a+simd/hard" {-mcpu=cortex-a53+nofp -mfloat-abi=softfp} "thumb/v8-a/nofp" {-march=armv8-a+crc -mfloat-abi=hard -mfpu=vfp} "thumb/v8-a+simd/hard"