From nobody Mon Aug 5 19:49:27 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 4Wd6TM3d0Bz5SbPK; Mon, 05 Aug 2024 19:49:27 +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 4Wd6TM34MJz56Ln; Mon, 5 Aug 2024 19:49:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722887367; 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=KYu9WH2qfs6Ue8t9PxywSlZLb+d+oYZ70ktawPV58Lg=; b=FGvTxej5R+aNnxX3QGceaD/YmgOkFOLvJGgpyaHniUxLm9z5GDzprEFRlZ1d26TPz66d8f XCX1Sn/wsL6uFvWgEHFEPoHlAZ7N72sAWPGa26JSIMB2rgQUPmKa27bmlogEH9G8flFh1A p7JmyaCA0GnD2JOyoA/yRcldnc0q/qCcxB8W/SfMnyTmN4UBDE6eADDNbRfNivLru6m3pH 2CZMt7zZP2NshT4ggi3zLqrf80q52jQqF0up9ChmB4NEuw35tpu5ZQ4XDOMcyeykbgTGT7 yRcM4XhcNCrPpe9ZXHixzwqYlxJxMnB8AzipqDMWemXmJFMMonVvyQkqmGK+EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722887367; a=rsa-sha256; cv=none; b=nsiUjHInevMefaOgp6F+8OB7WpBN7qhzMCKArtvsIJAMgOOY6EpmbTdZ4fscCdVV5dVxGu sg2kVYvV0wxvxpzXXAAw8PEK9i8IkcTKfiVg91HWcLuoKh6T1ql+0oRh057E+g7iWEYDnZ H13qeIiXZg2AUdSBceY1F/YIgjxH1DhL2WWp7tglnrTyv4ZZwiQeFNSTqPIdPYCvV4J9jz vUZ00MXbMY71JeSOnJLpPT24dog4ANDIYw9fUCfOL8hQxrFxD+EPRUwuBb59krvLk/kLqF j42dhEZ2VipDFg2eIreZvtfMMYba5NkI/PRUMWVafn8VoyupzIGXtkPOWYObWA== 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=1722887367; 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=KYu9WH2qfs6Ue8t9PxywSlZLb+d+oYZ70ktawPV58Lg=; b=FQSgYywv/pM5/QUXiWVT39lRcJN7S4O0R8HbVt89nSWHogCVZiOokxIWqliiUkScobwLEE 8s0FEQKcoveqUpuxUy86KxgElit1cx6NAvwTAk1kYLmC1yxC92VT4XBarjTl0dvtdD8DOd Ukq/KOl911622XADdcq8mXzWgvZdiYM7HvZET2avZo7i4mfVZirwTvSymqUZVpBBwD3och LoQu47vfVZFventZwAVgD48bGl3bResb4Nom0RvoxZjmxU4hUu68ReuoElMPqCuhP+UdaZ D9LJKR0bO5afGk1P0gMQ0GkajsKb8uXqokz9mLAKgOHzfYO0ibnNGUv/qUwDxA== 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 4Wd6TM2dj8zcNc; Mon, 5 Aug 2024 19:49:27 +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 475JnRsx055963; Mon, 5 Aug 2024 19:49:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 475JnRAM055960; Mon, 5 Aug 2024 19:49:27 GMT (envelope-from git) Date: Mon, 5 Aug 2024 19:49:27 GMT Message-Id: <202408051949.475JnRAM055960@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 3a4b04e82df6 - main - depend-cleanup.sh: Simplify handling for stale syscall.S 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a4b04e82df6bb9b28aa0c3c670c19063843d644 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=3a4b04e82df6bb9b28aa0c3c670c19063843d644 commit 3a4b04e82df6bb9b28aa0c3c670c19063843d644 Author: John Baldwin AuthorDate: 2024-08-05 19:49:06 +0000 Commit: John Baldwin CommitDate: 2024-08-05 19:49:06 +0000 depend-cleanup.sh: Simplify handling for stale syscall.S Remove the outer grep and depend on the greps in clean_dep instead. Reviewed by: brooks, imp Obtained from: CheriBSD Sponsored by: AFRL, DARPA Differential Revision: https://reviews.freebsd.org/D46103 --- tools/build/depend-cleanup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b93d50a57ff4..b7231422c5ed 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -171,9 +171,7 @@ clean_dep lib/libc statfs c # 20240308 e6ffc7669a56 Remove pointless MD syscall(2) # 20240308 0ee0ae237324 Remove pointless MD syscall(2) # 20240308 7b3836c28188 Remove pointless MD syscall(2) -if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depend.syscall.o ] && \ - grep -q -e 'libsys/[^ /]*/syscall.S' "$OBJTOP"/lib/libsys/.depend.syscall.*; then - echo "Removing stale /syscall.S depends" +if [ ${MACHINE} != i386 ]; then clean_dep lib/libsys syscall S clean_dep lib/libc syscall S fi