Module Name: src
Committed By: matt
Date: Sat May 2 17:39:31 UTC 2015
Modified Files:
src/sys/arch/mips/include: cpu.h
Log Message:
Don't define MIPS1/MIPS32/MIPS32R2 if ABI is N32 or N64.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/mips/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.109 src/sys/arch/mips/include/cpu.h:1.110
--- src/sys/arch/mips/include/cpu.h:1.109 Sun Nov 10 17:18:32 2013
+++ src/sys/arch/mips/include/cpu.h Sat May 2 17:39:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.109 2013/11/10 17:18:32 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.110 2015/05/02 17:39:31 matt Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -175,17 +175,21 @@ struct cpu_info {
#ifdef _KERNEL
#if defined(_MODULAR) || defined(_LKM) || defined(_STANDALONE)
/* Assume all CPU architectures are valid for LKM's and standlone progs */
+#if !defined(__mips_n32) && !defined(__mips_n64)
#define MIPS1 1
+#endif
#define MIPS3 1
#define MIPS4 1
+#if !defined(__mips_n32) && !defined(__mips_n64)
#define MIPS32 1
#define MIPS32R2 1
+#endif
#define MIPS64 1
#define MIPS64R2 1
#endif
#if (MIPS1 + MIPS3 + MIPS4 + MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) == 0
-#error at least one of MIPS1, MIPS3, MIPS4, MIPS32, MIPS32R2, MIPS64, or MIPS64RR2 must be specified
+#error at least one of MIPS1, MIPS3, MIPS4, MIPS32, MIPS32R2, MIPS64, or MIPS64R2 must be specified
#endif
/* Shortcut for MIPS3 or above defined */
