From nobody Tue Mar 01 00:23:41 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 E012819F5BBA; Tue, 1 Mar 2022 00:23:41 +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 4K6yf5627yz3rTV; Tue, 1 Mar 2022 00:23:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646094221; 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=/aa0+2RmroswKEm7fJGVLfxkFObKdB2CMKgMb0fbW+w=; b=lo6AczN0YG6RT1sAdXL5DOh2iJBMy5R+u4xBSK1byyaXIqPIAJMP2KXRxLYnHKJRN/SGaJ pzatjjyaXRDOQPKMC1ltx5LlfNAeeos+MIzI7XAISy1wYdiYlP9ZfpL+oPDzTYD3u/9RZJ 4gfNq4SnyJH0oZT82oST5L+o7Sk0pO0HLDMTobgJFa9xDrOsmXkJlSdTQHzIuvf5+71KWH 7lKvBlsoXVcvs88ckjfdP93XGsIYkFOFzcQgrhQDWXw1lJTGryKUikO511XzTrLv3B2nAT vv9y3kMQoYpzfdnIIhoBMR/P+x35RvudSoRDIxQkThzvcNJRCIdnfgO/h8+0ew== 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 AF2F3253DC; Tue, 1 Mar 2022 00:23:41 +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 2210Nf2R000126; Tue, 1 Mar 2022 00:23:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2210Nf9H000125; Tue, 1 Mar 2022 00:23:41 GMT (envelope-from git) Date: Tue, 1 Mar 2022 00:23:41 GMT Message-Id: <202203010023.2210Nf9H000125@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: f1b015cda413 - stable/13 - src.libnames.mk: add a comment explaining libssp_nonshared 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f1b015cda413142d8592f2e9c61836031675d7fe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646094221; 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=/aa0+2RmroswKEm7fJGVLfxkFObKdB2CMKgMb0fbW+w=; b=kTAq2vM1LxHOevofUuEGqAw8GCKQ4u52+aagyV7DtmgkWuoflGQrGt047CIj5n8lPSjfLF G70NBQlaGx3833xDKrJcu563OFGV6fsyH75XaiHRPx6gz5fR+b4at7VK1ax5RhEbqMoPpG OUdIfEPi7dfBcDjZmSu4PrriTf6m/leIHjIJ89QnIV7TfKJEpAXYFwCjslwhoQXnGOIG4V J7KpqdOxk5U9Xk5IzArm9s0zbJXbEeInJVZvXQFIG8JZQm4ZMLTCYhySpiSd6WNVmaM7UO UehXJbrPQNP5JLIw1uQaz9xombIbElxw7tvjWbB8rBPBFSoj/Cv1hDOd6fYJFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646094221; a=rsa-sha256; cv=none; b=mT+6dH6L75ZG9mYOOavIx6gOP1BpsYt85Gu9jihC3szNJtNRNrriFDO2o7PEGxgh4aR82/ 6rfFjnto5iKqJe2uALnAy7hWvVhQrZhu5RwPlVd1Vsslx1HRIg/Oye4DgUw1FLWncCe4mE wTVpIrTB8/XA96DbEqy/VOs40ncKOH7hZrP+odam5/a5/kYGS1dIf4e0CrM1cZEdGl2Qs1 U6Ikbsykb5xiJ2nnvnDDALuJYyspnXhuxaO7TLZfGaQHnmQZur7uhqEOa/8REfYTShKH33 uNrLELDE4+HlGEFLS5x25vL7PAry4ljxF4KN/iFj5sifW6o+eTpsIV8UYNbiGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f1b015cda413142d8592f2e9c61836031675d7fe commit f1b015cda413142d8592f2e9c61836031675d7fe Author: Ed Maste AuthorDate: 2022-02-22 21:22:03 +0000 Commit: Ed Maste CommitDate: 2022-03-01 00:23:27 +0000 src.libnames.mk: add a comment explaining libssp_nonshared libssp_nonshared is a special case for (only) i386 and power*. Add a comment explaining why, based on the original commit message that added it. MFC after: 1 week Fixes: 0f61170882cb ("libssp_nonshared: use only on i386 and ppc") Sponsored by: The FreeBSD Foundation (cherry picked from commit 9aa786cbb50e997739f31094dc8d45260f19c63c) --- share/mk/src.libnames.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 99d416556b54..abaacc591604 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -382,6 +382,8 @@ _DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp # The libc dependencies are not strictly needed but are defined to make the # assert happy. _DP_c= compiler_rt +# Use libssp_nonshared only on i386 and power*. Other archs emit direct calls +# to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. .if ${MK_SSP} != "no" && \ (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") _DP_c+= ssp_nonshared