Index: sys/conf/files.arm
===================================================================
--- sys/conf/files.arm
+++ sys/conf/files.arm
@@ -99,6 +99,14 @@
 arm/arm/vm_machdep.c		standard
 arm/arm/vfp.c			standard
 arm/cloudabi32/cloudabi32_sysvec.c	optional compat_cloudabi32
+arm/linux/imgact_linux.c	optional	compat_linux
+arm/linux/linux_dummy.c		optional	compat_linux
+arm/linux/linux_machdep.c	optional	compat_linux
+arm/linux/linux_support.s	optional	compat_linux	\
+	dependency 	"linux_assym.h"
+arm/linux/linux_sysent.c	optional	compat_linux
+arm/linux/linux_syscalls.c	optional	compat_linux
+arm/linux/linux_sysvec.c	optional	compat_linux
 board_id.h			standard				   \
 	dependency	"$S/arm/conf/genboardid.awk $S/arm/conf/mach-types" \
 	compile-with	"${AWK} -f $S/arm/conf/genboardid.awk $S/arm/conf/mach-types > board_id.h" \
@@ -108,6 +116,26 @@
 cddl/dev/dtrace/arm/dtrace_asm.S			optional dtrace compile-with "${DTRACE_S}"
 cddl/dev/dtrace/arm/dtrace_subr.c			optional dtrace compile-with "${DTRACE_C}"
 cddl/dev/fbt/arm/fbt_isa.c				optional dtrace_fbt | dtraceall compile-with "${FBT_C}"
+compat/linux/linux.c		optional	compat_linux
+compat/linux/linux_event.c	optional	compat_linux
+compat/linux/linux_emul.c	optional	compat_linux
+compat/linux/linux_file.c	optional	compat_linux
+compat/linux/linux_fork.c	optional	compat_linux
+compat/linux/linux_futex.c	optional	compat_linux
+compat/linux/linux_getcwd.c	optional	compat_linux
+compat/linux/linux_ioctl.c	optional	compat_linux
+compat/linux/linux_ipc.c	optional	compat_linux
+compat/linux/linux_mib.c	optional	compat_linux
+compat/linux/linux_misc.c	optional	compat_linux
+compat/linux/linux_signal.c	optional	compat_linux
+compat/linux/linux_socket.c	optional	compat_linux
+compat/linux/linux_stats.c	optional	compat_linux
+compat/linux/linux_sysctl.c	optional	compat_linux
+compat/linux/linux_time.c	optional	compat_linux
+compat/linux/linux_timer.c	optional	compat_linux
+compat/linux/linux_uid16.c	optional	compat_linux
+compat/linux/linux_util.c	optional	compat_linux
+compat/linux/linux_vdso.c	optional	compat_linux
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/cpufreq/cpufreq_dt.c	optional	cpufreq fdt
@@ -159,3 +187,24 @@
 libkern/ucmpdi2.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
+
+linux_genassym.o		optional	compat_linux		\
+	dependency 	"$S/arm/linux/linux_genassym.c"		\
+	compile-with	"${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}"	\
+	no-obj no-implicit-rule						\
+	clean		"linux_genassym.o"
+linux_assym.h			optional	compat_linux		\
+	dependency 	"$S/kern/genassym.sh linux_genassym.o"		\
+	compile-with	"sh $S/kern/genassym.sh linux_genassym.o > ${.TARGET}" \
+	no-obj no-implicit-rule before-depend				\
+	clean		"linux_assym.h"
+linux_locore.o			optional	compat_linux		\
+	dependency 	"linux_assym.h $S/arm/linux/linux_locore.s"	\
+	compile-with	"${CC} -x assembler-with-cpp -DLOCORE -shared -s -pipe -I. -I$S -Werror -Wall -fno-common -nostdinc -nostdlib -Wl,-T$S/arm/linux/linux_vdso.lds.s -Wl,-soname=linux_vdso.so,--eh-frame-hdr,-fPIC,-warn-common ${.IMPSRC} -o ${.TARGET}" \
+	no-obj no-implicit-rule						\
+	clean		"linux_locore.o"
+linux_vdso.so			optional	compat_linux		\
+	dependency 	"linux_locore.o"				\
+	compile-with	"${OBJCOPY} --input-target binary --output-target elf32-littlearm --binary-architecture arm linux_locore.o ${.TARGET}" \
+	no-implicit-rule						\
+	clean		"linux_vdso.so"
Index: sys/conf/options.arm
===================================================================
--- sys/conf/options.arm
+++ sys/conf/options.arm
@@ -78,3 +78,4 @@
 GFB_NO_MODE_CHANGE	opt_gfb.h
 AT91C_MAIN_CLOCK	opt_at91.h
 VFP			opt_global.h
+COMPAT_LINUX		opt_compat.h