system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove -m (update) from ldconfig -32 & -soft invocation on startup.

Browse source 
Since r154114 which introduced ldconfig_local32_dirs, ldconfig -32 was
called with -m. This means that ld-elf32.so.hints paths set is not
cleared for compat32 on boot, unlike ld,so,hints.  Same -m was used in
r294295 for ld-elf-soft.so.hints on arm.  The patch fixes the
asymmetry.

Noted by:	Andreas Longwitz <longwitz@incore.de>
Reviewed by:	brooks, emaste, imp
Discussed with:	bdrewery
Sponsored by:	The FreeBSD Foundation
Approved by:	re (gjb)
MFC after:	1 week
Differential revision:	https://reviews.freebsd.org/D17331
This commit is contained in:
Konstantin Belousov 2018-09-27 14:31:41 +00:00
parent a8e3f99ec1
commit dcf55de22a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=338964
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sbin/init/rc.d/ldconfig
View file

@ -58,7 +58,7 @@ ldconfig_start()
done
check_startmsgs &&
echo '32-bit compatibility ldconfig path:' ${_LDC}
${ldconfig} -32 -m ${_ins} ${_LDC}
${ldconfig} -32 ${_ins} ${_LDC}
;;
esac
@ -80,7 +80,7 @@ ldconfig_start()
done
check_startmsgs &&
echo 'Soft Float compatibility ldconfig path:' ${_LDC}
${ldconfig} -soft -m ${_ins} ${_LDC}
${ldconfig} -soft ${_ins} ${_LDC}
;;
esac