From nobody Fri Oct 18 18:15:45 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 4XVXv624JSz5ZX5n; Fri, 18 Oct 2024 18:15:46 +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 4XVXv604r5z417F; Fri, 18 Oct 2024 18:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729275346; 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=TZ/cFHwDYjDHfDrYvg0lFJPaBB0P6MIMkOhACi2eCUI=; b=fipxAjbltPlHOPMMoFdSE9oFcmndmQjIZZHWlU4h0fnTjJ9PiP4ghGdZO8jwvUedMTdGL6 pgr1xd2eUsKVNOEjYVY1FUzVn96kukhC7nooerMbJLfPlNeVeYJ5RJbvR9quCrurLUYgyP kIybAazxIuyLkMJtJWwJ89fV2DNX8gZS7X9OY6bOS9l9JLR0zuw9KjmTPwwpYTkxVDFYYm Ny3/4aySt36P7nRDy4SLIbBbr29S51moLGsl7Md+hqR1/yyZF9vGqZNa5VbCzvFxAb/web +4myRpBhXmAl3yc3zFhz4tV6x7NsKwxtISTSKPI9dOf8R8VBImg7/nSlTq3qTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729275346; 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=TZ/cFHwDYjDHfDrYvg0lFJPaBB0P6MIMkOhACi2eCUI=; b=vo/rjrI0HxrVuuc2bjzAaOxAK6/avNxnE056ow6043ZfRGoRLP0Q1rAMQGoG4uMfJ2EAha ukQSwaBDa4myrHufN/ACrKYCTAyNm4cVrbhAyXHV+vlQmh8nsguWDaPlMg8iZxARLFdJeb l2CFwBK940cVTyarp1HATqBp0YPAwUYdTulOMjf0KTNA+/zdRT33fsDZmYMcPWetirEbJ7 LEBFHUpdCtJdy3A9UBEK1ROzqa0wuSdoba3sg8GRXVU1OqpnGsDs/sDpbyFOQylXdUGeKZ BPPligMvbEslgGcGlkxaRJoTreIouqco4wWkuseTzHW3y60Ry9UDhbzCrbfktw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729275346; a=rsa-sha256; cv=none; b=aSs9/GJ0at03B4NxbJFUgPYCf/yoA+ZraOGHAiBH3OczaJim9M5OdpDkfv75Elb0FzkiTW loTDHuk4PNXtIyVeLHu/IVCu49U1578PN+XQiWLbozawHdlAa97QFcqLBnNrEKacZ2evMe 0Uwy65a8p0+X+W/76AFNl5T6iVxRvlw5s/nLAJNbCm2xkH8c7DaifbhewuaMB7kIyn56CA M1Vb/9ObZ4cKc/zZ3WQB/xiTyvYnOqIASfk6UthX5ISvkJ+Fl7TqXjN04kbN/qRtbVi1xH tOtoeqqexzwpZqcvzlF0inOI9RkuiX37JwpSMOES7xu28mu2LZKj+tJ6KMhYVQ== 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 4XVXv5583mzksb; Fri, 18 Oct 2024 18:15:45 +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 49IIFjc1055702; Fri, 18 Oct 2024 18:15:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49IIFjof055699; Fri, 18 Oct 2024 18:15:45 GMT (envelope-from git) Date: Fri, 18 Oct 2024 18:15:45 GMT Message-Id: <202410181815.49IIFjof055699@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: d41a40f48482 - main - depend-cleanup.sh: Clean up after riscv static binary IFUNC addition 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: d41a40f484826e90ed78dce5f006712b0eeaf501 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d41a40f484826e90ed78dce5f006712b0eeaf501 commit d41a40f484826e90ed78dce5f006712b0eeaf501 Author: Jessica Clarke AuthorDate: 2024-10-18 18:15:30 +0000 Commit: Jessica Clarke CommitDate: 2024-10-18 18:15:30 +0000 depend-cleanup.sh: Clean up after riscv static binary IFUNC addition reloc.c is conditionally included by libc_start1.c so existing builds don't feature it in the .depend file and won't know they need to rebuild libc_start1.c. MFC after: 1 week --- tools/build/depend-cleanup.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 94cafbd9a8d6..001a450bf182 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -199,3 +199,19 @@ clean_dep cddl/lib/libzpool zfs_debug c "linux/zfs/zfs_debug\.c" # 20241011 clean_dep cddl/lib/libzpool arc_os c "linux/zfs/arc_os\.c" + +# 20241018 1363acbf25de libc/csu: Support IFUNCs on riscv +if [ ${MACHINE} = riscv ]; then + for f in "$OBJTOP"/lib/libc/.depend.libc_start1.*o; do + if [ ! -f "$f" ]; then + continue + fi + if ! grep -q 'lib/libc/csu/riscv/reloc\.c' "$f"; then + echo "Removing stale dependencies and objects for libc_start1.c" + run rm -f \ + "$OBJTOP"/lib/libc/.depend.libc_start1.* \ + "$OBJTOP"/lib/libc/libc_start1.*o + break + fi + done +fi