Index: head/lib/libc/tests/sys/Makefile
===================================================================
--- head/lib/libc/tests/sys/Makefile	(revision 282090)
+++ head/lib/libc/tests/sys/Makefile	(revision 282091)
@@ -1,85 +1,87 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
 
 TESTSDIR=		${TESTSBASE}/lib/libc/sys
 
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
 # swapcontext
 NETBSD_ATF_TESTS_C+=		access_test
 NETBSD_ATF_TESTS_C+=		chroot_test
 NETBSD_ATF_TESTS_C+=		clock_gettime_test
 NETBSD_ATF_TESTS_C+=		connect_test
 NETBSD_ATF_TESTS_C+=		dup_test
 NETBSD_ATF_TESTS_C+=		fsync_test
+.if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext
 NETBSD_ATF_TESTS_C+=		getcontext_test
+.endif
 NETBSD_ATF_TESTS_C+=		getgroups_test
 NETBSD_ATF_TESTS_C+=		getitimer_test
 NETBSD_ATF_TESTS_C+=		getlogin_test
 NETBSD_ATF_TESTS_C+=		getpid_test
 NETBSD_ATF_TESTS_C+=		getrusage_test
 NETBSD_ATF_TESTS_C+=		getsid_test
 NETBSD_ATF_TESTS_C+=		gettimeofday_test
 NETBSD_ATF_TESTS_C+=		issetugid_test
 NETBSD_ATF_TESTS_C+=		kevent_test
 NETBSD_ATF_TESTS_C+=		kill_test
 NETBSD_ATF_TESTS_C+=		link_test
 NETBSD_ATF_TESTS_C+=		listen_test
 NETBSD_ATF_TESTS_C+=		mincore_test
 NETBSD_ATF_TESTS_C+=		mkdir_test
 NETBSD_ATF_TESTS_C+=		mkfifo_test
 NETBSD_ATF_TESTS_C+=		mknod_test
 NETBSD_ATF_TESTS_C+=		mlock_test
 NETBSD_ATF_TESTS_C+=		mmap_test
 NETBSD_ATF_TESTS_C+=		mprotect_test
 NETBSD_ATF_TESTS_C+=		msgctl_test
 NETBSD_ATF_TESTS_C+=		msgget_test
 NETBSD_ATF_TESTS_C+=		msgrcv_test
 NETBSD_ATF_TESTS_C+=		msgsnd_test
 NETBSD_ATF_TESTS_C+=		msync_test
 NETBSD_ATF_TESTS_C+=		nanosleep_test
 NETBSD_ATF_TESTS_C+=		pipe_test
 NETBSD_ATF_TESTS_C+=		pipe2_test
 NETBSD_ATF_TESTS_C+=		poll_test
 NETBSD_ATF_TESTS_C+=		revoke_test
 NETBSD_ATF_TESTS_C+=		select_test
 NETBSD_ATF_TESTS_C+=		setrlimit_test
 NETBSD_ATF_TESTS_C+=		setuid_test
 NETBSD_ATF_TESTS_C+=		sigaction_test
 NETBSD_ATF_TESTS_C+=		sigqueue_test
 NETBSD_ATF_TESTS_C+=		sigtimedwait_test
 NETBSD_ATF_TESTS_C+=		socketpair_test
 NETBSD_ATF_TESTS_C+=		stat_test
 NETBSD_ATF_TESTS_C+=		timer_create_test
 NETBSD_ATF_TESTS_C+=		truncate_test
 NETBSD_ATF_TESTS_C+=		ucontext_test
 NETBSD_ATF_TESTS_C+=		umask_test
 NETBSD_ATF_TESTS_C+=		unlink_test
 NETBSD_ATF_TESTS_C+=		write_test
 
 DPADD.getpid_test+=	${LIBPTHREAD}
 LDADD.getpid_test+=	-lpthread
 DPADD.timer_create_test+=	${LIBRT}
 LDADD.timer_create_test+=	-lrt
 
 .include "../Makefile.netbsd-tests"
 
 .if ${COMPILER_TYPE} == "gcc"
 WARNS?=			3
 .else
 WARNS?=			4
 .endif
 
 FILESGROUPS=		FILES truncate_test_FILES
 
 truncate_test_FILES=	truncate_test.root_owned
 truncate_test_FILESDIR=	${TESTSDIR}
 truncate_test_FILESMODE= 0600
 truncate_test_FILESOWNER= root
 truncate_test_FILESGRP= wheel
 
 CLEANFILES=	truncate_test.root_owned
 truncate_test.root_owned:
 	dd if=/dev/null bs=1 count=1 of=${.TARGET}
 
 .include <bsd.test.mk>
Index: head/lib/libthr/tests/Makefile
===================================================================
--- head/lib/libthr/tests/Makefile	(revision 282090)
+++ head/lib/libthr/tests/Makefile	(revision 282091)
@@ -1,58 +1,60 @@
 # $FreeBSD$
 
 OBJTOP=		${.OBJDIR:H:H:H}
 SRCTOP=		${.CURDIR:H:H:H}
 TESTSRC=	${SRCTOP}/contrib/netbsd-tests/lib/libpthread
 
 TESTSDIR=	${TESTSBASE}/lib/libthr
 
 # TODO: t_name (missing pthread_getname_np support in FreeBSD)
 NETBSD_ATF_TESTS_C=	barrier_test
 NETBSD_ATF_TESTS_C+=	cond_test
 NETBSD_ATF_TESTS_C+=	condwait_test
 NETBSD_ATF_TESTS_C+=	detach_test
 NETBSD_ATF_TESTS_C+=	equal_test
 NETBSD_ATF_TESTS_C+=	fork_test
 NETBSD_ATF_TESTS_C+=	fpu_test
 NETBSD_ATF_TESTS_C+=	join_test
 NETBSD_ATF_TESTS_C+=	kill_test
 NETBSD_ATF_TESTS_C+=	mutex_test
 NETBSD_ATF_TESTS_C+=	once_test
 NETBSD_ATF_TESTS_C+=	preempt_test
 NETBSD_ATF_TESTS_C+=	rwlock_test
 NETBSD_ATF_TESTS_C+=	sem_test
 NETBSD_ATF_TESTS_C+=	sigmask_test
 NETBSD_ATF_TESTS_C+=	sigsuspend_test
 NETBSD_ATF_TESTS_C+=	siglongjmp_test
 NETBSD_ATF_TESTS_C+=	sleep_test
+.if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext
 NETBSD_ATF_TESTS_C+=	swapcontext_test
+.endif
 
 NETBSD_ATF_TESTS_SH=	atexit_test
 NETBSD_ATF_TESTS_SH+=	cancel_test
 NETBSD_ATF_TESTS_SH+=	exit_test
 NETBSD_ATF_TESTS_SH+=	resolv_test
 
 DPADD+=		${LIBPTHREAD}
 LDADD+=		-lpthread
 DPADD.fpu_test+=	${LIBM}
 LDADD.fpu_test+=	-lm
 DPADD.sem_test+=	${LIBRT}
 LDADD.sem_test+=	-lrt
 
 BINDIR=		${TESTSDIR}
 
 PROGS=		h_atexit
 PROGS+=		h_cancel
 PROGS+=		h_exit
 PROGS+=		h_resolv
 
 FILESDIR=	${TESTSDIR}
 FILES=		d_mach
 
 TESTS_SUBDIRS=		dlopen
 
 .include <netbsd-tests.test.mk>
 
 CFLAGS.condwait_test+=	-I${SRCTOP}/contrib/netbsd-tests/lib/libc/gen
 
 .include <bsd.test.mk>