summaryrefslogtreecommitdiff
path: root/sys/modules
diff options
context:
space:
mode:
Diffstat (limited to 'sys/modules')
-rw-r--r--sys/modules/Makefile39
-rw-r--r--sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk4
-rw-r--r--sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk4
-rw-r--r--sys/modules/clockctl/Makefile4
-rw-r--r--sys/modules/compat/Makefile14
-rw-r--r--sys/modules/compat_09/Makefile16
-rw-r--r--sys/modules/compat_10/Makefile16
-rw-r--r--sys/modules/compat_12/Makefile17
-rw-r--r--sys/modules/compat_13/Makefile21
-rw-r--r--sys/modules/compat_14/Makefile16
-rw-r--r--sys/modules/compat_16/Makefile15
-rw-r--r--sys/modules/compat_20/Makefile15
-rw-r--r--sys/modules/compat_30/Makefile16
-rw-r--r--sys/modules/compat_40/Makefile18
-rw-r--r--sys/modules/compat_43/Makefile15
-rw-r--r--sys/modules/compat_50/Makefile34
-rw-r--r--sys/modules/compat_60/Makefile21
-rw-r--r--sys/modules/compat_70/Makefile13
-rw-r--r--sys/modules/compat_80/Makefile14
-rw-r--r--sys/modules/compat_crypto_50/Makefile12
-rw-r--r--sys/modules/compat_netbsd32/Makefile45
-rw-r--r--sys/modules/compat_netbsd32_09/Makefile17
-rw-r--r--sys/modules/compat_netbsd32_12/Makefile17
-rw-r--r--sys/modules/compat_netbsd32_13/Makefile26
-rw-r--r--sys/modules/compat_netbsd32_16/Makefile28
-rw-r--r--sys/modules/compat_netbsd32_20/Makefile16
-rw-r--r--sys/modules/compat_netbsd32_30/Makefile17
-rw-r--r--sys/modules/compat_netbsd32_40/Makefile15
-rw-r--r--sys/modules/compat_netbsd32_43/Makefile15
-rw-r--r--sys/modules/compat_netbsd32_50/Makefile16
-rw-r--r--sys/modules/compat_netbsd32_60/Makefile15
-rw-r--r--sys/modules/compat_netbsd32_80/Makefile15
-rw-r--r--sys/modules/compat_netbsd32_sysvipc/Makefile5
-rw-r--r--sys/modules/compat_netbsd32_sysvipc_10/Makefile17
-rw-r--r--sys/modules/compat_netbsd32_sysvipc_14/Makefile17
-rw-r--r--sys/modules/compat_netbsd32_sysvipc_50/Makefile17
-rw-r--r--sys/modules/compat_raid_50/Makefile11
-rw-r--r--sys/modules/compat_raid_80/Makefile12
-rw-r--r--sys/modules/compat_sysctl_09_43/Makefile13
-rw-r--r--sys/modules/compat_sysv_10/Makefile21
-rw-r--r--sys/modules/compat_sysv_14/Makefile19
-rw-r--r--sys/modules/compat_sysv_50/Makefile18
-rw-r--r--sys/modules/compat_util/Makefile11
-rw-r--r--sys/modules/crypto/Makefile4
-rw-r--r--sys/modules/sysv_ipc/Makefile11
-rw-r--r--sys/modules/vnd/Makefile4
46 files changed, 690 insertions, 56 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index f896b2e689d..1a04be8b801 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -1,10 +1,25 @@
-# $NetBSD: Makefile,v 1.215 2019/01/21 00:21:48 alnsn Exp $
+# $NetBSD: Makefile,v 1.216 2019/01/27 02:08:43 pgoyette Exp $
.include <bsd.own.mk>
# For all platforms
-SUBDIR= accf_dataready
+# Modules for compatability with earlier versions of NetBSD
+
+SUBDIR+= compat_util
+SUBDIR+= compat_43 compat_sysctl_09_43
+SUBDIR+= compat_09 compat_10 compat_12 compat_13 compat_14
+SUBDIR+= compat_16 compat_20 compat_30 compat_40 compat_50
+SUBDIR+= compat_60 compat_70 compat_80
+
+SUBDIR+= compat_sysv_10 compat_sysv_14 compat_sysv_50
+
+SUBDIR+= compat_raid_50
+SUBDIR+= compat_raid_80
+
+SUBDIR+= compat_crypto_50
+
+SUBDIR+= accf_dataready
SUBDIR+= accf_httpready
SUBDIR+= adosfs
SUBDIR+= aio
@@ -24,11 +39,10 @@ SUBDIR+= cd9660
SUBDIR+= cgd
SUBDIR+= chfs
SUBDIR+= clockctl
+SUBDIR+= compat_ossaudio
SUBDIR+= crypto
SUBDIR+= coda
SUBDIR+= coda5
-SUBDIR+= compat
-SUBDIR+= compat_ossaudio
SUBDIR+= coredump
SUBDIR+= dbcool
SUBDIR+= des
@@ -258,23 +272,28 @@ SUBDIR+= wmihp
SUBDIR+= wmimsi
.endif
-.if ${MACHINE_CPU} == "arm" \
+.if ${MACHINE_ARCH} == "x86_64" \
+ || ${MACHINE_CPU} == "arm" \
|| ${MACHINE_ARCH} == "sparc64" \
|| (!empty(MACHINE_ARCH:Mmips64*) && !defined(BSD_MK_COMPAT_FILE))
SUBDIR+= compat_netbsd32
+SUBDIR+= compat_netbsd32_09 compat_netbsd32_12
+SUBDIR+= compat_netbsd32_13 compat_netbsd32_16
+SUBDIR+= compat_netbsd32_20 compat_netbsd32_30
+SUBDIR+= compat_netbsd32_40 compat_netbsd32_50
+SUBDIR+= compat_netbsd32_60 compat_netbsd32_80
+SUBDIR+= compat_netbsd32_43
SUBDIR+= compat_netbsd32_mqueue
SUBDIR+= compat_netbsd32_nfssrv
SUBDIR+= compat_netbsd32_ptrace
SUBDIR+= compat_netbsd32_sysvipc
+SUBDIR+= compat_netbsd32_sysvipc_10
+SUBDIR+= compat_netbsd32_sysvipc_14
+SUBDIR+= compat_netbsd32_sysvipc_50
.endif
.if ${MACHINE_ARCH} == "x86_64"
SUBDIR+= compat_linux32
-SUBDIR+= compat_netbsd32
-SUBDIR+= compat_netbsd32_mqueue
-SUBDIR+= compat_netbsd32_nfssrv
-SUBDIR+= compat_netbsd32_ptrace
-SUBDIR+= compat_netbsd32_sysvipc
.endif
.if ${MACHINE_ARCH} == "i386"
diff --git a/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk b/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
index 5a44f5a0367..c0ec313f30f 100644
--- a/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
+++ b/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.amd64-xen.mk,v 1.1 2014/08/11 03:43:25 jnemeth Exp $
+# $NetBSD: bsd.amd64-xen.mk,v 1.2 2019/01/27 02:08:43 pgoyette Exp $
.ifndef _BSD_AMD64_XEN_MK_
_BSD_AMD64_XEN_MK_=1
@@ -7,4 +7,6 @@ KMODULEARCHDIR:= amd64-xen
XEN= 1
+#CPPFLAGS+= -DXEN
+
.endif # _BSD_AMD64_XEN_MK_
diff --git a/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk b/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
index e4cff0f5664..0387604f77a 100644
--- a/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
+++ b/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.i386pae-xen.mk,v 1.1 2014/08/11 03:43:26 jnemeth Exp $
+# $NetBSD: bsd.i386pae-xen.mk,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
.ifndef _BSD_I386PAE_XEN_MK_
_BSD_I386PAE_XEN_MK_=1
@@ -8,4 +8,6 @@ KMODULEARCHDIR:= i386pae-xen
XEN= 1
PAE= 1
+#CPPFLAGS+= -DPAE -DXEN
+
.endif # _BSD_I386PAE_XEN_MK_
diff --git a/sys/modules/clockctl/Makefile b/sys/modules/clockctl/Makefile
index 1f49df65c7e..3d3060fe838 100644
--- a/sys/modules/clockctl/Makefile
+++ b/sys/modules/clockctl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/12/07 03:25:57 pgoyette Exp $
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
.include "../Makefile.inc"
@@ -8,6 +8,4 @@ KMOD= clockctl
IOCONF= clockctl.ioconf
SRCS= clockctl.c
-CPPFLAGS+= -DNTP -DCOMPAT_50
-
.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat/Makefile b/sys/modules/compat/Makefile
index ac39d127290..d5399aaca98 100644
--- a/sys/modules/compat/Makefile
+++ b/sys/modules/compat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/03/18 00:51:46 christos Exp $
+# $NetBSD: Makefile,v 1.16 2019/01/27 02:08:44 pgoyette Exp $
.include "../Makefile.inc"
@@ -32,16 +32,24 @@ MACHINE_EXTRA= x86
MACHINE_EXTRA= none
.endif
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DCPU_UCODE
+# pick up more for bsd.klinks.mk as needed.
+MACHINE_EXTRA= x86
+.else
+MACHINE_EXTRA= none
+.endif
+
.include "../../compat/common/Makefile.sysio"
-SRCS+= compat_mod.c
+SRCS+= compat_mod.c compat_exec.c compat_util.c
.PATH: ${S}/arch/${MACHINE}/${MACHINE}
.PATH: ${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}
.PATH: ${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}
.PATH: ${S} ${S}/arch/${MACHINE_EXTRA}/${MACHINE_EXTRA}
-.for i in compat_13_machdep.c compat_16_machdep.c compat_60_cpu_ucode.c
+.for i in compat_13_machdep.c compat_16_machdep.c # compat_60_cpu_ucode.c
. if exists(${S}/arch/${MACHINE}/${MACHINE}/${i}) || \
exists(${S}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}/${i}) || \
exists(${S}/arch/${MACHINE_CPU}/${MACHINE_CPU}/${i}) || \
diff --git a/sys/modules/compat_09/Makefile b/sys/modules/compat_09/Makefile
new file mode 100644
index 00000000000..551c6a2250c
--- /dev/null
+++ b/sys/modules/compat_09/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_09
+
+CPPFLAGS+= -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_09_mod.c
+SRCS+= kern_info_09.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_10/Makefile b/sys/modules/compat_10/Makefile
new file mode 100644
index 00000000000..efd72b8d3e7
--- /dev/null
+++ b/sys/modules/compat_10/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_10
+
+CPPFLAGS+= -DCOMPAT_10 -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_10_mod.c
+SRCS+= vfs_syscalls_10.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_12/Makefile b/sys/modules/compat_12/Makefile
new file mode 100644
index 00000000000..f60bf9d4124
--- /dev/null
+++ b/sys/modules/compat_12/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_12
+
+CPPFLAGS+= -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_12_mod.c
+SRCS+= vm_12.c kern_xxx_12.c vfs_syscalls_12.c
+
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_13/Makefile b/sys/modules/compat_13/Makefile
new file mode 100644
index 00000000000..1cb1c2efc5f
--- /dev/null
+++ b/sys/modules/compat_13/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_13
+
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_13_mod.c
+SRCS+= uvm_13.c kern_sig_13.c
+
+.if ${MACHINE_ARCH} == "x86_64"
+.PATH: ${S}/arch/amd64/amd64
+
+SRCS+= compat_13_machdep.c
+.endif
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_14/Makefile b/sys/modules/compat_14/Makefile
new file mode 100644
index 00000000000..5534f4c2164
--- /dev/null
+++ b/sys/modules/compat_14/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_14
+
+CPPFLAGS+= -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_14_mod.c
+SRCS+= rtsock_14.c
+
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_16/Makefile b/sys/modules/compat_16/Makefile
new file mode 100644
index 00000000000..17c04953fee
--- /dev/null
+++ b/sys/modules/compat_16/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_16
+
+CPPFLAGS+= -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_16_mod.c
+SRCS+= kern_sig_16.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_20/Makefile b/sys/modules/compat_20/Makefile
new file mode 100644
index 00000000000..800c401e64b
--- /dev/null
+++ b/sys/modules/compat_20/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_20
+
+CPPFLAGS+= -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_20_mod.c
+SRCS+= vfs_syscalls_20.c ieee80211_20.c if43_20.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_30/Makefile b/sys/modules/compat_30/Makefile
new file mode 100644
index 00000000000..77d6769fb24
--- /dev/null
+++ b/sys/modules/compat_30/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_30
+
+CPPFLAGS+= -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_30_mod.c
+SRCS+= vfs_syscalls_30.c uipc_syscalls_30.c kern_time_30.c bio_30.c vnd_30.c
+SRCS+= usb_subr_30.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_40/Makefile b/sys/modules/compat_40/Makefile
new file mode 100644
index 00000000000..d0796c8411f
--- /dev/null
+++ b/sys/modules/compat_40/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_40
+
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_40_mod.c
+SRCS+= vfs_syscalls_40.c uipc_syscalls_40.c
+
+.PATH: ${S}/dev/sysmon
+
+SRCS+= sysmon_power_40.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_43/Makefile b/sys/modules/compat_43/Makefile
new file mode 100644
index 00000000000..9b472b18fdf
--- /dev/null
+++ b/sys/modules/compat_43/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_43
+
+CPPFLAGS+= -DCOMPAT_43
+
+SRCS= compat_43_mod.c
+SRCS+= kern_exit_43.c kern_info_43.c kern_resource_43.c kern_sig_43.c \
+ tty_43.c uipc_syscalls_43.c vfs_syscalls_43.c vm_43.c if_43.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_50/Makefile b/sys/modules/compat_50/Makefile
new file mode 100644
index 00000000000..e756dbe67cd
--- /dev/null
+++ b/sys/modules/compat_50/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_50
+
+CPPFLAGS+= -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_50_mod.c
+SRCS+= kern_50.c kern_time_50.c kern_select_50.c
+SRCS+= vfs_syscalls_50.c uipc_syscalls_50.c uvm_50.c
+SRCS+= rndpseudo_50.c clockctl_50.c if_spppsubr50.c
+
+CPPFLAGS+= -DINET -DINET6
+# XXX someday we'll need to add
+#CPPFLAGS+= -DSCTP -DNET_MPSAFE
+
+SRCS+= rtsock_50.c
+
+.PATH: ${S}/fs/puffs
+
+SRCS+= puffs_compat.c
+
+.PATH: ${S}/dev/wscons
+
+SRCS+= wsevent_50.c
+
+.PATH: ${S}/dev
+
+SRCS+= vnd_50.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_60/Makefile b/sys/modules/compat_60/Makefile
new file mode 100644
index 00000000000..7b119c4b59a
--- /dev/null
+++ b/sys/modules/compat_60/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_60
+
+CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_60_mod.c kern_sa_60.c tty_60.c kern_time_60.c ccd_60.c \
+ kern_cpu_60.c
+
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+CPPFLAGS+= -DCPU_UCODE
+
+.PATH: ${S}/arch/x86/x86
+SRCS+= compat_60_cpu_ucode.c
+.endif
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_70/Makefile b/sys/modules/compat_70/Makefile
new file mode 100644
index 00000000000..93541f5cd36
--- /dev/null
+++ b/sys/modules/compat_70/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_70
+
+CPPFLAGS+= -DCOMPAT_70 -DCOMPAT_80
+
+SRCS+= compat_70_mod.c rtsock_70.c uipc_usrreq_70.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_80/Makefile b/sys/modules/compat_80/Makefile
new file mode 100644
index 00000000000..eb9d81a2a3b
--- /dev/null
+++ b/sys/modules/compat_80/Makefile
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_80
+
+CPPFLAGS+= -DCOMPAT_80
+
+SRCS+= compat_80_mod.c
+SRCS+= kern_mod_80.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_crypto_50/Makefile b/sys/modules/compat_crypto_50/Makefile
new file mode 100644
index 00000000000..5872dd20d6a
--- /dev/null
+++ b/sys/modules/compat_crypto_50/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+CPPFLAGS+= -DCOMPAT_50
+
+.PATH: ${S}/opencrypto
+
+KMOD= compat_crypto_50
+SRCS= ocryptodev.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32/Makefile b/sys/modules/compat_netbsd32/Makefile
index 51362f2ed21..fa8466535d6 100644
--- a/sys/modules/compat_netbsd32/Makefile
+++ b/sys/modules/compat_netbsd32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/11/26 08:48:43 mlelstv Exp $
+# $NetBSD: Makefile,v 1.22 2019/01/27 02:08:45 pgoyette Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -21,26 +21,23 @@ CPPFLAGS+= -DCOMPAT_43
CPPFLAGS+= -DCOMPAT_NETBSD32
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64
CPPFLAGS+= -DCOREDUMP -DNTP -DVMSWAP
-CPPFLAGS+= -DNTP -DKTRACE -DMODULAR
+CPPFLAGS+= -DKTRACE -DMODULAR
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
.PATH: ${S}/compat/netbsd32
-SRCS+= netbsd32_compat_09.c netbsd32_compat_10.c
-SRCS+= netbsd32_compat_12.c netbsd32_compat_13.c
-SRCS+= netbsd32_compat_14.c netbsd32_compat_20.c
-SRCS+= netbsd32_compat_30.c netbsd32_compat_43.c
-SRCS+= netbsd32_compat_50.c netbsd32_compat_60.c
-SRCS+= netbsd32_core.c netbsd32_event.c
-SRCS+= netbsd32_exec_elf32.c
-SRCS+= netbsd32_execve.c netbsd32_fs.c
-SRCS+= netbsd32_ioctl.c
-SRCS+= netbsd32_lwp.c netbsd32_netbsd.c
-SRCS+= netbsd32_select.c
-SRCS+= netbsd32_sem.c netbsd32_signal.c
-SRCS+= netbsd32_socket.c netbsd32_syscalls.c
-SRCS+= netbsd32_sysctl.c netbsd32_sysent.c
-SRCS+= netbsd32_time.c netbsd32_wait.c
-SRCS+= netbsd32_mod.c netbsd32_module.c
+SRCS+= netbsd32_core.c netbsd32_event.c
+SRCS+= netbsd32_exec_elf32.c netbsd32_execve.c
+SRCS+= netbsd32_fd.c netbsd32_fs.c
+SRCS+= netbsd32_ioctl.c netbsd32_kern_proc.c
+SRCS+= netbsd32_lwp.c netbsd32_mod.c
+SRCS+= netbsd32_netbsd.c netbsd32_quota.c
+SRCS+= netbsd32_rlimit.c netbsd32_select.c
+SRCS+= netbsd32_sem.c netbsd32_signal.c
+SRCS+= netbsd32_socket.c netbsd32_syscalls.c
+SRCS+= netbsd32_sysctl.c netbsd32_sysent.c
+SRCS+= netbsd32_time.c netbsd32_wait.c
+SRCS+= netbsd32_vm.c
+SRCS+= netbsd32_module.c
.if ${MACHINE_CPU} != "mips" && ${MACHINE_CPU} != "powerpc"
CPPFLAGS+= -DEXEC_AOUT -DCOMPAT_NOMID
@@ -49,12 +46,20 @@ SRCS+= netbsd32_exec_aout.c
.if ${MACHINE_ARCH} == "x86_64"
.PATH: ${S}/arch/amd64/amd64
-SRCS+= netbsd32_machdep.c netbsd32_sigcode.S netbsd32_syscall.c
+CPPFLAGS+= -DMTRR
+SRCS+= netbsd32_syscall.c
+SRCS+= netbsd32_machdep.c
.endif
.if ${MACHINE_ARCH} == "sparc64"
.PATH: ${S}/arch/sparc64/sparc64
-SRCS+= netbsd32_machdep.c netbsd32_sigcode.S
+SRCS+= netbsd32_sigcode.S
+SRCS+= netbsd32_machdep.c
+.endif
+
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
+SRCS+= netbsd32_machdep.c
.endif
.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_09/Makefile b/sys/modules/compat_netbsd32_09/Makefile
new file mode 100644
index 00000000000..83cb439d389
--- /dev/null
+++ b/sys/modules/compat_netbsd32_09/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_09
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_09 -DCOMPAT_10 -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_09.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_12/Makefile b/sys/modules/compat_netbsd32_12/Makefile
new file mode 100644
index 00000000000..ad1513b19c5
--- /dev/null
+++ b/sys/modules/compat_netbsd32_12/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_12
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_12.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_13/Makefile b/sys/modules/compat_netbsd32_13/Makefile
new file mode 100644
index 00000000000..2fd4071811d
--- /dev/null
+++ b/sys/modules/compat_netbsd32_13/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:45 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_13
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_13.c
+
+.if ${MACHINE_ARCH} == "x86_64"
+.PATH: ${S}/arch/amd64/amd64
+SRCS+= netbsd32_machdep_13.c
+.endif
+
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
+SRCS+= netbsd32_machdep_13.c
+.endif
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_16/Makefile b/sys/modules/compat_netbsd32_16/Makefile
new file mode 100644
index 00000000000..c822b528dbf
--- /dev/null
+++ b/sys/modules/compat_netbsd32_16/Makefile
@@ -0,0 +1,28 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_16
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_16 -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_16.c
+
+.if ${MACHINE_ARCH} == "x86_64"
+.PATH: ${S}/arch/amd64/amd64
+SRCS+= netbsd32_sigcode.S
+SRCS+= netbsd32_machdep_16.c
+.endif
+
+.if ${MACHINE_ARCH} == "arm"
+.PATH: ${S}/arch/arm/arm32
+SRCS+= netbsd32_machdep_16.c
+.endif
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_20/Makefile b/sys/modules/compat_netbsd32_20/Makefile
new file mode 100644
index 00000000000..3c2452babc8
--- /dev/null
+++ b/sys/modules/compat_netbsd32_20/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_20
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_20 -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_20.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_30/Makefile b/sys/modules/compat_netbsd32_30/Makefile
new file mode 100644
index 00000000000..2e7dcce9723
--- /dev/null
+++ b/sys/modules/compat_netbsd32_30/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_30
+
+CPPFLAGS+= -DNTP
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_30
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_30.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_40/Makefile b/sys/modules/compat_netbsd32_40/Makefile
new file mode 100644
index 00000000000..21bd91c6db9
--- /dev/null
+++ b/sys/modules/compat_netbsd32_40/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_40
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_40 -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_40.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_43/Makefile b/sys/modules/compat_netbsd32_43/Makefile
new file mode 100644
index 00000000000..4178f498882
--- /dev/null
+++ b/sys/modules/compat_netbsd32_43/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_43
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_43
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_43.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_50/Makefile b/sys/modules/compat_netbsd32_50/Makefile
new file mode 100644
index 00000000000..f3228fc2001
--- /dev/null
+++ b/sys/modules/compat_netbsd32_50/Makefile
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_50
+
+CPPFLAGS+= -DNTP
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_50 -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_50.c netbsd32_rndpseudo_50.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_60/Makefile b/sys/modules/compat_netbsd32_60/Makefile
new file mode 100644
index 00000000000..9686b93dc04
--- /dev/null
+++ b/sys/modules/compat_netbsd32_60/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_60
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_60.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_80/Makefile b/sys/modules/compat_netbsd32_80/Makefile
new file mode 100644
index 00000000000..7c16fa0ad73
--- /dev/null
+++ b/sys/modules/compat_netbsd32_80/Makefile
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/netbsd32
+
+KMOD= compat_netbsd32_80
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_80
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+SRCS+= netbsd32_compat_80.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_sysvipc/Makefile b/sys/modules/compat_netbsd32_sysvipc/Makefile
index b214d974d68..826f7e74b9e 100644
--- a/sys/modules/compat_netbsd32_sysvipc/Makefile
+++ b/sys/modules/compat_netbsd32_sysvipc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/11/26 08:48:43 mlelstv Exp $
+# $NetBSD: Makefile,v 1.3 2019/01/27 02:08:46 pgoyette Exp $
.include "../Makefile.inc"
.include "../Makefile.assym"
@@ -13,8 +13,5 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
.PATH: ${S}/compat/netbsd32
SRCS+= netbsd32_ipc.c
-SRCS+= netbsd32_compat_10.c
-SRCS+= netbsd32_compat_14.c
-SRCS+= netbsd32_compat_50_sysv.c
.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_sysvipc_10/Makefile b/sys/modules/compat_netbsd32_sysvipc_10/Makefile
new file mode 100644
index 00000000000..31d5a1f0eca
--- /dev/null
+++ b/sys/modules/compat_netbsd32_sysvipc_10/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:46 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+KMOD= compat_netbsd32_sysvipc_10
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_10 -DCOMPAT_13 -DCOMPAT_14 -DCOMPAT_50
+CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+.PATH: ${S}/compat/netbsd32
+
+SRCS+= netbsd32_compat_10_sysv.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_sysvipc_14/Makefile b/sys/modules/compat_netbsd32_sysvipc_14/Makefile
new file mode 100644
index 00000000000..80701394eb2
--- /dev/null
+++ b/sys/modules/compat_netbsd32_sysvipc_14/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+KMOD= compat_netbsd32_sysvipc_14
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_14 -DCOMPAT_50
+CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+.PATH: ${S}/compat/netbsd32
+
+SRCS+= netbsd32_compat_14_sysv.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_netbsd32_sysvipc_50/Makefile b/sys/modules/compat_netbsd32_sysvipc_50/Makefile
new file mode 100644
index 00000000000..32e7e4e47df
--- /dev/null
+++ b/sys/modules/compat_netbsd32_sysvipc_50/Makefile
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+.include "../Makefile.assym"
+
+KMOD= compat_netbsd32_sysvipc_50
+
+CPPFLAGS+= -DCOMPAT_NETBSD32
+CPPFLAGS+= -DCOMPAT_50
+CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/external/bsd/libnv/dist
+
+.PATH: ${S}/compat/netbsd32
+
+SRCS+= netbsd32_compat_50_sysv.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_raid_50/Makefile b/sys/modules/compat_raid_50/Makefile
new file mode 100644
index 00000000000..1d8020b60f2
--- /dev/null
+++ b/sys/modules/compat_raid_50/Makefile
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+KMOD= compat_raid_50
+
+.PATH: ${S}/dev/raidframe
+
+SRCS+= rf_compat50.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_raid_80/Makefile b/sys/modules/compat_raid_80/Makefile
new file mode 100644
index 00000000000..6f78a7a8638
--- /dev/null
+++ b/sys/modules/compat_raid_80/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+KMOD= compat_raid_80
+CPPFLAGS+= -DCOMPAT_80
+
+.PATH: ${S}/dev/raidframe
+
+SRCS+= rf_compat80.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_sysctl_09_43/Makefile b/sys/modules/compat_sysctl_09_43/Makefile
new file mode 100644
index 00000000000..3446d9f96a2
--- /dev/null
+++ b/sys/modules/compat_sysctl_09_43/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_sysctl_09_43
+
+CPPFLAGS+= -DCOMPAT_09 -DCOMPAT_43
+
+SRCS+= compat_sysctl_09_43.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_sysv_10/Makefile b/sys/modules/compat_sysv_10/Makefile
new file mode 100644
index 00000000000..999940649ae
--- /dev/null
+++ b/sys/modules/compat_sysv_10/Makefile
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/kern
+
+KMOD= compat_sysv_10
+
+CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG
+
+.PATH: ${S}/compat/common
+
+CPPFLAGS+= -DCOMPAT_10
+CPPFLAGS+= -DCOMPAT_13
+CPPFLAGS+= -DCOMPAT_14
+CPPFLAGS+= -DCOMPAT_50
+
+SRCS+= compat_sysv_10_mod.c
+SRCS+= kern_ipc_10.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_sysv_14/Makefile b/sys/modules/compat_sysv_14/Makefile
new file mode 100644
index 00000000000..47b913c8e51
--- /dev/null
+++ b/sys/modules/compat_sysv_14/Makefile
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/kern
+
+KMOD= compat_sysv_14
+
+CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG
+
+.PATH: ${S}/compat/common
+
+CPPFLAGS+= -DCOMPAT_14
+CPPFLAGS+= -DCOMPAT_50
+
+SRCS+= compat_sysv_14_mod.c
+SRCS+= sysv_msg_14.c sysv_sem_14.c sysv_shm_14.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_sysv_50/Makefile b/sys/modules/compat_sysv_50/Makefile
new file mode 100644
index 00000000000..f8897708c15
--- /dev/null
+++ b/sys/modules/compat_sysv_50/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/kern
+
+KMOD= compat_sysv_50
+
+CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG
+
+.PATH: ${S}/compat/common
+
+CPPFLAGS+= -DCOMPAT_50
+
+SRCS+= compat_sysv_50_mod.c
+SRCS+= sysv_ipc_50.c sysv_msg_50.c sysv_sem_50.c sysv_shm_50.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/compat_util/Makefile b/sys/modules/compat_util/Makefile
new file mode 100644
index 00000000000..dd8e81dce72
--- /dev/null
+++ b/sys/modules/compat_util/Makefile
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.2 2019/01/27 02:08:47 pgoyette Exp $
+
+.include "../Makefile.inc"
+
+.PATH: ${S}/compat/common
+
+KMOD= compat_util
+
+SRCS+= compat_util.c compat_exec.c
+
+.include <bsd.kmodule.mk>
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index b4cc4b16d2d..56c75c90acf 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/08/20 11:05:01 christos Exp $
+# $NetBSD: Makefile,v 1.5 2019/01/27 02:08:47 pgoyette Exp $
.include "../Makefile.inc"
@@ -8,6 +8,6 @@ CPPFLAGS+= -DCOMPAT_50
KMOD= crypto
IOCONF= crypto.ioconf
-SRCS= cryptodev.c ocryptodev.c
+SRCS= cryptodev.c
.include <bsd.kmodule.mk>
diff --git a/sys/modules/sysv_ipc/Makefile b/sys/modules/sysv_ipc/Makefile
index f80e253257c..a81d5bd9189 100644
--- a/sys/modules/sysv_ipc/Makefile
+++ b/sys/modules/sysv_ipc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/11/03 04:26:58 riastradh Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/27 02:08:47 pgoyette Exp $
.include "../Makefile.inc"
@@ -10,13 +10,4 @@ CPPFLAGS+= -DSYSVSEM -DSYSVSHM -DSYSVMSG
SRCS+= sysv_ipc.c sysv_msg.c sysv_sem.c sysv_shm.c
-.PATH: ${S}/compat/common
-
-CPPFLAGS+= -DCOMPAT_10
-CPPFLAGS+= -DCOMPAT_13
-CPPFLAGS+= -DCOMPAT_14
-CPPFLAGS+= -DCOMPAT_50
-
-.include "../../compat/common/Makefile.sysv"
-
.include <bsd.kmodule.mk>
diff --git a/sys/modules/vnd/Makefile b/sys/modules/vnd/Makefile
index 90fda46e474..c7b38c7e00b 100644
--- a/sys/modules/vnd/Makefile
+++ b/sys/modules/vnd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2015/08/20 11:05:02 christos Exp $
+# $NetBSD: Makefile,v 1.4 2019/01/27 02:08:48 pgoyette Exp $
.include "../Makefile.inc"
-CPPFLAGS+= -DVND_COMPRESSION -DCOMPAT_30 -DCOMPAT_50
+CPPFLAGS+= -DVND_COMPRESSION -DCOMPAT_50
.PATH: ${S}/dev