[Midnightbsd-cvs] src: Makefile: merge new linuxolator

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge new linuxolator

Modified Files:
--------------
    src/sys/modules/linux:
        Makefile (r1.1.1.2 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/linux/Makefile,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/modules/linux/Makefile -L sys/modules/linux/Makefile -u -r1.1.1.2 -r1.2
--- sys/modules/linux/Makefile
+++ sys/modules/linux/Makefile
@@ -1,17 +1,28 @@
-# $FreeBSD: src/sys/modules/linux/Makefile,v 1.63.2.1 2006/02/10 00:38:03 yar Exp $
+# $FreeBSD: src/sys/modules/linux/Makefile,v 1.72 2007/05/23 15:45:52 kib Exp $
 
-.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux
+.if ${MACHINE_ARCH} == "amd64"
+SFX= 32
+CFLAGS+=-DCOMPAT_IA32 -DCOMPAT_LINUX32
+.endif
+
+.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux${SFX}
 
 KMOD=	linux
-SRCS=	linux_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
-	linux_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \
-	linux_stats.c linux_sysctl.c linux_sysent.c linux_sysvec.c \
-	linux_util.c opt_compat.h opt_inet6.h opt_mac.h \
-	opt_vmpage.h vnode_if.h
-OBJS=	linux_locore.o
+SRCS=	linux${SFX}_dummy.c linux_emul.c linux_file.c \
+	linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
+	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
+	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
+	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
+	opt_inet6.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \
+	device_if.h bus_if.h assym.s
+
+# XXX: for assym.s
+SRCS+=  opt_kstack_pages.h opt_nfs.h opt_apic.h opt_compat.h
+
+OBJS=	linux${SFX}_locore.o linux${SFX}_support.o
 
 .if ${MACHINE_ARCH} == "i386"
-SRCS+=	linux_ptrace.c linux_uid16.c imgact_linux.c opt_cpu.h
+SRCS+=	linux_ptrace.c imgact_linux.c opt_cpu.h
 .endif
 
 EXPORT_SYMS=
@@ -22,25 +33,26 @@
 EXPORT_SYMS+=	linux_ioctl_register_handler
 EXPORT_SYMS+=	linux_ioctl_unregister_handler
 
-CLEANFILES=	linux_assym.h linux_genassym.o
+CLEANFILES=	linux${SFX}_assym.h linux${SFX}_genassym.o
 
-linux_assym.h: linux_genassym.o
+linux${SFX}_assym.h: linux${SFX}_genassym.o
 .if exists(@)
-linux_assym.h: @/kern/genassym.sh
+linux${SFX}_assym.h: @/kern/genassym.sh
 .endif
-	sh @/kern/genassym.sh linux_genassym.o > ${.TARGET}
+	sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
 
-linux_locore.o: linux_locore.s linux_assym.h
+linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h
 	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
 	    ${.IMPSRC} -o ${.TARGET}
 
-linux_genassym.o: linux_genassym.c linux.h @ machine
+linux${SFX}_support.o: linux${SFX}_support.s assym.s linux${SFX}_assym.h
+	${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
+	    ${.IMPSRC} -o ${.TARGET}
+
+linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_43 1" > opt_compat.h
-
 opt_inet6.h:
 	echo "#define INET6 1" > opt_inet6.h
 .endif