From nobody Tue Sep 10 17:55:05 2024 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 4X3BDn4XdTz5WKKP; Tue, 10 Sep 2024 17:55:05 +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 4X3BDn2LJDz4FHs; Tue, 10 Sep 2024 17:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725990905; 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=WkDxuVciGLzjHnELBrXfgt5/amubGQKOix5dVS9goVw=; b=eQx2rlNHCJTsueUqPPHRwYwZ9ANstOs2sbRPr33fqX1riIq3RAAHHc3pOO6lzU57O8ALyW Ij1lQzVv/JV8anGbQ+eezNQrnEa6rGZ9oRvqmGZ2ZqqHUnCCwGXzT8hhgnWKkwLinTaPKi DwSqA/hnov1jCZSp0Y+U7YU5AKEbf8u2/MzgJnHKy4PjHunrx+UOGhkvH73YUG8z2OSCJ3 AXbSBXS96erJ6Dh2RApgQ3ngmNh/YEnvCdl+UFKFDr7yXSaczbAQLjIWsg0DZcGN+6mGyP Y/gUwpWT4+VXOE+rOK324CD0um1tp6anr4o/qg50IeNWLPmieLxP3g/paBJWpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725990905; a=rsa-sha256; cv=none; b=Hb1441zdWNSGFF4tTIUqnuxS6o6Zw70RPzhZiCtBuVch629OSm26EeE+JQv3oPejqisCw2 AflPXgzSGHWJTKKCnKkaiAjOpp9aZ5U+56mlG6lBtfHXO62aumL72tMvXsbGeCdZpPyB03 BYw+XXJ4wOzwO04JlYq+LO8JEXVhii6QV4KspMO3JwpjNkwgTizymAAv6znG9xdXEf/pyN yAZctJiGe5YIn/5H0RhTTJj6XnHFiaHOjI3o64hnC6S48Kd+RVt7ITmp8Do0AAqtQS/HnC yNwx6zGqWj9XAZ8xoKW5GoodoJxVTDmi2gRY9l8ITaCQr/qUx2S4ILOrRhrWrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725990905; 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=WkDxuVciGLzjHnELBrXfgt5/amubGQKOix5dVS9goVw=; b=D9xi6PyYNB+6RrVcWO4PDCoUs068CfPsQaD1dLJCmoUfzHnxIvYkwiNok+TpflTq8mrz0H 2FJNKVt2bCbjpGaUr5AjuM8Mww8fFjtKvJ6i6iTO9j5s7ND+3NJb/kDQ0AoTgqbJoQb+PC kBOrUBzz/aKDWXvVa3pE7lkLWGPeFGPm47v5Y2oWUeSPfLFtkZz1MLZxoiM2lH6sD7RwPs HNV1qFuPasIuXyQMp4FWRMgTn9/cuJ9P9BR1zsiCwOqw8bhNRBcb1k/DHMB96lj6d7v0Yt 2Kn5NY54Lzi3IYWvO1ytRhpSLDL4997NgD8xmsUvYb7QgoYTxFWBbwu6B8aHLw== 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 4X3BDn1JmgzxDW; Tue, 10 Sep 2024 17:55:05 +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 48AHt5XM086473; Tue, 10 Sep 2024 17:55:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48AHt5jl086470; Tue, 10 Sep 2024 17:55:05 GMT (envelope-from git) Date: Tue, 10 Sep 2024 17:55:05 GMT Message-Id: <202409101755.48AHt5jl086470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 1a5569771980 - main - depend-cleanup.sh: Fix overzealous syscall.S cleanup on non-amd64 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a556977198020da4a2148714bec1d9b68724f99 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1a556977198020da4a2148714bec1d9b68724f99 commit 1a556977198020da4a2148714bec1d9b68724f99 Author: Jessica Clarke AuthorDate: 2024-09-10 17:54:45 +0000 Commit: Jessica Clarke CommitDate: 2024-09-10 17:54:45 +0000 depend-cleanup.sh: Fix overzealous syscall.S cleanup on non-amd64 Although there is no longer a syscall.S in the source tree, the generated file is still called syscall.S, so the syscall\.S regex still matches the .depend file. Previously it looked like: syscall.o \ /path/to/src/lib/libc/MACHINE/sys/syscall.S \ ... or syscall.o \ /path/to/src/lib/libsys/MACHINE/syscall.S \ ... Now it looks like: syscall.o: syscall.S \ ... Thus, match on the file having a directory specified, to distinguish it from the generated case where it's adjacent in the OBJDIR. Note the .* is needed due to the use of egrep -w. Fixes: 3a4b04e82df6 ("depend-cleanup.sh: Simplify handling for stale syscall.S") --- tools/build/depend-cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b3608e46b65d..b1e498b1460e 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -173,8 +173,8 @@ clean_dep lib/libc statfs c # 20240308 0ee0ae237324 Remove pointless MD syscall(2) # 20240308 7b3836c28188 Remove pointless MD syscall(2) if [ ${MACHINE} != i386 ]; then - clean_dep lib/libsys syscall S - clean_dep lib/libc syscall S + clean_dep lib/libsys syscall S ".*/syscall\.S" + clean_dep lib/libc syscall S ".*/syscall\.S" fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken