Sat Nov 29 18:41:06 2008 UTC ()
- 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.


(tsutsui)
diff -r1.1 -r1.2 src/distrib/sets/lists/base/module.alpha
diff -r1.1 -r1.2 src/distrib/sets/lists/base/module.sparc64
diff -r1.20 -r1.21 src/sys/modules/Makefile
cvs diff -r1.1 -r1.2 src/distrib/sets/lists/base/Attic/module.alpha (expand / switch to unified diff)

--- src/distrib/sets/lists/base/Attic/module.alpha 2008/11/29 17:57:34 1.1
+++ src/distrib/sets/lists/base/Attic/module.alpha 2008/11/29 18:41:06 1.2
cvs diff -r1.1 -r1.2 src/distrib/sets/lists/base/Attic/module.sparc64 (expand / switch to unified diff)

--- src/distrib/sets/lists/base/Attic/module.sparc64 2008/11/29 17:57:34 1.1
+++ src/distrib/sets/lists/base/Attic/module.sparc64 2008/11/29 18:41:06 1.2
@@ -1,3 +1,5 @@ @@ -1,3 +1,5 @@
1# $NetBSD: module.sparc64,v 1.1 2008/11/29 17:57:34 tsutsui Exp $ 1# $NetBSD: module.sparc64,v 1.2 2008/11/29 18:41:06 tsutsui Exp $
2./@MODULEDIR@/exec_elf32 base-kernel-modules 2./@MODULEDIR@/exec_elf32 base-kernel-modules
3./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules 3./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
 4./@MODULEDIR@/exec_elf64 base-kernel-modules
 5./@MODULEDIR@/exec_elf64/exec_elf64.kmod base-kernel-modules
cvs diff -r1.20 -r1.21 src/sys/modules/Makefile (expand / switch to unified diff)

--- src/sys/modules/Makefile 2008/11/28 21:17:08 1.20
+++ src/sys/modules/Makefile 2008/11/29 18:41:06 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2008/11/28 21:17:08 he Exp $ 1# $NetBSD: Makefile,v 1.21 2008/11/29 18:41:06 tsutsui Exp $
2 2
3# For all platforms 3# For all platforms
4 4
5SUBDIR= accf_dataready 5SUBDIR= accf_dataready
6SUBDIR+= accf_httpready 6SUBDIR+= accf_httpready
7SUBDIR+= adosfs 7SUBDIR+= adosfs
8SUBDIR+= aio 8SUBDIR+= aio
9SUBDIR+= cd9660 9SUBDIR+= cd9660
10SUBDIR+= coda 10SUBDIR+= coda
11SUBDIR+= coda5 11SUBDIR+= coda5
12SUBDIR+= compat 12SUBDIR+= compat
13SUBDIR+= compat_ossaudio 13SUBDIR+= compat_ossaudio
14SUBDIR+= coredump 14SUBDIR+= coredump
@@ -38,42 +38,42 @@ SUBDIR+= ptyfs @@ -38,42 +38,42 @@ SUBDIR+= ptyfs
38SUBDIR+= puffs 38SUBDIR+= puffs
39SUBDIR+= putter 39SUBDIR+= putter
40SUBDIR+= miniroot 40SUBDIR+= miniroot
41SUBDIR+= smbfs 41SUBDIR+= smbfs
42SUBDIR+= tmpfs 42SUBDIR+= tmpfs
43SUBDIR+= udf 43SUBDIR+= udf
44SUBDIR+= umap 44SUBDIR+= umap
45SUBDIR+= union 45SUBDIR+= union
46.if (defined(NOTYET)) 46.if (defined(NOTYET))
47SUBDIR+= unionfs 47SUBDIR+= unionfs
48.endif 48.endif
49 49
50# Machine dependent section 50# Machine dependent section
51.if ${MACHINE} != "alpha" 51.if ${MACHINE_ARCH} != "alpha"
52SUBDIR+= exec_elf32 52SUBDIR+= exec_elf32
53.endif 53.endif
54 54
55.if ${MACHINE} == "alpha" 55.if ${MACHINE_ARCH} == "alpha" || \
56SUBDIR+= compat_linux 56 ${MACHINE_ARCH} == "sparc64" || \
 57 ${MACHINE_ARCH} == "x86_64"
57SUBDIR+= exec_elf64 58SUBDIR+= exec_elf64
58.endif 59.endif
59 60
60.if ${MACHINE} == "amd64" 61.if ${MACHINE} == "amd64"
61SUBDIR+= azalia 62SUBDIR+= azalia
62SUBDIR+= compat_linux 63SUBDIR+= compat_linux
63SUBDIR+= compat_linux32 64SUBDIR+= compat_linux32
64SUBDIR+= compat_netbsd32 65SUBDIR+= compat_netbsd32
65SUBDIR+= drm 66SUBDIR+= drm
66SUBDIR+= exec_elf64 
67SUBDIR+= i915drm 67SUBDIR+= i915drm
68.endif 68.endif
69 69
70.if ${MACHINE} == "i386" 70.if ${MACHINE} == "i386"
71SUBDIR+= azalia 71SUBDIR+= azalia
72SUBDIR+= compat_freebsd 72SUBDIR+= compat_freebsd
73SUBDIR+= compat_ibcs2 73SUBDIR+= compat_ibcs2
74SUBDIR+= compat_linux 74SUBDIR+= compat_linux
75SUBDIR+= compat_svr4 75SUBDIR+= compat_svr4
76SUBDIR+= drm 76SUBDIR+= drm
77SUBDIR+= exec_aout 77SUBDIR+= exec_aout
78SUBDIR+= i915drm 78SUBDIR+= i915drm
79SUBDIR+= radeondrm 79SUBDIR+= radeondrm