- don't build compat_linux on alpha until sys/modules/compat_linux/Makefile

handles required MD files under sys/compat/linux/arch/alpha
- build exec_elf64 for all 64 bit arch
- use MACHINE_ARCH!="alpha" instead of MACHINE!="alpha" for exec_elf32 check

XXX we have many histrical inconsistent use of amd64 vs x86_64.
This commit is contained in:
tsutsui 2008-11-29 18:41:06 +00:00
parent 83776b8eea
commit 7828361bcf
3 changed files with 11 additions and 7 deletions

View File

@ -1 +1,3 @@
# $NetBSD: module.alpha,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
# $NetBSD: module.alpha,v 1.2 2008/11/29 18:41:06 tsutsui Exp $
./@MODULEDIR@/exec_elf64 base-kernel-modules
./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules

View File

@ -1,3 +1,5 @@
# $NetBSD: module.sparc64,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
# $NetBSD: module.sparc64,v 1.2 2008/11/29 18:41:06 tsutsui Exp $
./@MODULEDIR@/exec_elf32 base-kernel-modules
./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
./@MODULEDIR@/exec_elf64 base-kernel-modules
./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.20 2008/11/28 21:17:08 he Exp $
# $NetBSD: Makefile,v 1.21 2008/11/29 18:41:06 tsutsui Exp $
# For all platforms
@ -48,12 +48,13 @@ SUBDIR+= unionfs
.endif
# Machine dependent section
.if ${MACHINE} != "alpha"
.if ${MACHINE_ARCH} != "alpha"
SUBDIR+= exec_elf32
.endif
.if ${MACHINE} == "alpha"
SUBDIR+= compat_linux
.if ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "x86_64"
SUBDIR+= exec_elf64
.endif
@ -63,7 +64,6 @@ SUBDIR+= compat_linux
SUBDIR+= compat_linux32
SUBDIR+= compat_netbsd32
SUBDIR+= drm
SUBDIR+= exec_elf64
SUBDIR+= i915drm
.endif