From owner-p4-projects@FreeBSD.ORG Mon Jun 5 12:31:37 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F81C16A873; Mon, 5 Jun 2006 12:31:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4BFA316A501 for ; Mon, 5 Jun 2006 12:31:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E968743D5C for ; Mon, 5 Jun 2006 12:31:25 +0000 (GMT) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k55CTgib072386 for ; Mon, 5 Jun 2006 12:29:42 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k55CTgw1072382 for perforce@freebsd.org; Mon, 5 Jun 2006 12:29:42 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 5 Jun 2006 12:29:42 GMT Message-Id: <200606051229.k55CTgw1072382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 98540 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Jun 2006 12:31:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=98540 Change 98540 by rdivacky@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)