aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-03-10 21:16:01 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-03-10 21:16:01 +0000
commit7d536dc855c85c15bf45f033d108a61b1f3cecc3 (patch)
tree5abb86d0e160314526bb716fff070a6708d61844 /etc
parentb0bdd78348d85294a359c160c307b608b2dc45f0 (diff)
parent30d816a7b569b260360265885c779f6d8e923947 (diff)
downloadsrc-7d536dc855c85c15bf45f033d108a61b1f3cecc3.tar.gz
src-7d536dc855c85c15bf45f033d108a61b1f3cecc3.zip
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=296625
Diffstat (limited to 'etc')
-rw-r--r--etc/mtree/BSD.tests.dist2
-rwxr-xr-xetc/rc.d/abi5
2 files changed, 7 insertions, 0 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index ea10412a94e9..d4410dbc4282 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -283,6 +283,8 @@
..
ssp
..
+ setjmp
+ ..
stdio
..
stdlib
diff --git a/etc/rc.d/abi b/etc/rc.d/abi
index 3765b058114f..5021843841fd 100755
--- a/etc/rc.d/abi
+++ b/etc/rc.d/abi
@@ -27,6 +27,11 @@ linux_start()
echo -n ' linux'
load_kld -e 'linux(aout|elf)' linux
+ case `sysctl -n hw.machine_arch` in
+ amd64)
+ load_kld -e 'linux64elf' linux64
+ ;;
+ esac
if [ -x /compat/linux/sbin/ldconfigDisabled ]; then
_tmpdir=`mktemp -d -t linux-ldconfig`
/compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache