Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/conf Fix MIPS builds by working around an apparent bug i...



details:   https://anonhg.NetBSD.org/src/rev/c29361f1b5f2
branches:  trunk
changeset: 969955:c29361f1b5f2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Mar 07 18:08:47 2020 +0000

description:
Fix MIPS builds by working around an apparent bug in config(8)'s elif
handling.

diffstat:

 sys/conf/files |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r b96bd8a44724 -r c29361f1b5f2 sys/conf/files
--- a/sys/conf/files    Sat Mar 07 14:53:14 2020 +0000
+++ b/sys/conf/files    Sat Mar 07 18:08:47 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files,v 1.1259 2020/03/05 21:08:36 pgoyette Exp $
+#      $NetBSD: files,v 1.1260 2020/03/07 18:08:47 thorpej Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
 version        20171118
@@ -169,11 +169,13 @@
 # other users of COMPAT_NETBSD32 need EXEC_AOUT
 ifdef mips
 defflag                                COMPAT_NETBSD32
-elifdef aarch64
+else
+ifdef aarch64
 defflag                                COMPAT_NETBSD32
 else
 defflag                                COMPAT_NETBSD32 : EXEC_AOUT
 endif
+endif
 
 defflag                                COMPAT_SYSV
 defflag                                SYSV_IPC        : SYSVSHM, SYSVSEM, SYSVMSG



Home | Main Index | Thread Index | Old Index