Sun Mar 8 09:42:29 2020 UTC ()
Pull up following revision(s) (requested by pgoyette in ticket #1514):

	sys/conf/files: revision 1.1257
	sys/conf/files: revision 1.1258

mips64 has compat_netbsd32 but cannot have exec_aout; all other users
of compat_netbsd32 need exec_aout
Addresses PR kern/55037.
XXX pullup-9

Fix comment - thanks Ryo Shimizu


(martin)
diff -r1.1173.2.8 -r1.1173.2.9 src/sys/conf/files
cvs diff -r1.1173.2.8 -r1.1173.2.9 src/sys/conf/files (expand / switch to unified diff)

--- src/sys/conf/files 2019/09/03 12:08:22 1.1173.2.8
+++ src/sys/conf/files 2020/03/08 09:42:29 1.1173.2.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: files,v 1.1173.2.8 2019/09/03 12:08:22 martin Exp $ 1# $NetBSD: files,v 1.1173.2.9 2020/03/08 09:42:29 martin Exp $
2# @(#)files.newconf 7.5 (Berkeley) 5/10/93 2# @(#)files.newconf 7.5 (Berkeley) 5/10/93
3 3
4version 20170615 4version 20170615
5 5
6# 6#
7# device classes 7# device classes
8# 8#
9devclass disk 9devclass disk
10devclass tape 10devclass tape
11devclass ifnet 11devclass ifnet
12devclass tty 12devclass tty
13devclass audiodev 13devclass audiodev
14devclass displaydev 14devclass displaydev
@@ -150,27 +150,33 @@ defflag opt_compat_netbsd.h COMPAT_14: C @@ -150,27 +150,33 @@ defflag opt_compat_netbsd.h COMPAT_14: C
150defflag opt_compat_netbsd.h COMPAT_13: COMPAT_14, COMPAT_NETBSD 150defflag opt_compat_netbsd.h COMPAT_13: COMPAT_14, COMPAT_NETBSD
151defflag opt_compat_netbsd.h COMPAT_12: COMPAT_13, COMPAT_NETBSD 151defflag opt_compat_netbsd.h COMPAT_12: COMPAT_13, COMPAT_NETBSD
152defflag opt_compat_netbsd.h COMPAT_11: COMPAT_12, COMPAT_NETBSD 152defflag opt_compat_netbsd.h COMPAT_11: COMPAT_12, COMPAT_NETBSD
153defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD 153defflag opt_compat_netbsd.h COMPAT_10: COMPAT_11, COMPAT_NETBSD
154defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD 154defflag opt_compat_netbsd.h COMPAT_09: COMPAT_10, COMPAT_NETBSD
155defflag COMPAT_OSSAUDIO 155defflag COMPAT_OSSAUDIO
156defflag COMPAT_FREEBSD: COMPAT_30 156defflag COMPAT_FREEBSD: COMPAT_30
157defflag COMPAT_IBCS2 157defflag COMPAT_IBCS2
158defflag COMPAT_LINUX: COMPAT_16 158defflag COMPAT_LINUX: COMPAT_16
159defflag COMPAT_OSF1 159defflag COMPAT_OSF1
160defflag COMPAT_SUNOS: COMPAT_30 160defflag COMPAT_SUNOS: COMPAT_30
161defflag opt_compat_svr4.h COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2 161defflag opt_compat_svr4.h COMPAT_SVR4 COMPAT_SVR4_32 SVR4_COMPAT_SOLARIS2
162defflag COMPAT_ULTRIX: COMPAT_50 162defflag COMPAT_ULTRIX: COMPAT_50
 163# mips64 has COMPAT_NETBSD32 but cannot have EXEC_AOUT; all
 164# other users of COMPAT_NETBSD32 need EXEC_AOUT
 165ifdef mips
163defflag COMPAT_NETBSD32 166defflag COMPAT_NETBSD32
 167else
 168defflag COMPAT_NETBSD32 : EXEC_AOUT
 169endif
164defflag COMPAT_LINUX32 : COMPAT_LINUX, COMPAT_NETBSD32 170defflag COMPAT_LINUX32 : COMPAT_LINUX, COMPAT_NETBSD32
165defflag COMPAT_AOUT_M68K: COMPAT_40 171defflag COMPAT_AOUT_M68K: COMPAT_40
166defflag COMPAT_M68K4K 172defflag COMPAT_M68K4K
167defflag COMPAT_VAX1K 173defflag COMPAT_VAX1K
168defflag COMPAT_43 174defflag COMPAT_43
169defflag opt_compat_netbsd.h COMPAT_NOMID 175defflag opt_compat_netbsd.h COMPAT_NOMID
170 176
171define machdep 177define machdep
172defflag opt_machdep.h MACHDEP 178defflag opt_machdep.h MACHDEP
173 179
174# 180#
175# Cryptography support. Include this early, since several things 181# Cryptography support. Include this early, since several things
176# use it. 182# use it.