PERFORCE change 98540 for review

[Roman Divacky]

http://perforce.freebsd.org/chv.cgi?CH=98540

Change 98540 by rdivacky at rdivacky_witten on 2006/06/05 12:29:14

	Amd64 version of linuxolator module build. This uses some constant options so it builds
	but doesnt load if you have kernel without COMPAT_*32 options.

Affected files ...

.. //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#2 edit
.. //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#2 edit

Differences ...

==== //depot/projects/soc2006/rdivacky_linuxolator/modules/Makefile#2 (text+ko) ====

@@ -468,6 +468,7 @@
 _ips=		ips
 _ipw=		ipw
 _iwi=		iwi
+_linux=		linux
 _mly=		mly
 _ndis=		ndis
 _nve=		nve

==== //depot/projects/soc2006/rdivacky_linuxolator/modules/linux/Makefile#2 (text+ko) ====

@@ -1,14 +1,19 @@
 # $FreeBSD: src/sys/modules/linux/Makefile,v 1.67 2006/05/05 16:10:45 ambrisko 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_inet6.h opt_mac.h \
+SRCS=	linux${SFX}_dummy.c linux_file.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_util.c opt_inet6.h opt_mac.h opt_compat.h \
 	vnode_if.h device_if.h bus_if.h
-OBJS=	linux_locore.o
+OBJS=	linux${SFX}_locore.o
 
 .if ${MACHINE_ARCH} == "i386"
 SRCS+=	linux_ptrace.c linux_uid16.c imgact_linux.c opt_cpu.h
@@ -22,19 +27,19 @@
 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}_genassym.o: linux${SFX}_genassym.c linux.h @ machine
 	${CC} -c ${CFLAGS:N-fno-common} ${.IMPSRC}
 
 .if !defined(KERNBUILDDIR)