From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-eopbgr50072.outbound.protection.outlook.com [40.107.5.72]) by sourceware.org (Postfix) with ESMTPS id D17A2388302A for ; Wed, 3 Aug 2022 15:35:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D17A2388302A 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=L5ysDCjO9Fm7xK5r2CQEWj3CP7uUnKTAF6fioLstKzWsdRlOq2tJnGuXhgTlSlnT890MzrZiJRsANakRBES/L+8D2MgCF2jmLq7Eh2fEh2gEVE3EudZFM3ArdiqVri+OQg+xHdPXan7y13fsl0D+neelQbbBujkJk+8pWIcLWpCKaqJe75UDwkVQqxtdyESfI/GXhpvG6kvBDUfcVP3YYAUc0RMvaJAV1OOXTdNPqOdC2PfrYk7rIoICeYtW3IupixwdIm1ATdp8ID+J9nGTvlDV7kF4ucIP/+4mhe2gFtdTpoWpj0B5Pfj/gAkL/DU5BTAK7efMcbwl88a69CUxPg== 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=zlhY4vIpAvrm/SjfRYrntZFYQtD/Q9/beugKC+YNijo=; b=AMItop1FT5KHs6mcST8nDxma4hpOKALVK9uaxwW56vSNNaznwirad2DecEwZw+G9ralwVv+zhoNoGQrreyr4CM+H3KMs/qRWGQgAloioIGBGtXM+hgOv9MdmgHad6qFQcrUJi+garseKVa1/Oad0E3jaVwT4zU+2t4lVG9h1eq7mDN5+Eenm+MPAOFp8j0lVopBS6IbQMmH4pMNUENxYxZXdl2jNooxuzBzRA3N5O35vEEkVqcyCfoNlLbQoOH56FFmXoc/St8tkWmdWTN/+ygoV1WUOLd+CXGLjyukzoB70g31eA+WkD+ep2v8Yu78t7+23fWPqubN8+SsuLP68PQ== 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=zlhY4vIpAvrm/SjfRYrntZFYQtD/Q9/beugKC+YNijo=; b=RH9gKrKJGptYvpuy408W/YH2/mo5RXRD1Z2pGLkoHGUyP1xy3iio0rd97qBMBlemNZgB4xFitJLrPJSUY2iVEy/SYX3lfF3yZLLRxdvNkRs5DS+xFX9vZDp8Gq67xG+YAFAA5gWCOYeHGsssHlhNZor3zjxs2zMRmU8woNvqG2Y= Received: from AM6PR04CA0014.eurprd04.prod.outlook.com (2603:10a6:20b:92::27) by AS8PR08MB7249.eurprd08.prod.outlook.com (2603:10a6:20b:340::20) 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:47 +0000 Received: from AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:92:cafe::23) by AM6PR04CA0014.outlook.office365.com (2603:10a6:20b:92::27) 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:47 +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 AM5EUR03FT049.mail.protection.outlook.com (10.152.17.130) 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:47 +0000 Received: ("Tessian outbound fccf984e7173:v123"); Wed, 03 Aug 2022 15:35:46 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 4e8b84d2a3ae8e1d X-CR-MTA-TID: 64aa7808 Received: from 90b08c563081.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A47AC6CB-A8B4-4950-97B8-D3439334469B.1; Wed, 03 Aug 2022 15:35:39 +0000 Received: from EUR03-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 90b08c563081.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Wed, 03 Aug 2022 15:35:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TtgNLRsc1+Y0rocgm3N5KcYhUmY3fDE4Pmevu4Qdzi3aHXCwuQvs47uA/b7lbKK93yYMzJzu48sey0tevdgsithnbkkM/SqKGjRHvsv07bYECT/ZLU+iDOyXdaDZKwuHq3qlYEplNz7tcDpXfVV10AWpOA1Prb1g5chFQ9jdoWQ8gESP/C8Y9fNSI9eiG2RdgtTtxilB/FFjk5bcwNGesx98KzG0MDgCGmDRpQ3GpBEyjRANKi9NQbiOj7dBKM1WLibFgR4s0J7hQAsO0v5VU8qKz82Hg7z0l9URULL+eIWxzjDckLKTQiAr1SUBqXt7JmyXDPDN6onoszbAGHVzNw== 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=zlhY4vIpAvrm/SjfRYrntZFYQtD/Q9/beugKC+YNijo=; b=R2l8MLtWi6IfieBAKSGA5Q3UhX0x5oqodJ0/8FcXRE+vCRgYU/4dHTbXQQNz/r2sxdEVlL5ktEFCTAFE4bDkSU1qZ+SKvcfAo8gR4TO6FiGIMoATfrUqBayCOJe+zE3zjB6bUgYOdsFPkjPTWDy7HHqjmUskbmk+cEXlqtuqsJWu9v0Ra9tp9k45pqrKQJz9xhnknyTMUJ5IukuQQs4w9839ZD0Jr/6S8ZsxgGPaURm98X8HSeMwTtbag2lZ3EhBWd9oD0IAKglFk1KBndhy8zvpjJHob3Rk7sZ5eCvpRmQVAZLoO8xym9e1JLo76YvUaXAvpxNQ/3ED3AnhOavnfA== 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=zlhY4vIpAvrm/SjfRYrntZFYQtD/Q9/beugKC+YNijo=; b=RH9gKrKJGptYvpuy408W/YH2/mo5RXRD1Z2pGLkoHGUyP1xy3iio0rd97qBMBlemNZgB4xFitJLrPJSUY2iVEy/SYX3lfF3yZLLRxdvNkRs5DS+xFX9vZDp8Gq67xG+YAFAA5gWCOYeHGsssHlhNZor3zjxs2zMRmU8woNvqG2Y= Received: from AS9PR0301CA0037.eurprd03.prod.outlook.com (2603:10a6:20b:469::22) by PAXPR08MB6574.eurprd08.prod.outlook.com (2603:10a6:102:12d::20) 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::ab) by AS9PR0301CA0037.outlook.office365.com (2603:10a6:20b:469::22) 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:36 +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:36 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) by AZ-NEU-EX04.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; Wed, 3 Aug 2022 15:35:33 +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 4/8] newlib: libc: memchr M-profile PACBTI-enablement Date: Wed, 3 Aug 2022 16:35:20 +0100 Message-ID: <20220803153524.20631-5-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: 3abbb944-a6a6-4d58-809d-08da7565d62d X-MS-TrafficTypeDiagnostic: PAXPR08MB6574:EE_|AM5EUR03FT049:EE_|AS8PR08MB7249: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: nPd8nUL3UhZ/K/SCx6tl9Js5D/XKdkOPl5qP07qjMtSC6ePvYn3oIOzCvkBMHy9beTi8ViHFfdAuXc12Qi6JYlH4l5a4/P4CMfsIY3crvKobYf90zNItUMJDlQuZJkZQiVx7k6nkha8dut+5qrS/qnb1MkzCDSIMKrNg3vud49DJ3I0e+ojr/1GJfP1nenm2o/H3/a4Ci2YhK0bcC3SB8yxFC1yOdCvvkZK6o6wBpEvizyugDsFojNTldN82scYWFiXNup8KXTzTvB8qmHDLJJW9IOtt3CIL9MRqVckGHhMW6BSN6SE13CD9LdoPhN5aOpYD4iMQ+Vvh+cEW9I9CS3KGHMx30mN/vlrHNQRFrf7XA+8oS/+puwssyPOw8wz92DwntvnyySDSAIe3m0jGAFG48Z+4D8JTNUQucn1NzjWmv6fiysER6z9xTj07fqTRxIrQGQ/lcx9Qmv22BjzOikkDSG4PMOnU+PDqs5yO24wJYfQ10BMSV6bk8gYs5aqc20qcAJcsWYAjEE5vek+eGCWVm+Sv+zX0iMMF+dmJ965XnwdlaLhxpaD6YrhW5YbXaj+/tWvexaqbCjD2SETQG8sva2OO/KwGDxhUB/GDFZejzguk7vjkDlMwrDJtKemwIHI1XHN1yYHGsSsLFyQyjpkWoNBvAVgy9jyFHOQu+EO1kyT5sXXPvtLGRp8Tbzoux6OVS3x7NdE4J1+fbiJDf5Azh1kZGbGNiYLs+A+CelkiqHeNZDkca+GK2y9bhmiBRPQc4EJHKe5rNUjBEe7w68Hk0H6DaBYJc7wxcUw3dOI4inmXvtXB0KT0PKPOMtm+mO8sIm4tY0ntsf/7D6vL4w== 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)(136003)(376002)(396003)(346002)(39860400002)(40470700004)(46966006)(36840700001)(2616005)(426003)(7696005)(6666004)(41300700001)(82740400003)(2906002)(82310400005)(83380400001)(47076005)(1076003)(336012)(36860700001)(40480700001)(26005)(70586007)(36756003)(70206006)(86362001)(40460700003)(8676002)(4326008)(186003)(6916009)(8936002)(478600001)(316002)(54906003)(81166007)(356005)(5660300002)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6574 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 7c0e888c-14c1-49d0-5e15-08da7565d003 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vhQpu+yIViXf/Pw1XIKSdW55JgvKVR0xyDnCsq3sqXTgdDVVwTuQ+gNnLJStz5bTD1brLEpfqb1JV+cdAyDBetfEt4RVhpsd5IS4n7DXeXbAKMiYFM6qUVymYZyX67dWDhibTr2jld2XcKcUFuCAcByXjxMSriAtFf59k0AML5XepAGqAiYw+DivJ7t8UYGnDGvzqhopDFQOaqeXkaeNbKaJdr7blKzzecrs/do8xFo6Fef76BsSEYxoR4w0Ye7fX7J8/AD9Pw/VHZJCk8ATZdNkv9i0/7vmzK/R8Wz44lxAwdjaH5gj3d//PMgEmCoIgMW5lUkuRpEUFMMaWimMrqmlv8RNYAc4gzeDeyvYOYzbUD/0BjSHS27AUnViuRL/sU+jZ8wM2UnCTxMzjdES/9RNsDjp0WyXXlw4SpwHoKBi03tF0QWrpgxzo6MR7KaMC1+/s++e6kZCHvaGXTQyB3ubEPa4zz4gJosJxRM3n1wiU9GFwus4a1gDC/+t8bUhNMVuc+Y5m0XY6lDr4fvmmWiLFh9uYqh9LcHhB5WdFQmRh7il3lkp42hlTQnj3ZNVAWz9cc+3J2bpmQjP/C07aZhzsQKqCakxeeetFZkwbtREQrSYOHVMrTqZE+MH+OSB8DC6xe/fXxkaP0xsSh0PByP9jyFifcqZbE15XpFIaVMZh4cMS2AqVioKNA1duaJ02DyZEOd1sTQ6w6dSfP/wfRCbMzYhwlDs322wffiyXUT99wUXT7RxEFgzjhHcIuJCmLsEf/SjCNeDkNa2g3GQjBV1HZLnej2OR73GoZdPIbSkCqzjyhPBtbf/ckKSYTUi 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)(346002)(39860400002)(136003)(376002)(396003)(46966006)(40470700004)(36840700001)(8936002)(41300700001)(82740400003)(86362001)(4326008)(81166007)(70586007)(70206006)(6916009)(316002)(478600001)(8676002)(36860700001)(2616005)(1076003)(40480700001)(82310400005)(54906003)(336012)(40460700003)(186003)(83380400001)(36756003)(47076005)(7696005)(26005)(6666004)(5660300002)(2906002)(426003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2022 15:35:47.1018 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3abbb944-a6a6-4d58-809d-08da7565d62d 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: AM5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB7249 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:51 -0000 Add function prologue/epilogue to conditionally add BTI landing pads and/or PAC code generation & authentication instructions depending on compilation flags. --- newlib/libc/machine/arm/memchr.S | 55 ++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 7 deletions(-) diff --git a/newlib/libc/machine/arm/memchr.S b/newlib/libc/machine/arm/memchr.S index 1a4c6512c..6bdccb934 100644 --- a/newlib/libc/machine/arm/memchr.S +++ b/newlib/libc/machine/arm/memchr.S @@ -76,6 +76,7 @@ .syntax unified #include "acle-compat.h" +#include "pacbti.h" @ NOTE: This ifdef MUST match the one in memchr-stub.c #if defined (__ARM_NEON__) || defined (__ARM_NEON) @@ -267,10 +268,14 @@ memchr: #elif __ARM_ARCH_ISA_THUMB >= 2 && defined (__ARM_FEATURE_DSP) #if __ARM_ARCH_PROFILE == 'M' - .arch armv7e-m +#if __ARM_ARCH >= 8 + /* keep config inherited from -march=. */ #else - .arch armv6t2 -#endif + .arch armv7e-m +#endif /* __ARM_ARCH >= 8 */ +#else + .arch armv6t2 +#endif /* __ARM_ARCH_PROFILE == 'M' */ @ this lets us check a flag in a 00/ff byte easily in either endianness #ifdef __ARMEB__ @@ -287,11 +292,14 @@ memchr: .p2align 4,,15 .global memchr .type memchr,%function + .fnstart + .cfi_startproc memchr: @ r0 = start of memory to scan @ r1 = character to look for @ r2 = length @ returns r0 = pointer to character or NULL if not found + pacbti_prologue and r1,r1,#0xff @ Don't trust the caller to pass a char cmp r2,#16 @ If short don't bother with anything clever @@ -313,6 +321,19 @@ memchr: 10: @ We are aligned, we know we have at least 8 bytes to work with push {r4,r5,r6,r7} + .save {r4-r7} + .cfi_adjust_cfa_offset 16 +#if __HAVE_PAC_LEAF + .cfi_offset 4, -20 + .cfi_offset 5, -16 + .cfi_offset 6, -12 + .cfi_offset 7, -8 +#else + .cfi_offset 4, -16 + .cfi_offset 5, -12 + .cfi_offset 6, -8 + .cfi_offset 7, -4 +#endif /* __HAVE_PAC_LEAF*/ orr r1, r1, r1, lsl #8 @ expand the match word across all bytes orr r1, r1, r1, lsl #16 bic r4, r2, #7 @ Number of double words to work with * 8 @@ -334,6 +355,11 @@ memchr: bne 15b @ (Flags from the subs above) pop {r4,r5,r6,r7} + .cfi_restore 7 + .cfi_restore 6 + .cfi_restore 5 + .cfi_restore 4 + .cfi_adjust_cfa_offset -16 and r1,r1,#0xff @ r1 back to a single character and r2,r2,#7 @ Leave the count remaining as the number @ after the double words have been done @@ -350,11 +376,11 @@ memchr: 40: movs r0,#0 @ not found - bx lr + pacbti_epilogue 50: subs r0,r0,#1 @ found - bx lr + pacbti_epilogue 60: @ We're here because the fast path found a hit @ now we have to track down exactly which word it was @@ -378,9 +404,24 @@ memchr: addeq r0,r0,#1 61: - pop {r4,r5,r6,r7} subs r0,r0,#1 - bx lr +#if __HAVE_PAC_LEAF + pop {r4,r5,r6,r7,ip} + .cfi_restore 143 +#else + pop {r4,r5,r6,r7} +#endif /* __HAVE_PAC_LEAF*/ + .cfi_restore 7 + .cfi_restore 6 + .cfi_restore 5 + .cfi_restore 4 + .cfi_def_cfa_offset 0 +#if __HAVE_PAC_LEAF + aut ip, lr, sp +#endif /* __HAVE_PAC_LEAF*/ + bx lr + .cfi_endproc + .fnend #else /* Defined in memchr-stub.c. */ #endif -- 2.36.1