Module Name: src
Committed By: simonb
Date: Sat Jan 9 11:49:17 UTC 2010
Modified Files:
src/sys/arch/mips/mips: lock_stubs.S
Log Message:
Don't always use ".set mips3" - that explicitly uses 64-bit instructions
and we may be on a 32-bit CPU. Instead use .set mips3/mips32/mips64
depending on current build arch.
Should fix boot problems on a Alchemy CPU reported by KIYOHARA Takashi
on port-mips.
A couple of niggles/concerns:
* XXX Clean up with a macro? Same code fragment is in mipsX_subr.S too.
* XXX Key off build abi instead of processor type?
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mips/mips/lock_stubs.S
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/mips/lock_stubs.S
diff -u src/sys/arch/mips/mips/lock_stubs.S:1.10 src/sys/arch/mips/mips/lock_stubs.S:1.11
--- src/sys/arch/mips/mips/lock_stubs.S:1.10 Mon Dec 14 00:46:06 2009
+++ src/sys/arch/mips/mips/lock_stubs.S Sat Jan 9 11:49:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs.S,v 1.10 2009/12/14 00:46:06 matt Exp $ */
+/* $NetBSD: lock_stubs.S,v 1.11 2010/01/09 11:49:16 simonb Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -53,7 +53,23 @@
#if MIPS_HAS_LLSC != 0
+/*
+ * Set ISA level for the assembler.
+ * XXX Clean up with a macro? Same code fragment is in mipsX_subr.S too.
+ * XXX Key off build abi instead of processor type?
+ */
+#if defined(MIPS3)
.set mips3
+#endif
+
+#if defined(MIPS32)
+ .set mips32
+#endif
+
+#if defined(MIPS64)
+ .set mips64
+#endif
+
.set noreorder
.set noat
