From nobody Mon Dec 19 15:41:31 2022 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 4NbP7w25D5z1G20v; Mon, 19 Dec 2022 15:41:32 +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 4NbP7w16Z9z3HG4; Mon, 19 Dec 2022 15:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671464492; 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=kK1+BFxUdO8ufCNg3HCX6oHGEwAy6SCnUCMcj0sIR5g=; b=wZCfgr99bGmuYF5akfVymguWoo/ZjAHvQ+wap+9Ad57S2AOvP6kgvF8VtgFvIEeA0ZVwPp wigVn5Sumcd+r34TbEDGYNdJSV0dhuVdyDSkj+rKQTKylhd/G6XDVcGxdnNBl0zXIQVLJR H/9Pw2Th9eew8JM5c0PcHbV6sQU+4ayy64aBHWSeHaYbudyb192PeczJTXxszSKg2Cx6Vw WNdzuVcwj+WFKi967+WNVxyTnalGmRSfVmBRIcIGtgJ4O9nliRSHhiQ4nZ68GWZW00WgQH EfWg2MMJi6djBex967eSOHXdNT8a1J1Nq1sCTmDEafyVu0qGmx/Y2nobsK2F1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671464492; 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=kK1+BFxUdO8ufCNg3HCX6oHGEwAy6SCnUCMcj0sIR5g=; b=DkDh1SF+hMxKE7otN4p1m3iUgkDyb8M9X/Te6yAeO1mTjOhrj1nUqzIww5AB/tt64g6oCK PuL4aIQGRZCHAr2hm/Q5vHJ8cMVHIGIKtVcSKHrSmm7jba9OTDur4TiDz1v+bUU7PNSnAf qSKoxrIWN4Bw5aQ2O5J6O+6UngiqR5ImnNGA1LpSk2t6ycSJu3iRLZxnx92wfIZY5xCvqa 2OW+1JYM5oyN180smWxVgdQwDdBG/EqhkMt3zuElaCtxMmW5oiITUdgT2pTo6coMRnK3s8 D9tWZW1QQkLrkTdhfHOzcEEymqPNyd7ZH+kiiq0jLLRdmU3px8mmxu8camUP3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671464492; a=rsa-sha256; cv=none; b=pdtTYvqjE8JtLKWPA5IooH5YwgFqmbzAHo5A6V584Va6pSkgjs5CllZwENx/p4pAxJhoU1 kgxjzCkGNesna0USPlEoaPUv3KJtaErVbDntZ0b0XZLnz2ZMRlKYQmUd/mNwB5v/5U9aaW Bn3UPMY8ARoSPlvD7CUUGsiyYwgX0As+LavloZaZ5Cr+aJD5l6oc6eRmwINfAwYVMRqXRf x+A4xz+r6TLynVdw3IiJDuinDwUfmuk/p4tBHpHJCTbGZWARsZrqTXebvIzKH1x+B9cdCZ OaAGTxbjevzuqMvY2lNzpNExphwihqczFT2q9AMjNttMl3KPZ743mU82D53OcA== 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 4NbP7v5qDxz11bb; Mon, 19 Dec 2022 15:41:31 +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 2BJFfVRS096767; Mon, 19 Dec 2022 15:41:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJFfVeF096766; Mon, 19 Dec 2022 15:41:31 GMT (envelope-from git) Date: Mon, 19 Dec 2022 15:41:31 GMT Message-Id: <202212191541.2BJFfVeF096766@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: 98492960c3d9 - stable/13 - libdtrace: Change the binding of USDT probe symbols to STB_WEAK 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 98492960c3d91de4995ddbf5dc1860c8e57b5951 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=98492960c3d91de4995ddbf5dc1860c8e57b5951 commit 98492960c3d91de4995ddbf5dc1860c8e57b5951 Author: Mark Johnston AuthorDate: 2022-12-11 16:27:22 +0000 Commit: Mark Johnston CommitDate: 2022-12-19 14:56:38 +0000 libdtrace: Change the binding of USDT probe symbols to STB_WEAK Otherwise, if multiple object files contain references to the same probe, newish lld will refuse to link them by default, raising a duplicate global symbol definition error. Previously, duplicate global symbols with identical absolute st_values were permitted by both lld and GNU ld. Since dtrace has no use for probe function symbols after the relocation performed by dtrace -G, make the symbols weak as well, following a suggestion from MaskRay. Reported by: dim MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit be39466a1035ffb13268cd63723e976898e9b91e) --- cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c | 1 + 1 file changed, 1 insertion(+) diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c index 0b3dac0224f9..927b4415409d 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c @@ -1612,6 +1612,7 @@ process_obj(dtrace_hdl_t *dtp, const char *obj, int *eprobesp) * invocation. */ if (rsym.st_shndx != SHN_ABS) { + rsym.st_info = GELF_ST_INFO(STB_WEAK, STT_FUNC); rsym.st_shndx = SHN_ABS; (void) gelf_update_sym(data_sym, ndx, &rsym); }