Module Name:    src
Committed By:   martin
Date:           Sun Mar  8 10:18:04 UTC 2020

Modified Files:
        src/sys/conf [netbsd-9]: files

Log Message:
Pull up following revision(s) (requested by pgoyette in ticket #757):

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

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

Also exclude EXEC_AOUT stuff for aarch64
XXX Pullup-9 and -8


To generate a diff of this commit:
cvs rdiff -u -r1.1237.2.4 -r1.1237.2.5 src/sys/conf/files

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1237.2.4 src/sys/conf/files:1.1237.2.5
--- src/sys/conf/files:1.1237.2.4	Tue Jan 21 15:53:39 2020
+++ src/sys/conf/files	Sun Mar  8 10:18:04 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1237.2.4 2020/01/21 15:53:39 martin Exp $
+#	$NetBSD: files,v 1.1237.2.5 2020/03/08 10:18:04 martin Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20171118
@@ -162,7 +162,17 @@ defflag				COMPAT_FREEBSD: COMPAT_09, CO
 defflag				COMPAT_LINUX: COMPAT_NETBSD, COMPAT_43
 defflag				COMPAT_SUNOS: COMPAT_09, COMPAT_43
 defflag				COMPAT_ULTRIX: COMPAT_50
+
+# mips64 and aarch64 have COMPAT_NETBSD32 but cannot have EXEC_AOUT; all
+# other users of COMPAT_NETBSD32 need EXEC_AOUT
+ifdef mips
+defflag				COMPAT_NETBSD32
+elifdef aarch64
 defflag				COMPAT_NETBSD32
+else
+defflag				COMPAT_NETBSD32	: EXEC_AOUT
+endif
+
 defflag				COMPAT_SYSV
 defflag				SYSV_IPC	: SYSVSHM, SYSVSEM, SYSVMSG
 defflag				COMPAT_NETBSD32_SYSVIPC : SYSV_IPC,

Reply via email to