From nobody Mon Dec 19 15:43:24 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 4NbPB44jxtz1G2fH; Mon, 19 Dec 2022 15:43:24 +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 4NbPB443d7z3JGv; Mon, 19 Dec 2022 15:43:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671464604; 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=etY+7qWxAnuUeoHWAME8fargoCZmdFF8HOwhtbLW0z4=; b=jjdxEqS4zr8wH0Q16dZYvbjHxNXggz5MTtWPUiSraIADZgMkyNfBQCW9FhlRP2BpyXGYdL zYulI6qFawF0Dje+z5c5E25Ymx51EB+nY2Ba2AoVAzTs/kPl4084lHhMjQVXy8pgjgMCB0 kdUkYeuJ52hEsVrnFUFq6cpsSxo6CT3NzTB1DasgnGWxPksivW90ApIJapi5s77cC5fkz2 mvYMvxpRqC9jgqS3kgvfWfmcTJzO/KSa1KLSMfajFkfw72Kr88tncJo0R5APSVIxCGCk57 3gcx3n9BGb/Dz15sZw3hmHToP+Aykd7bZ6z1CCJRN4JJ5DcpUx3NAqPQYe0GZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671464604; 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=etY+7qWxAnuUeoHWAME8fargoCZmdFF8HOwhtbLW0z4=; b=rx+bm+9v71WbvDs+PdYznmV6ys3PRjivK409pmUzjCi8trQjKjPoCBbx/R35Yv4dMtHuDC 3ohuPknbcUZTEJrj+eiYZbBQOxrGteE+PPCASH7DQR9Lf1f2J2MAHfVFEqQhBGiAwUCw/V Q17bQWijJ8GbP6lZycyWeIEg7zBe26Qf3EIhHqE2KS3V6Mwxoumd2voCK5PX8iLqm2TiCX xhGdR0pW5b1OVKHUnH3PHuXo3P7LkpilBRS8htgSXclydMc2heT5alRkQqJcLZAU7aeK56 DORpbpAyYVR+xghpYNtxFFHFP5bKhDcbHnOdzZKOClW8MyyMFzdcbCx7c43VOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671464604; a=rsa-sha256; cv=none; b=NJLkwiAtc9nCbluFpQ6cMytXgudgwCgED0mrIyPYuhMbvbUNvU+mhwdHHXktnhmF7cjFrE Mh1T6me6nGnWmW8abDH1UYQ7ySnEHgeC9RG2HsULyoe+2sk3VJHULF+cwKit6NMltbVmok N8QzU8Q6S9xy+oz30N4GHPjPFGPikKEdJfj2Q2bd6vNEKVeRUumdylm/Xjnr5pVJEtz8o7 Ul00TU+AlqC76JDYYSbzDhBXlETKs+GmaqR6+hGNslQt4p6NoYfeVtZEK438A5ybapLNv4 MVPvDDrKqOj+e1FQqZuMHxAjC8G8IgyWoi0mLL6ch+OaW1V5f3IyP0EnPJu+CQ== 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 4NbPB436zBz11dm; Mon, 19 Dec 2022 15:43:24 +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 2BJFhOH7099202; Mon, 19 Dec 2022 15:43:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJFhO7G099201; Mon, 19 Dec 2022 15:43:24 GMT (envelope-from git) Date: Mon, 19 Dec 2022 15:43:24 GMT Message-Id: <202212191543.2BJFhO7G099201@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: 0b56e82a40f6 - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: 0b56e82a40f65fa5709482402631e3de8c433657 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0b56e82a40f65fa5709482402631e3de8c433657 commit 0b56e82a40f65fa5709482402631e3de8c433657 Author: Mark Johnston AuthorDate: 2022-12-11 16:27:22 +0000 Commit: Mark Johnston CommitDate: 2022-12-19 15:43:15 +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 589b30aa8654..32be291aab13 100644 --- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c +++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c @@ -1605,6 +1605,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); }