From nobody Tue Dec 07 18:00:03 2021 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 8431A18B3AEE; Tue, 7 Dec 2021 18:00:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J7p3l6c29z4VfM; Tue, 7 Dec 2021 18:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C270924503; Tue, 7 Dec 2021 18:00:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B7I03tJ023714; Tue, 7 Dec 2021 18:00:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B7I03WN023711; Tue, 7 Dec 2021 18:00:03 GMT (envelope-from git) Date: Tue, 7 Dec 2021 18:00:03 GMT Message-Id: <202112071800.1B7I03WN023711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 187fe192ce0a - main - depend-cleanup.sh: Handle commit cbdec8db18b5 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 187fe192ce0ab1fc9787840ddb4f721a72de5942 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638900004; 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=lrGo/QqlAsyFbbXRmxXRiOwuyryci0U2SBXVqj4UTNk=; b=WcUMShEGHpIgxn3RW4kha9Ejiywc+0Gdoxxh9Fj9lZQ7gteSBjkzCdMqn8tQSX/RY1lUJU xXzw8UMvcBArOwpRl03zm7bl1GoQq0GdT22v1ip2AMp4vWX8p646pBJmhwf8QJboTXa3pt qH65TqlShp7e63N96rsJGMZrkF4sGu39MynSPRALBfYwloW6sawYP5EfYqJriqvCDJshZH 9R4aX3fGmiWX6dAOJkyMerlUsZe0Uu1Iw7wxMeA0q+znjuVnricNNeA+RqK/0zttvlOAEU vHFQLIPW43HIJWwwWQUu5vDpy3DHeglei8YxLwXrWZfkE8JszUz5dx/lnX2FfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638900004; a=rsa-sha256; cv=none; b=hTCiaq+0M4O86sEHHcj0DrgX52RpTeC4DFKFEnoejBCorQ0jaIslMziTiyRJnWy49JH9ks BGzcxgikSxW4V1b4OsHNsDX0zl6KJFT4keJYbYHOoqv6F91mdCVpSPd+hHrZzYL/NhqYdm 2VN+1gNRFfXjuO3eCF//UqifjitqXXsA+4dRjdk+WGIg1c3wtl7R8hVprm66ine2R+IZuO lAn13e4Bbp51Ss9VY/Yvo+wcPnyPTsUSYaQImWzB2oezbGlose9ljMPxUCDyNOuJRJ34dI 3WFNW7YOF9pZZSRCIs8vEAoxVrxKVUfaabPboOXiRz1onsmGGkNGf7bFKNVJQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=187fe192ce0ab1fc9787840ddb4f721a72de5942 commit 187fe192ce0ab1fc9787840ddb4f721a72de5942 Author: Mark Johnston AuthorDate: 2021-12-07 16:18:45 +0000 Commit: Mark Johnston CommitDate: 2021-12-07 17:59:35 +0000 depend-cleanup.sh: Handle commit cbdec8db18b5 That commit changed libc to use the MI pdfork implementation, but with an incremental build the object file for the pdfork.S stub lingers and causes a linker error. Cleaning the depend file is not enouch, so modify clean_deps() to remove object files as well, and add a call to ensure that pdfork.*o is cleaned. The new file is _pdfork.o. Reported by: jhb Reviewed by: emaste Fixes: cbdec8db18b5 ("libc: Add pdfork to the list of interposed system calls") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33322 --- tools/build/depend-cleanup.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index ae393c2451f0..6055a6b33647 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -31,8 +31,11 @@ clean_dep() if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \ egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \ echo "Removing stale dependencies for $2.$3"; \ - rm -f "$OBJTOP"/$1/.depend.$2.* \ - "$OBJTOP"/obj-lib32/$1/.depend.$2.* + rm -f \ + "$OBJTOP"/$1/.depend.$2.* \ + "$OBJTOP"/$1/$2.*o \ + "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ + "$OBJTOP"/obj-lib32/$1/$2.*o fi } @@ -72,4 +75,6 @@ if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then fi # 20210608 f20893853e8e move from atomic.S to atomic.c -clean_dep cddl/lib/libspl atomic S +clean_dep cddl/lib/libspl atomic S +# 20211207 cbdec8db18b5 switch to libthr-friendly pdfork +clean_dep lib/libc pdfork S