[Midnightbsd-cvs] src [9980] trunk/sys/modules: sync

[laffer1 at midnightbsd.org]

Revision: 9980
          http://svnweb.midnightbsd.org/src/?rev=9980
Author:   laffer1
Date:     2018-05-26 11:32:59 -0400 (Sat, 26 May 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/modules/x86bios/Makefile
    trunk/sys/modules/xe/Makefile
    trunk/sys/modules/xl/Makefile
    trunk/sys/modules/zfs/Makefile
    trunk/sys/modules/zlib/Makefile

Modified: trunk/sys/modules/x86bios/Makefile
===================================================================
--- trunk/sys/modules/x86bios/Makefile	2018-05-26 15:30:22 UTC (rev 9979)
+++ trunk/sys/modules/x86bios/Makefile	2018-05-26 15:32:59 UTC (rev 9980)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/x86bios/Makefile 211058 2010-08-08 06:18:05Z jkim $
 
 KMOD=	x86bios
 SRCS=	opt_x86bios.h

Modified: trunk/sys/modules/xe/Makefile
===================================================================
--- trunk/sys/modules/xe/Makefile	2018-05-26 15:30:22 UTC (rev 9979)
+++ trunk/sys/modules/xe/Makefile	2018-05-26 15:32:59 UTC (rev 9980)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/xe/Makefile 129740 2004-05-26 00:53:10Z imp $
 
 .PATH: ${.CURDIR}/../../dev/xe
 

Modified: trunk/sys/modules/xl/Makefile
===================================================================
--- trunk/sys/modules/xl/Makefile	2018-05-26 15:30:22 UTC (rev 9979)
+++ trunk/sys/modules/xl/Makefile	2018-05-26 15:32:59 UTC (rev 9980)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/xl/Makefile 226154 2011-10-08 12:33:10Z marius $
 
 .PATH: ${.CURDIR}/../../dev/xl
 

Modified: trunk/sys/modules/zfs/Makefile
===================================================================
--- trunk/sys/modules/zfs/Makefile	2018-05-26 15:30:22 UTC (rev 9979)
+++ trunk/sys/modules/zfs/Makefile	2018-05-26 15:32:59 UTC (rev 9980)
@@ -1,10 +1,16 @@
 # $MidnightBSD$
-# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.6.2.3.2.1 2008/11/25 02:59:29 kensmith Exp $
+# $FreeBSD: stable/10/sys/modules/zfs/Makefile 315844 2017-03-23 08:16:29Z avg $
 
 KMOD=	zfs
 
-SRCS=	bus_if.h device_if.h vnode_if.h
+SRCS=	bus_if.h device_if.h vnode_if.h opt_kstack_pages.h
 
+.if !defined(KERNBUILDDIR)
+SRCS+=	opt_kdtrace.h
+opt_kdtrace.h:
+	echo "" > ${.TARGET}
+.endif
+
 SUNW=	${.CURDIR}/../../cddl/contrib/opensolaris
 
 .PATH:	${SUNW}/common/acl
@@ -12,14 +18,15 @@
 .PATH:	${SUNW}/common/avl
 SRCS+=	avl.c
 .PATH:	${SUNW}/common/nvpair
-SRCS+=	nvpair.c
-SRCS+=	nvpair_alloc_fixed.c
-SRCS+=	fnvpair.c
+SRCS+=	opensolaris_nvpair.c
+SRCS+=	opensolaris_nvpair_alloc_fixed.c
+SRCS+=	opensolaris_fnvpair.c
 .PATH:	${.CURDIR}/../../cddl/contrib/opensolaris/common/unicode
 SRCS+=	u8_textprep.c
 
 .PATH:	${.CURDIR}/../../cddl/compat/opensolaris/kern
 SRCS+=	opensolaris_acl.c
+SRCS+=	opensolaris_dtrace.c
 SRCS+=	opensolaris_kobj.c
 SRCS+=	opensolaris_kstat.c
 SRCS+=	opensolaris_lookup.c
@@ -29,6 +36,7 @@
 SRCS+=	opensolaris_taskq.c
 SRCS+=	opensolaris_uio.c
 SRCS+=	opensolaris_vfs.c
+SRCS+=	opensolaris_vm.c
 SRCS+=	opensolaris_zone.c
 
 _A=${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic
@@ -43,7 +51,6 @@
 .endif
 
 .PATH:	${SUNW}/uts/common/fs
-SRCS+=	gfs.c
 SRCS+=	vnode.c
 
 .PATH:	${SUNW}/uts/common/os
@@ -65,7 +72,7 @@
 SRCS+=	zutil.c
 
 .PATH:	${.CURDIR}/../../crypto/sha2
-SRCS+=	sha2.c
+SRCS+=	sha256c.c sha512c.c
 
 .PATH:	${SUNW}/common/zfs
 .include "${SUNW}/uts/common/Makefile.files"
@@ -87,11 +94,17 @@
 CFLAGS+=-I${SUNW}/common
 CFLAGS+=-DBUILDING_ZFS
 
+.if ${MACHINE_ARCH} == "powerpc64"
+CFLAGS+=-mminimal-toc
+.endif
+
 #CFLAGS+=-DDEBUG=1
 #DEBUG_FLAGS=-g
 
 .include <bsd.kmod.mk>
 
+CFLAGS+=	-include ${.CURDIR}/../../cddl/compat/opensolaris/sys/debug_compat.h
+
 CWARNFLAGS+=-Wno-unknown-pragmas
 CWARNFLAGS+=-Wno-missing-prototypes
 CWARNFLAGS+=-Wno-undef

Modified: trunk/sys/modules/zlib/Makefile
===================================================================
--- trunk/sys/modules/zlib/Makefile	2018-05-26 15:30:22 UTC (rev 9979)
+++ trunk/sys/modules/zlib/Makefile	2018-05-26 15:32:59 UTC (rev 9980)
@@ -1,4 +1,5 @@
-# $FreeBSD$
+# $MidnightBSD$
+# $FreeBSD: stable/10/sys/modules/zlib/Makefile 130799 2004-06-20 17:42:35Z markm $
 
 .PATH: ${.CURDIR}/../../net