From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70083.outbound.protection.outlook.com [40.107.7.83]) by sourceware.org (Postfix) with ESMTPS id B8A013885502 for ; Wed, 3 Aug 2022 15:35:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B8A013885502 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=lgqssHkUOahb6ORQQXBrLt63XElzPcCn/OD93ikLsO+Ob49+Jj0ZeOQCfdCE0by4sLCl+h7TDivASo4PRqFeHAR+GuLWZQ5Iw2wiqLL1HXKlVRfxyDarAnged1J87icYtdRulWma9DXlQEMhUaj4OdTOmKqc8e8+XSqwOB1AWeMa1lNm8160SNSKIt9e0o4ymKAcwGCLS8+MTVc+aZV6d0EFJMcPoBiVlSEY7STrWfs1e6KkFiacKk1cSVsSyuqN7dh051ofENPCkdaOUDAavEcEU4O2jjUfIKL7FYk5E8TEwYAV+kEXnn4pVMU/9Vp28S2KqdBuc2dYE6MIoRjFxw== 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=omKvsFizMJm7FJ2vFSsDpyw/C7oPqBqZwZU4PHZ1ZqM=; b=W09qRbiZOcpuqX/+TAV/4CO/WhWvUZBrhN+3y4utszvnuOylpgYL/TpewDeoyWFSmCcWDqGcbmWK1Euo2VqrZVebQjCjXzNc2XHXuhYfsMoe7sNfJbAu7GokwWhGjbJvzBCZTEy354GMaZ59P3TTMYzimKEO/ov8h7UH77eYPzQIWKoI8Mr9K1Dw47LP66hliQqIDqP+mFqQeAZBqqriwSa9hqZbjp1ItDBLK9bUiDjYo4HQ3Fqo/VOnuZNQ4fmdS9rBPjevXhUlcIHlm0iwT0eNXRTnuHTLU/SMzeuxiXIIgTQr6biTP6xBUNE8U6aSwknNKyMg3KKswZtzZswr3g== 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]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=omKvsFizMJm7FJ2vFSsDpyw/C7oPqBqZwZU4PHZ1ZqM=; b=ODuuRArNTOJrEmnTB8w/d00Abi3A3O8c7jvYmpcBlM2Q3XcBvlcspBd+b93ICX/X3wKHHwZIUNrUWl+5pCxJYSZosZOX4fbsf96zshfEihws5y/TPX8Rd4JwqlRoSiUKKh1V+UmwCFaj98Q+uozr6lPDQ9fGrjbsY9/qhiEbcRc= Received: from DB6PR0301CA0028.eurprd03.prod.outlook.com (2603:10a6:4:3e::38) by VI1PR0801MB1933.eurprd08.prod.outlook.com (2603:10a6:800:8d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12; Wed, 3 Aug 2022 15:35:47 +0000 Received: from DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:3e:cafe::9a) by DB6PR0301CA0028.outlook.office365.com (2603:10a6:4:3e::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14 via Frontend Transport; Wed, 3 Aug 2022 15:35:46 +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 DBAEUR03FT026.mail.protection.outlook.com (100.127.142.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5482.12 via Frontend Transport; Wed, 3 Aug 2022 15:35:46 +0000 Received: ("Tessian outbound 63c09d5d38ac:v123"); Wed, 03 Aug 2022 15:35:46 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: dd25a89470210be2 X-CR-MTA-TID: 64aa7808 Received: from 86e7008c277a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A6CA1057-1981-49F8-ACE1-E434260027F9.1; Wed, 03 Aug 2022 15:35:40 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 86e7008c277a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Aug 2022 15:35:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NL4rXSULugIsSdgJQ022n1imTn5ikDdf8ThPzxiSSPb+wFvKrVCEEuKouY4f6UnoWmgT91NGBDbnfXRv0SiGxD2ZWwV7NlIVybtfRCwp19ydv9gAMdeYuVjho5i1h10UgwDRQPw+RlDibCKVrzkPeQb6IU+3Lnq/IPVMwc2BjVGTTkVm8v8Hpa3lCWF/0MXM2xh0ILrTezdAuFuIZOzOTqjQjyA6MRiFoZNIFsHB7dYZPxIUoWFEJjY00TQ8SrvbQl6tDRaGfwOtljiXsu4x1wgPU17pdew8litb38Imi/QabEdSOijbH/p3nRPDHvUBLAjovHAD+/ITdY4+VuBPqA== 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=omKvsFizMJm7FJ2vFSsDpyw/C7oPqBqZwZU4PHZ1ZqM=; b=PoVii37gUQhLWAP2bJbvMp3pmDrSUDmjPsgmrGnUtG/F9UaEUvPWP5UVg4Sn3M7RMHyS3aUkl2dNKETe7yYlloYp7iweHeGhMUfWV0eII5FvPmAsoQqjfSA0Rag2c0V45/vUGenwlfUbMOyZTAluK+IjzIxZAnQq1qZRUDL+ApcfpetkttcJqT4bWPmYs6VLWQUyLEKGgejgBbm8MBGrkqAOCgMCdM5kGkqN3zBPFuytOQTKekQBVLvsTdo7Im5ToDdprHUn4Sdlqix1aT2l9/Lg8JknMvDWTTKD4mhGNbcBpN+bKcszQqeCb9YnuVSF24jrUBpenSy83ELYJlpCdw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=omKvsFizMJm7FJ2vFSsDpyw/C7oPqBqZwZU4PHZ1ZqM=; b=ODuuRArNTOJrEmnTB8w/d00Abi3A3O8c7jvYmpcBlM2Q3XcBvlcspBd+b93ICX/X3wKHHwZIUNrUWl+5pCxJYSZosZOX4fbsf96zshfEihws5y/TPX8Rd4JwqlRoSiUKKh1V+UmwCFaj98Q+uozr6lPDQ9fGrjbsY9/qhiEbcRc= Received: from AS9PR0301CA0038.eurprd03.prod.outlook.com (2603:10a6:20b:469::9) by VI1PR08MB2830.eurprd08.prod.outlook.com (2603:10a6:802:24::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14; Wed, 3 Aug 2022 15:35:37 +0000 Received: from AM5EUR03FT020.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:469:cafe::9) by AS9PR0301CA0038.outlook.office365.com (2603:10a6:20b:469::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.14 via Frontend Transport; Wed, 3 Aug 2022 15:35:37 +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 AM5EUR03FT020.mail.protection.outlook.com (10.152.16.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5482.12 via Frontend Transport; Wed, 3 Aug 2022 15:35:37 +0000 Received: from AZ-NEU-EX01.Emea.Arm.com (10.251.26.4) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2507.9; Wed, 3 Aug 2022 15:35:33 +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; Wed, 3 Aug 2022 15:35:32 +0000 Received: from e125768.cambridge.arm.com (10.2.78.50) by mail.arm.com (10.251.24.32) with Microsoft SMTP Server id 15.1.2507.9 via Frontend Transport; Wed, 3 Aug 2022 15:35:32 +0000 From: Victor Do Nascimento To: CC: , Victor Do Nascimento Subject: [PATCH v2 3/8] newlib: libc: strlen M-profile PACBTI-enablement Date: Wed, 3 Aug 2022 16:35:19 +0100 Message-ID: <20220803153524.20631-4-victor.donascimento@arm.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220803153524.20631-1-victor.donascimento@arm.com> References: <20220803153524.20631-1-victor.donascimento@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: ad5154b2-b6af-4336-2b58-08da7565d604 X-MS-TrafficTypeDiagnostic: VI1PR08MB2830:EE_|DBAEUR03FT026:EE_|VI1PR0801MB1933: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: 2/axnjfZgK4BB/BQhJjK6AEpcc5DFxfG/L6dH/9Y2mgbEO5jEiPNQ5OXUEZ5oukUUVyYkVCb+g3SQYHHBpRLjIAvRVRsDmtQHF0YlxOnjcMDeOJp6NpUuLHVucYF3L9kVrmfhOkR5Mo0hYyjM0D/AoOviUg9SUKj9kxfmlDxHChkdaSJLIP5ILe1/exnxzaVZBKAj9DiFX67BScI8rcPeYdN1dI6YFsV2np0k7YfUvGpq2/Ov3tENPALmr/ZfxlEBX91/kxoFusAoEWT9pAS97xtzuk3co07grPkBwWm4rC55eZAOmbzvBcLgVyL3+zefhSbzLFyUUnePPUZtPheDM5+dxK5YHfMrTkrB7Ch2An5xu0Dkiort95kW/y7LotfiMkmSllJS52PojBQDs1LZ2IzNlJlfGAaeez955DHKhMm6sNx+GmzF6TendHbQlQxoZXxOYlAbmCpg0tG6bm1BPir3qltJBeBMxF2bGA/IuzQj36/QCWbAUZtMNYzqEDHzzSDYgbymR8eZTVDXus0XD45XPYqt8TnTc4+PSRbHcdrkS1mcAG32ynvTo6evE10/WU9HYaS35M6S1Llp1A0F2A3KrPjulAzcC3JsZdgDvYtcLqJzv9s1x2ePc4uM2TDbVwbC4aYEaA4d/seYuXrPjwYQxOhrkWsnNM6efBH+cx1CES45cBHxircgXHIvH15vma6hI4LZJQtEOWvv+SLNcWc6MB9b1RVMSnOqhhtItq8SKhwlNhkCq+pXKLmz9qGLPDTwDFeYHubWsXU2tJDz5r8DQrH1+V6zts2F/QpX4frMin8qhpItyUriVprBoOWuffXLPPD0o5FCbHibrsQnq1gOm5VMuoem9IXePpyJfaYq1/j7emdAnHUuApL5GXc 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)(376002)(396003)(39860400002)(346002)(136003)(40470700004)(46966006)(36840700001)(36860700001)(83380400001)(47076005)(2616005)(1076003)(186003)(426003)(336012)(82310400005)(7696005)(81166007)(40480700001)(36756003)(356005)(26005)(82740400003)(316002)(40460700003)(6916009)(6666004)(41300700001)(19627235002)(2906002)(5660300002)(8676002)(54906003)(86362001)(8936002)(4326008)(70586007)(70206006)(478600001)(36900700001)(357404004); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2830 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c4eb8f24-cc6c-49c0-32fa-08da7565d03a X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4u/lQGr70gp5YpQi3a0Ui0crh0HhsMSUo0wvwq79QGgZqzUMTX1Y/UVskWtqBd90chrCQiLA9DA7k79Uz1LTqxC8bjg6HZFHvq5UIwaP7Um49jkIe+ToDGL77eWTGvtSjddaBfEIKcnevIqwlqYyPJJfqmUQTtPLssWyu3YnEdbdmOjb+xUxH1P4+huwp5qSVM8GUjGHk/h8+FH4EsbW25ph70G3i52mSU4+krMbeFIpqBE2IxP07rYU1BXAdQku2RSe7kbHg0eMm29ytlbIVWfLqtKteM92Gh/ZIgGizTRuy+1q/3LIgAU7IUGd+GAFNQWmyaDlkPYIUdiCJB64O+NtCA//1q7I7erWajaySUcBhtqdJ2v9KNE17X6G/0r9Af0UdgOg0eG3K9wO5qa/TqG+3ZQy9XZhcwRr9Z3XkBGqzFtqdTNbNvLQEjfpJcFOIoAGxqMLtAXrYg1fZm/GmPhmprFL1FHCLoIzg8R2vKRoe6ieYlBlzwvlYdVLABEcS9CjULGa0y8+JXL8vQWcKoduez6vPtz5CKnPeNbMCm9D2lZQW3zN/ZT/bUm8u6ob9isxkWPJw8Kb5L4p23S+l8CtGLcU8REJQIsqc2CeaTIX80hY8+aRCytfWlIYxTD7f1F9Y0Ygn2OfxIFFejdzE97xLwfCm7GKsFrLO//rVjlBGy1khfTKuhPxGTV3sLFo87wyJ0ys0T9bjWvs2V6RAOUaiuEREE3wUw1YStU/z1g10yMD7v0ArgSJ3kkC+ciSrYJf1jA9lu9rcwNbbluONFT+YBk+s3rrJ1SGJW7pnswHUujTkruPycIGt+B5ADKFz6ApvAbdGXfVNZPkOmS3Kw== 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)(376002)(136003)(346002)(40470700004)(46966006)(36840700001)(36756003)(83380400001)(8676002)(4326008)(8936002)(70586007)(81166007)(5660300002)(40460700003)(36860700001)(86362001)(2906002)(2616005)(336012)(426003)(19627235002)(186003)(70206006)(316002)(40480700001)(47076005)(54906003)(6916009)(1076003)(82740400003)(82310400005)(478600001)(41300700001)(26005)(6666004)(7696005)(357404004); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2022 15:35:46.8934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad5154b2-b6af-4336-2b58-08da7565d604 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: DBAEUR03FT026.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1933 X-Spam-Status: No, score=-13.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, 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: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2022 15:35:52 -0000 Add function prologue/epilogue to conditionally add BTI landing pads and/or PAC code generation & authentication instructions depending on compilation flags. This patch enables PACBTI for all relevant variants of strlen: * Newlib for armv8.1-m.main+pacbti * Newlib for armv8.1-m.main+pacbti+mve * Newlib-nano --- newlib/libc/machine/arm/strlen-armv7.S | 53 ++++++++++++++++++++-- newlib/libc/machine/arm/strlen-thumb2-Os.S | 13 ++++-- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/newlib/libc/machine/arm/strlen-armv7.S b/newlib/libc/machine/arm/strlen-armv7.S index f3dda0d60..0492800f9 100644 --- a/newlib/libc/machine/arm/strlen-armv7.S +++ b/newlib/libc/machine/arm/strlen-armv7.S @@ -59,6 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "acle-compat.h" +#include "pacbti.h" .macro def_fn f p2align=0 .text @@ -78,7 +79,11 @@ /* This code requires Thumb. */ #if __ARM_ARCH_PROFILE == 'M' +#if __ARM_ARCH >= 8 + /* keep config inherited from -march=. */ +#else .arch armv7e-m +#endif /* if __ARM_ARCH >= 8 */ #else .arch armv6t2 #endif @@ -100,8 +105,35 @@ #define tmp2 r5 def_fn strlen p2align=6 + .fnstart + .cfi_startproc + /* common pacbti_prologue macro from pacbti.h not used. + handwritten prologue saves one push instruction. */ +#if __HAVE_PAC_LEAF +#if __ARM_FEATURE_BTI_DEFAULT + pacbti ip, lr, sp +#else + pac ip, lr, sp +#endif /* __ARM_FEATURE_BTI_DEFAULT */ + .cfi_register 143, 12 + push {r4, r5, ip} + .save {r4, r5, ra_auth_code} + .cfi_def_cfa_offset 12 + .cfi_offset 143, -4 + .cfi_offset 5, -8 + .cfi_offset 4, -12 + +#else +#if __ARM_FEATURE_BTI_DEFAULT + bti +#endif /* __ARM_FEATURE_BTI_DEFAULT */ + push {r4, r5} + .save {r4, r5} + .cfi_def_cfa_offset 8 + .cfi_offset 5, -4 + .cfi_offset 4, -8 +#endif /* __HAVE_PAC_LEAF */ pld [srcin, #0] - strd r4, r5, [sp, #-8]! bic src, srcin, #7 mvn const_m1, #0 ands tmp1, srcin, #7 /* (8 - bytes) to alignment. */ @@ -159,9 +191,22 @@ def_fn strlen p2align=6 rev data1a, data1a #endif clz data1a, data1a - ldrd r4, r5, [sp], #8 add result, result, data1a, lsr #3 /* Bits -> Bytes. */ - bx lr +#if __HAVE_PAC_LEAF + pop {r4, r5, ip} + .cfi_restore 4 + .cfi_restore 5 + .cfi_restore 143 + .cfi_def_cfa_offset 0 + aut ip, lr, sp +#else + ldrd r4, r5, [sp], #8 + .cfi_restore 4 + .cfi_restore 5 + .cfi_def_cfa_offset 0 +#endif /* __HAVE_PAC_LEAF */ + bx lr + .Lmisaligned8: ldrd data1a, data1b, [src] @@ -177,4 +222,6 @@ def_fn strlen p2align=6 movne data1a, const_m1 mov const_0, #0 b .Lstart_realigned + .cfi_endproc + .fnend .size strlen, . - strlen diff --git a/newlib/libc/machine/arm/strlen-thumb2-Os.S b/newlib/libc/machine/arm/strlen-thumb2-Os.S index 961f41a0a..571068dac 100644 --- a/newlib/libc/machine/arm/strlen-thumb2-Os.S +++ b/newlib/libc/machine/arm/strlen-thumb2-Os.S @@ -25,6 +25,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "acle-compat.h" +#include "pacbti.h" .macro def_fn f p2align=0 .text @@ -33,8 +34,9 @@ .type \f, %function \f: .endm - -#if __ARM_ARCH_ISA_THUMB >= 2 && __ARM_ARCH >= 7 +#if __ARM_ARCH_PROFILE == 'M' && __ARM_ARCH >= 8 + /* keep config inherited from -march=. */ +#elif __ARM_ARCH_ISA_THUMB >= 2 && __ARM_ARCH >= 7 .arch armv7 #else .arch armv6t2 @@ -44,11 +46,16 @@ .syntax unified def_fn strlen p2align=1 + .fnstart + .cfi_startproc + pacbti_prologue mov r3, r0 1: ldrb.w r2, [r3], #1 cmp r2, #0 bne 1b subs r0, r3, r0 subs r0, #1 - bx lr + pacbti_epilogue + .cfi_endproc + .fnend .size strlen, . - strlen -- 2.36.1