From 374aec78773cbc145babd129e7b42d075b78b9e2 Mon Sep 17 00:00:00 2001
From: simonb <simonb@NetBSD.org>
Date: Mon, 19 Feb 2007 22:04:07 +0000
Subject: [PATCH] Fix checks for 64-bit MIPS (MIPS64 _doesn't_ mean 64-bit
 MIPS(!)).

---
 sys/arch/mips/mips/lock_stubs.S | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/arch/mips/mips/lock_stubs.S b/sys/arch/mips/mips/lock_stubs.S
index 1a539dbbf016..18e9666f73ed 100644
--- a/sys/arch/mips/mips/lock_stubs.S
+++ b/sys/arch/mips/mips/lock_stubs.S
@@ -1,4 +1,4 @@
-/*	$NetBSD: lock_stubs.S,v 1.2 2007/02/09 21:55:06 ad Exp $	*/
+/*	$NetBSD: lock_stubs.S,v 1.3 2007/02/19 22:04:07 simonb Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -49,17 +49,17 @@
 #define	FULL
 #endif
 
-#ifdef MIPS64
+#if defined(__mips_n32) || defined(_LP64)
 #define	LL	lld
 #define	SC	scd
 #define	LDPTR	ld
 #define	STPTR	sd
-#else
+#else /* !(n32 || LP64) */
 #define	LL	ll
 #define	SC	sc
 #define	LDPTR	lw
 #define	STPTR	sw
-#endif
+#endif /* !(n32 || LP64) */
 
 #if MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR)
 #define	SYNC		sync
@@ -69,9 +69,9 @@
 #define	BDSYNC		nop
 #endif	/* MIPS_HAS_LLSC != 0 && defined(MULTIPROCESSOR) */
 
-#ifndef MIPS64
+#if !(defined(__mips_n32) || defined(_LP64))
 STRONG_ALIAS(_lock_cas4, _lock_cas)
-#endif	/* MIPS64 */
+#endif	/* !(n32 || LP64) */
 
 STRONG_ALIAS(mb_read, mb_memory)
 STRONG_ALIAS(mb_write, mb_memory)
@@ -109,7 +109,7 @@ LEAF(_lock_cas)
 	 addu	v0, zero, zero
 END(_lock_cas)
 
-#ifdef MIPS64
+#if defined(__mips_n32) || defined(_LP64)
 /*
  * int _lock_cas4(uint32_t *val, uint32_t old, uint32_t new);
  */
@@ -128,7 +128,7 @@ LEAF(_lock_cas4)
 	j	ra
 	 addu	v0, zero, zero
 END(_lock_cas4)
-#endif	/* MIPS64 */
+#endif	/* n32 || LP64 */
 
 #ifndef LOCKDEBUG