Index: lib/libc/aarch64/gen/Makefile.inc
===================================================================
--- lib/libc/aarch64/gen/Makefile.inc
+++ lib/libc/aarch64/gen/Makefile.inc
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+CFLAGS+=	-DNO_COMPAT7
+
 SRCS+=	_ctx_start.S \
 	fabs.S \
 	flt_rounds.c \
Index: lib/libc/aarch64/sys/Makefile.inc
===================================================================
--- lib/libc/aarch64/sys/Makefile.inc
+++ lib/libc/aarch64/sys/Makefile.inc
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+MIASM:=	${MIASM:Nfreebsd[467]_*}
+
 SRCS+=	__vdso_gettc.c
 
 #MDASM= ptrace.S
Index: lib/libc/gen/semctl.c
===================================================================
--- lib/libc/gen/semctl.c
+++ lib/libc/gen/semctl.c
@@ -29,7 +29,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#ifndef NO_COMPAT7
 #define _WANT_SEMUN_OLD
+#endif
 
 #include <sys/types.h>
 #include <sys/ipc.h>
@@ -38,8 +40,10 @@
 #include <stdlib.h>
 
 int	__semctl(int semid, int semnum, int cmd, union semun *arg);
+#ifndef NO_COMPAT7
 int	freebsd7___semctl(int semid, int semnum, int cmd, union semun_old *arg);
 int	freebsd7_semctl(int semid, int semnum, int cmd, ...);
+#endif
 
 int
 semctl(int semid, int semnum, int cmd, ...)
@@ -61,6 +65,7 @@
 	return (__semctl(semid, semnum, cmd, semun_ptr));
 }
 
+#ifndef NO_COMPAT7
 int
 freebsd7_semctl(int semid, int semnum, int cmd, ...)
 {
@@ -82,3 +87,4 @@
 }
 
 __sym_compat(semctl, freebsd7_semctl, FBSD_1.0);
+#endif
Index: lib/libc/include/compat.h
===================================================================
--- lib/libc/include/compat.h
+++ lib/libc/include/compat.h
@@ -38,9 +38,11 @@
 #define	__sym_compat(sym,impl,verid)	\
 	.symver impl, sym@verid
 
+#ifndef NO_COMPAT7
 __sym_compat(__semctl, freebsd7___semctl, FBSD_1.0);
 __sym_compat(msgctl, freebsd7_msgctl, FBSD_1.0);
 __sym_compat(shmctl, freebsd7_shmctl, FBSD_1.0);
+#endif
 
 #undef __sym_compat