4 files changed, 35 insertions, 9 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 12aaf31bcec9f..54facb84804ef 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -619,6 +619,9 @@ ldconfig_paths="/usr/lib/compat /usr/local/lib /usr/local/lib/compat/pkg"
 			# shared library search paths
 ldconfig32_paths="/usr/lib32 /usr/lib32/compat"
 			# 32-bit compatibility shared library search paths
+ldconfigsoft_paths="/usr/libsoft /usr/libsoft/compat /usr/local/libsoft"
+			# soft float compatibility shared library search paths
+			# Note: temporarily with extra stuff for transition
 ldconfig_paths_aout="/usr/lib/compat/aout /usr/local/lib/aout"
 			# a.out shared library search paths
 ldconfig_local_dirs="/usr/local/libdata/ldconfig"
@@ -626,6 +629,9 @@ ldconfig_local_dirs="/usr/local/libdata/ldconfig"
 ldconfig_local32_dirs="/usr/local/libdata/ldconfig32"
 			# Local directories with 32-bit compatibility ldconfig
 			# configuration files.
+ldconfig_localsoft_dirs="/usr/local/libdata/ldconfigsoft"
+			# Local directories with soft float compatibility ldconfig
+			# configuration files.
 kern_securelevel_enable="NO"	# kernel security level (see security(7))
 kern_securelevel="-1"	# range: -1..3 ; `-1' is the most insecure
 			# Note that setting securelevel to 0 will result
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 1a5835b527294..8fd191475ccec 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1108,8 +1108,6 @@
             man9
             ..
         ..
-        mdocml
-        ..
         misc
             fonts
             ..
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 2dbb5b41f063f..08a2237265b31 100755
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -61,6 +61,28 @@ ldconfig_start()
 			;;
 		esac
 
+		case `sysctl -n hw.machine_arch` in
+		armv6)
+			for i in ${ldconfig_localsoft_dirs}; do
+				if [ -d "${i}" ]; then
+					_files=`find ${i} -type f`
+					if [ -n "${_files}" ]; then
+						ldconfigsoft_paths="${ldconfigsoft_paths} `cat ${_files} | sort -u`"
+					fi
+				fi
+			done
+			_LDC=""
+			for i in ${ldconfigsoft_paths}; do
+				if [ -r "${i}" ]; then
+					_LDC="${_LDC} ${i}"
+				fi
+			done
+			check_startmsgs &&
+			    echo 'Soft Float compatibility ldconfig path:' ${_LDC}
+			${ldconfig} -soft -m ${_ins} ${_LDC}
+			;;
+		esac
+
 		# Legacy aout support for i386 only
 		case `sysctl -n hw.machine_arch` in
 		i386)
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 1513ec7397acc..069e3fda48fdb 100755
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -36,15 +36,15 @@ mountcritlocal_start()
 	done
 	mount_excludes=${mount_excludes%,}
 
-	# Originally, root mount hold had to be released before mounting the root
-	# filesystem.  This delayed the boot, so it was changed to only wait if
-	# the root device isn't readily available.  This can result in this script
-	# executing before all the devices - such as graid(8) - are available.
-	# Thus, should the mount fail, we will wait for the root mount hold release
-	# and retry.
+	# Originally, root mount hold had to be released before mounting
+	# the root filesystem.  This delayed the boot, so it was changed
+	# to only wait if the root device isn't readily available.  This
+	# can result in this script executing before all the devices - such
+	# as graid(8) - are available.  Thus, should the mount fail,
+	# we will wait for the root mount hold release and retry.
 	mount -a -t ${mount_excludes}
 	err=$?
-	if [ $? -ne 0 ]; then
+	if [ ${err} -ne 0 ]; then
 		echo
 		echo 'Mounting /etc/fstab filesystems failed,' \
 		    'will retry after root mount hold release'