From nobody Mon Dec 13 13:28:50 2021 X-Original-To: dev-commits-src-branches@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 CB57218F4F39; Mon, 13 Dec 2021 13:28:51 +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 4JCMm25k96z4rwY; Mon, 13 Dec 2021 13:28:50 +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 318CC15262; Mon, 13 Dec 2021 13:28:50 +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 1BDDSo4g000885; Mon, 13 Dec 2021 13:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BDDSoC2000884; Mon, 13 Dec 2021 13:28:50 GMT (envelope-from git) Date: Mon, 13 Dec 2021 13:28:50 GMT Message-Id: <202112131328.1BDDSoC2000884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 18ae2f6f4b0e - stable/13 - depend-cleanup.sh: Handle commit cbdec8db18b5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 18ae2f6f4b0e4950db3180c2e1806bc24ddb74f3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639402130; 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=RCa0C4DyjeFMyr3nNHqaf03V4IvsQ94VxeiD5PuMOJY=; b=bLrQQ/Vv/cFRCvSx+y7KA4uK0a/qrwFq12Q2CO0MDV6yghAWsmTfuQRS30gHzbh6u/J/GJ zLyG4mvbeAnO+JkPuLWWo1b3c+s0EXMRT0skbqDDWXl9J3f3IW7/Gy4t+4PLzGrSkg09r8 3ad3deFNJU+F+F12mmK/jpjss95zWa+QWJDKEHl03SS3u9m7DMbB0JW5Y1BrhGmDS/esO3 qO9awqY6cSol+sqOg4skS41oXIGr1xQZhPBB5ywsbTmws5xILTBsYaaFhbl2iwLxXkzI7W YqdY6VZcqHrS45xsJzAB4h44nwZbHdkbLjBJ1rg2lUTcEvY5GkibQ1e8DwRo9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639402130; a=rsa-sha256; cv=none; b=n7QEUEQEAB3k2Dv4374rlw4V6WEcp/S+F7/trCP9n742Le8ByKzaKpDop1+3XT21WNtQ5a +xeiWKLKa0bPiSPKPfmAzpmPHL6Ly2G2fdyofylowUwqQcKZx8wOd+t8h9cF/VDl35e5N4 PnznkshARCw9Wf/AW2OBbI5NzMxGAQ7IRmiGWgy1fVn9Ngnnqa9q1cXqV0nYZrPAzqH4oP ynpYc0W8cjHGhYKlGwEHA8ZbSRwFiTc10Abf9MnH/0UYQwwDHYjtocwQLyD1E9DAQ4s0+j eVsfS6nAM9H9Eaghmf3oEN7kyNwvGr+dulGhN2APQ1mq9U+cqI7ihaAeTKgwJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=18ae2f6f4b0e4950db3180c2e1806bc24ddb74f3 commit 18ae2f6f4b0e4950db3180c2e1806bc24ddb74f3 Author: Mark Johnston AuthorDate: 2021-12-07 16:18:45 +0000 Commit: Mark Johnston CommitDate: 2021-12-13 13:27:24 +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 (cherry picked from commit 187fe192ce0ab1fc9787840ddb4f721a72de5942) --- 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