summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2016-03-10 21:16:01 +0000
committergjb <gjb@FreeBSD.org>2016-03-10 21:16:01 +0000
commit1c7e318a9a31cae130bd5b2de01d93e7800f66ff (patch)
tree5abb86d0e160314526bb716fff070a6708d61844 /etc
parent8c3e466633f443f8af1bf868eb74c53b39b63fb8 (diff)
parent03f8f8e39672316bbe0cad522f381fab54de0b6e (diff)
downloadFreeBSD-src-1c7e318a9a31cae130bd5b2de01d93e7800f66ff.zip
FreeBSD-src-1c7e318a9a31cae130bd5b2de01d93e7800f66ff.tar.gz
MFH
Sponsored by: The FreeBSD Foundation
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 ea10412..d4410db 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 3765b05..5021843 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
OpenPOWER on IntegriCloud