[src/trunk]: src/sys/arch/mips/include mips_{l, s}d_a64 only valid for !O32

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/09908e386b77
branches:  trunk
changeset: 337893:09908e386b77
user:      matt <matt%NetBSD.org@localhost>
date:      Sat May 02 18:16:17 2015 +0000

description:
mips_{l,s}d_a64 only valid for !O32

diffstat:

 sys/arch/mips/include/locore.h |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 9cb19106905e -r 09908e386b77 sys/arch/mips/include/locore.h
--- a/sys/arch/mips/include/locore.h    Sat May 02 17:39:31 2015 +0000
+++ b/sys/arch/mips/include/locore.h    Sat May 02 18:16:17 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.96 2015/05/01 18:37:40 christos Exp $ */
+/* $NetBSD: locore.h,v 1.97 2015/05/02 18:16:17 matt Exp $ */
 
 /*
  * This file should not be included by MI code!!!
@@ -317,7 +317,7 @@
 }
 #endif /* (MIPS3 + MIPS4 + MIPS64 + MIPS64R2) > 0 */
 
-#if (MIPS64 + MIPS64R2) > 0
+#if (MIPS64 + MIPS64R2) > 0 && !defined(__mips_o32)
 /* 64-bits address space accessor for n32, n64 ABI */
 
 static __inline uint64_t       mips64_ld_a64(uint64_t addr) __unused;
@@ -332,7 +332,7 @@
 #elif defined(_LP64)
        rv = *(volatile uint64_t *)addr;
 #else
-       KASSERT(0);     // LKM, STANDALONE, MODULE
+#error unknown ABI
 #endif
        return (rv);
 }
@@ -345,7 +345,7 @@
 #elif defined(_LP64)
        *(volatile uint64_t *)addr = val;
 #else
-       KASSERT(0);     // LKM, STANDALONE, MODULE
+#error unknown ABI
 #endif
 }
 #endif /* (MIPS64 + MIPS64R2) > 0 */