Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/mips/mips fix build on non rmx or octeon systems.



details:   https://anonhg.NetBSD.org/src/rev/fb046b6de6a8
branches:  trunk
changeset: 955230:fb046b6de6a8
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Sep 24 08:14:08 2020 +0000

description:
fix build on non rmx or octeon systems.

diffstat:

 sys/arch/mips/mips/mipsX_subr.S |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 7a93f1a0b71d -r fb046b6de6a8 sys/arch/mips/mips/mipsX_subr.S
--- a/sys/arch/mips/mips/mipsX_subr.S   Thu Sep 24 08:02:32 2020 +0000
+++ b/sys/arch/mips/mips/mipsX_subr.S   Thu Sep 24 08:14:08 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mipsX_subr.S,v 1.110 2020/09/24 02:12:01 mrg Exp $     */
+/*     $NetBSD: mipsX_subr.S,v 1.111 2020/09/24 08:14:08 mrg Exp $     */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -117,9 +117,8 @@
  */
 
 #include <mips/asm.h>
-RCSID("$NetBSD: mipsX_subr.S,v 1.110 2020/09/24 02:12:01 mrg Exp $")
+RCSID("$NetBSD: mipsX_subr.S,v 1.111 2020/09/24 08:14:08 mrg Exp $")
 
-#include "cpunode.h"                   /* for NWDOG */
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -138,6 +137,12 @@
 
 #include "assym.h"
 
+#if defined(MIPS64_OCTEON) || defined(MIPS64_XLR) || defined(MIPS64_XLS)
+#include "cpunode.h"                   /* for NWDOG */
+#else
+#define NWDOG 0
+#endif
+
 #if defined(MIPS1) || defined(MIPS2)
 #error use locore_mips1.S
 #endif



Home | Main Index | Thread Index | Old Index