From nobody Tue Sep 10 17:55:06 2024 X-Original-To: dev-commits-src-main@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 4X3BDp5Mgvz5WJyR; Tue, 10 Sep 2024 17:55:06 +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 4X3BDp36GBz4F5W; Tue, 10 Sep 2024 17:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725990906; 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=PRnTrMSGRj+J8+1NrBPyauRPviLakE/DXKmkwdIvh0U=; b=BfYH/3RINPu1bW29eFl7gBcCpELS0KVnvwgtGS5AQQhLrYdtvfgEl4XdxtgQRPbPqA3eLo U98/GcPRA8vbeojW8qpfmIHeoIhRuReKKozLtz3rVWvuMaXumTwP5+eKtAizh+oWmD/L+d VZuDntB1bnXCAyA+UcH/J2CO3A+T3AzP6XDEUFXax5M7RCNrrOwhlsiz5+Q/Yt3T36SJ1L jaDmzgQNZLtlAD0+4yLjdYGjm0V9eHx9Eu5aDtlUsVL5bWtWa84w8kyMDiAbUfEn99J/Fd r7ETuj3XXicZIfIeAd9ku5aYpaaaIPE8TWSEp5aTiMPxTqMVF/3kR49ODSUYSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725990906; a=rsa-sha256; cv=none; b=t7HEGAo0XXUKlRrdQUbkY2vpV7Vy+D62q5zCrzyfgfmyy0UgdlOgr2DK8L7L4yqtkl9yEL mEP5KUExhUFbiamS16RccKGmOOmf+yVWtw3o900J6mp3IMJ2Y0oXBjRtmo/uUkqo5Rn0AH 2NHfu7xrIvL2/6yug9ntgZnQtDPR5VrNgXTY/FfrewaC7G0RbCJQKZTbAiVqKW3oy08OsF 92YynijsNYkHIUC5n7+NDSiSh56QpPV9hNS8t2zLARq5oXrmJOvec/nepXKichdyGr1sn0 9O7Gf9SKUGMsPhs9eB6nN+12BOzNmOBkZ+u8afHfKdft12fwH42T5VU1CNie6g== 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=1725990906; 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=PRnTrMSGRj+J8+1NrBPyauRPviLakE/DXKmkwdIvh0U=; b=HylCCMGOe8xpm+B3tjbhMEymUSzF11P6eWO6EaaXsPDxvInWvRZ+7/71ZrBl7bR4fIRLNn Sni6QTadjBnNiaGuM847h4zVDKb2RO7fwSEnB1xMeuEKgsU5e3i2QRZE7zcXs9OF17Ko2r uUs8ZW4wTpiWRW3IB/fxh/gI8Yml3zTkzZdEGxej+iHFUFXn7AaiMrH9kqko/5K8854LTr ZPz1wT7GL71lphhsOuj5/y2/vH3t76w1qC899wE2ZWMMQ3lzS6Xe4HVuTLQnIbz0ngOIxu At7R7o95pDvO1P8Mlm75oUqwa5YZMy3lAcs7we/OcZqWkwkRwF2IuiZ3w9KSXg== 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 4X3BDp2MQ6zx9v; Tue, 10 Sep 2024 17:55:06 +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 48AHt69D086523; Tue, 10 Sep 2024 17:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48AHt6fJ086520; Tue, 10 Sep 2024 17:55:06 GMT (envelope-from git) Date: Tue, 10 Sep 2024 17:55:06 GMT Message-Id: <202409101755.48AHt6fJ086520@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: b9c5eab0f307 - main - depend-cleanup.sh: Fix overzealous syscall.S cleanup on amd64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: b9c5eab0f307d43d37efc41109e52098d5a0f7bd Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=b9c5eab0f307d43d37efc41109e52098d5a0f7bd commit b9c5eab0f307d43d37efc41109e52098d5a0f7bd 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 amd64 Just as we skip the cleanup for i386 due to still having a custom syscall.S, we also need to do the same for lib32 on amd64, so filter it out of ALL_libcompats here. Fixes: a650ec0e55a9 ("lib{c,sys}: fix incremental builds") --- tools/build/depend-cleanup.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b1e498b1460e..578393e837d2 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -173,8 +173,15 @@ 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 ".*/syscall\.S" - clean_dep lib/libc syscall S ".*/syscall\.S" + libcompats= + for libcompat in $ALL_libcompats; do + if [ $MACHINE = amd64 ] && [ $libcompat = 32 ]; then + continue + fi + libcompats="${libcompats+$libcompats }$libcompat" + done + ALL_libcompats="$libcompats" clean_dep lib/libsys syscall S ".*/syscall\.S" + ALL_libcompats="$libcompats" clean_dep lib/libc syscall S ".*/syscall\.S" fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken