git: f1b015cda413 - stable/13 - src.libnames.mk: add a comment explaining libssp_nonshared
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Mar 2022 00:23:41 UTC
The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=f1b015cda413142d8592f2e9c61836031675d7fe commit f1b015cda413142d8592f2e9c61836031675d7fe Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2022-02-22 21:22:03 +0000 Commit: Ed Maste <emaste@FreeBSD.org> 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