Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mips/include Don't define MIPS1/MIPS32/MIPS32R2 if ...
details: https://anonhg.NetBSD.org/src/rev/260dabb2e838
branches: trunk
changeset: 808034:260dabb2e838
user: matt <matt%NetBSD.org@localhost>
date: Sat May 02 17:39:31 2015 +0000
description:
Don't define MIPS1/MIPS32/MIPS32R2 if ABI is N32 or N64.
diffstat:
sys/arch/mips/include/cpu.h | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r d84e3047e0f9 -r 260dabb2e838 sys/arch/mips/include/cpu.h
--- a/sys/arch/mips/include/cpu.h Sat May 02 17:18:03 2015 +0000
+++ b/sys/arch/mips/include/cpu.h Sat May 02 17:39:31 2015 +0000
@@ -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 @@
#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 */
Home |
Main Index |
Thread Index |
Old Index