From nobody Thu Feb 22 20:56:21 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 4Tglmj4Xgcz5BPJQ; Thu, 22 Feb 2024 20:56:21 +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 4Tglmj40lvz3wvK; Thu, 22 Feb 2024 20:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708635381; 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=OIpEA8QI7YIPYyr7kqvScof02SoPH7yc5yG76E/FeHk=; b=BjFHRT4vcbve78rMEYcJVag5AqOTG4zDdtSdEYLzHSDeiGHznde8vrMr4ZzZHAhVMQjRYH UMxTXDb/V2DHx5MusNsVjZvzV17+cBfqwC0s5HOmJ2Fyta7lbXDVnIph+yzl8ClH3eHtEP rpLUZPMjEooy4MpGE4rVnVrB0fLewCb2XSEQmSkAAQJyp14ps0I6CRLQ1k0pfTmNAZ64Jg rXnBSb0qwylqXliDDigy20yVXe/4Sz+b+4EgtwqX0d6DO225s6Mt1C8tC++ndEPY0AZ5A+ KFI0skqqTJ30RMz+L3USB3vDnLr//zgFrX3U8itxek0YiDkDoXvgJ2cM5JkSWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708635381; 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=OIpEA8QI7YIPYyr7kqvScof02SoPH7yc5yG76E/FeHk=; b=EldjmV6l0uc2QVAgTjfw4+dl4osTPM7g0JhG+qwK3KxUG+Kd1aAGLMFUuXT8rYT16dLtPh OnLJzV6zOMX6zc4J6sWa4DTqIQ1W+J2/LiFG/v/sIELLRBIBK/XVBvpN13pI/e84iygE7X Er/I4bV51XvSY93+op9+hDUeM2xHrVyRJsNz6Tk31lgruzxVedQXnvz+eAlSnmVREFiwlw wKop0CW+rjIj3rFz/9I+2sLFpWSNVyheqEOYekAF2EU1JrmVeIpoYHemxxuB3rSac6sd1B sb4DOXRmN4nYLD1VHK4upSozKfc/vOZwuokEpAajFLxbWS8f8uZZB80pPEfm7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708635381; a=rsa-sha256; cv=none; b=Ng05iAwHAmGOEElkpD5MhafBzxj03do+MDodt2yO4/Ckh+YrIGcs3OzapSMc668u/zbZHt oi9wsDL4eR+anheVlt7lGYncSrVGnaL+4svxbXm1ghNewZWFvNq84iIQOidXIUd8E2wtW9 ys3Zloyg4Fq0t9LR5ly5tKvUGEBw6v3p/s+kWnpGxhTnUIrx3l1Job4Y4Jcn8dzv+ifLqO iNhfgj0/nNRmaT6ly4tko02sQu9x7aHko9mOTyiirkSfZaxQjJIZAjz9zDC1z8Bb8fuHZl SR1dICM9Ex+CylfnnW1I7YSNQg8mcYyJuJadq1BnPGfXbFoh/Bu9xD+TAHtT0w== 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 4Tglmj33Y1zn8H; Thu, 22 Feb 2024 20:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MKuLFr072406; Thu, 22 Feb 2024 20:56:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MKuL5Z072403; Thu, 22 Feb 2024 20:56:21 GMT (envelope-from git) Date: Thu, 22 Feb 2024 20:56:21 GMT Message-Id: <202402222056.41MKuL5Z072403@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: ff6b71c2b214 - main - rescue: Stop using LDADD_zstd 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff6b71c2b214c8a22c53c79228ef51e445508cc2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ff6b71c2b214c8a22c53c79228ef51e445508cc2 commit ff6b71c2b214c8a22c53c79228ef51e445508cc2 Author: Jessica Clarke AuthorDate: 2024-02-22 20:56:05 +0000 Commit: Jessica Clarke CommitDate: 2024-02-22 20:56:05 +0000 rescue: Stop using LDADD_zstd Ideally we'd be able to use LDADD_foo here for all our various libs and get the implicit dependencies, but rescue is a bit special. Historically this was just used to pick up the "private" in the name automatically (as far as I can tell), but now that _DP_pthread includes c we end up pulling in a -lc from this (along with -lcompiler_rt and -lsys). This results in -lc being before -lmd (and after, implictly, from the compiler driver), which, for the specific situation here, results in both libc.a's and libmd.a's md5c.o being included, giving duplicate definitions of _libmd_MD5Init and other symbols. With LLD 16+ we currently make that not an error for other reasons (which should probably be fixed), but not for older versions, nor for BFD, and so the build fails. Fix all this by just using -lprivatezstd in place of LDADD_zstd, which results in the exact same clang command line as we used to have prior to adding c (and sys) to _DP_pthread when linking rescue. Note that bsdbox already uses -lprivatezstd rather than LDADD_zstd. This reverts commit 5fead429ebb3800fdd3fc0817d2c330b2a8d640f. Reviewed by: imp Fixes: 99ea67573164 ("lib{c,sys}: move auxargs more firmly into libsys") --- rescue/rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 5d5c609eb218..c1ba22885618 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -216,7 +216,7 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat CRUNCH_PROGS_usr.bin+= zstd CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt -CRUNCH_LIBS+= ${LDADD_zstd} +CRUNCH_LIBS+= -lprivatezstd CRUNCH_PROGS_usr.bin+= fetch CRUNCH_LIBS+= -lfetch