From nobody Wed Jan 15 19:28:34 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YYGJ22sjtz5kXVM; Wed, 15 Jan 2025 19:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYGJ220S9z3QVr; Wed, 15 Jan 2025 19:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736969314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAvvdiXoCNO/E5S5ykmHncL8e0LcFFAWaXIB+R27CtY=; b=Era9wJ4YvP1tnKv76MIhrEx0y3RPu/CS1/uUVsxqBWMCZUYvzyLXc6gZRrJezanbs1UdKI 8J12b7hI3fzx3ZdYyunlGIRXhQ2TQ+TT5fCzAvgFBC1v+2MiFtaOPb6CWGP6N60GVs8N6t UQKS9m4a8YoHKkRBq5MqJVAl03fBb6yBk+lAjiK2DaJH86NRrQMNIqaeUNVCOTh3p+0X1A 2+TeciWrBBbYMPL0/ZXflbp7dhkHsCGCiR8zl/Waij1QAP/290Fopp4TW+1b0F1/8lTpZH m4vsZ5O/0TVw5LhOI9vxEyQPUYXSggQ7cxM8uAPcA0sLQjLUmr2+/CrCIGrDHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736969314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mAvvdiXoCNO/E5S5ykmHncL8e0LcFFAWaXIB+R27CtY=; b=RlQ9p2FEqqeH3b67oZIuLu9vrtfNOk4dWoqhGFR65W4GB3Xm9/85yWqODfS6LRdsIcUDVi fx5AUOiy2snE7o4uMLgJxvim8EPg64uPMwD8ugcz4y0S44G67LJ7/iHM5BIwkiyEocDh5V /wD7ftQoYZw+bE6H0yopg1UnSnmYSc/sfaFae4+YD6NB1O45N1n9w+Np/cahK3N1gUei84 bXIr3iJj8QPm5kPjrz6zs5yBLZCVNif5UQFMhZ7FEQfGrLAeBEq64wuLxv5WKwODHIoluD gNOqdp1lp26H5Q6TWDJNv7MK1WmyFBxokO5LYRXn74FNY+1pMVbfuiM5AKRVdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736969314; a=rsa-sha256; cv=none; b=XHufmSO9M4VZuEWrC4pePaCRG2+Yv+Fs/PkIJ3tUuOIGEWe+Fd7rawDwRPAVsU1lKcLJck +MRjtwMBQji1OFGY75jvkh5ptaGWDdl75VbFqh21L2qhJ54D8iw0amH6fFS6inSJW1N3BS p9tux17rmARw7HN0rXvy/19CL/GJWI7oG1vHsGvmpaLplWLdMKKHUYzVTcb+8HxQj8R5B2 GwmG4fHyGR1Ye+jYtgcdohUH+PNWNo9mCFCb4S/rLhnc5XBQ04MEuIamXBC4KLTLP6JVUV 8FHQEfwPukoZWGSW6F+d2rQ1t9c4CvRTZ3bNy1WIZzrAB17A9Zdo2KHsrcgljw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YYGJ21bTMz106B; Wed, 15 Jan 2025 19:28:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50FJSYjb041524; Wed, 15 Jan 2025 19:28:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50FJSYjk041521; Wed, 15 Jan 2025 19:28:34 GMT (envelope-from git) Date: Wed, 15 Jan 2025 19:28:34 GMT Message-Id: <202501151928.50FJSYjk041521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c0661bbbd0d9 - main - depend-cleanup: Fix match expression for AArch64 asm files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0661bbbd0d917f602d42fe4bb9ee3edc5970c8a Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c0661bbbd0d917f602d42fe4bb9ee3edc5970c8a commit c0661bbbd0d917f602d42fe4bb9ee3edc5970c8a Author: Ed Maste AuthorDate: 2025-01-14 21:36:08 +0000 Commit: Ed Maste CommitDate: 2025-01-15 19:28:03 +0000 depend-cleanup: Fix match expression for AArch64 asm files Some routines (strcmp, strncmp, strlen) switched from an asm implementation from arm-optimized-routines to a new asm implementation. The default clean_dep rule matches both the old and new dependency string, resulting in those routines always being rebuilt. Instead use "arm-optimized-routines" (i.e., contrib subdir for the previous implementation) as the matching regex. Also delete the old generated src files. Reviewed by: fuz Sponsored by: The FreeBSD Foundation Fixes: d57842ed2dad ("depend-cleanup.sh: clean up after AArch64 libc SIMD merge") Differential Revision: https://reviews.freebsd.org/D48459 --- tools/build/depend-cleanup.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 6f97747183a8..30c303d4f90f 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -242,7 +242,8 @@ fi if [ $MACHINE_ARCH = aarch64 ]; then # 20250110 5e7d93a60440 add strcmp SIMD implementation - clean_dep lib/libc strcmp S + clean_dep lib/libc strcmp S arm-optimized-routines + run rm -f "$OBJTOP"/lib/libc/strcmp.S # 20250110 b91003acffe7 add strspn optimized implementation clean_dep lib/libc strspn c @@ -260,7 +261,8 @@ if [ $MACHINE_ARCH = aarch64 ]; then clean_dep lib/libc strlcpy c # 20250110 25c485e14769 add strncmp SIMD implementation - clean_dep lib/libc strncmp S + clean_dep lib/libc strncmp S arm-optimized-routines + run rm -f "$OBJTOP"/lib/libc/strncmp.S # 20250110 bad17991c06d add memccpy SIMD implementation clean_dep lib/libc memccpy c @@ -272,7 +274,8 @@ if [ $MACHINE_ARCH = aarch64 ]; then clean_dep lib/libc strlcat c # 20250110 3863fec1ce2d add strlen SIMD implementation - clean_dep lib/libc strlen S + clean_dep lib/libc strlen S arm-optimized-routines + run rm -f "$OBJTOP"/lib/libc/strlen.S # 20250110 79e01e7e643c add bcopy & bzero wrapper clean_dep lib/libc bcopy c