Module Name: src
Committed By: cliff
Date: Sat Dec 12 19:08:57 UTC 2009
Modified Files:
src/lib/libc/arch/mips/gen [matt-nb5-mips64]: _setjmp.S setjmp.S
Log Message:
#ifndef SOFTFLOAT_FOR_GCC around blocks of FP code.
To generate a diff of this commit:
cvs rdiff -u -r1.20.34.2 -r1.20.34.3 src/lib/libc/arch/mips/gen/_setjmp.S
cvs rdiff -u -r1.17.34.2 -r1.17.34.3 src/lib/libc/arch/mips/gen/setjmp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/mips/gen/_setjmp.S
diff -u src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.2 src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.3
--- src/lib/libc/arch/mips/gen/_setjmp.S:1.20.34.2 Tue Aug 18 06:49:17 2009
+++ src/lib/libc/arch/mips/gen/_setjmp.S Sat Dec 12 19:08:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: _setjmp.S,v 1.20.34.2 2009/08/18 06:49:17 matt Exp $ */
+/* $NetBSD: _setjmp.S,v 1.20.34.3 2009/12/12 19:08:57 cliff Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -46,7 +46,7 @@
#if 0
RCSID("from: @(#)_setjmp.s 8.1 (Berkeley) 6/4/93")
#else
- RCSID("$NetBSD: _setjmp.S,v 1.20.34.2 2009/08/18 06:49:17 matt Exp $")
+ RCSID("$NetBSD: _setjmp.S,v 1.20.34.3 2009/12/12 19:08:57 cliff Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -88,6 +88,7 @@
* In N64, FP registers F23 .. F31 are callee-saved.
* In O32, FP registers F20 .. F23 are callee-saved.
*/
+#ifndef SOFTFLOAT_FOR_GCC
#if defined(__mips_n64) || defined(__mips_n32)
FP_S $f30, _OFFSETOF_SC_FPREGS_F30(a0)
FP_S $f28, _OFFSETOF_SC_FPREGS_F28(a0)
@@ -108,6 +109,7 @@
FP_S $f29, _OFFSETOF_SC_FPREGS_F29(a0)
FP_S $f31, _OFFSETOF_SC_FPREGS_F31(a0)
#endif
+#endif /* SOFTFLOAT_FOR_GCC */
INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
REG_EPILOGUE
@@ -147,6 +149,7 @@
* In N64, FP registers F23 .. F31 are callee-saved.
* In O32, FP registers F20 .. F23 are callee-saved.
*/
+#ifndef SOFTFLOAT_FOR_GCC
#if defined(__mips_n64) || defined(__mips_n32)
FP_L $f30, _OFFSETOF_SC_FPREGS_F30(a0)
FP_L $f28, _OFFSETOF_SC_FPREGS_F28(a0)
@@ -167,6 +170,7 @@
FP_L $f29, _OFFSETOF_SC_FPREGS_F29(a0)
FP_L $f31, _OFFSETOF_SC_FPREGS_F31(a0)
#endif
+#endif /* SOFTFLOAT_FOR_GCC */
REG_EPILOGUE
REG_L v0, _OFFSETOF_SC_REGS_V0(a0)
Index: src/lib/libc/arch/mips/gen/setjmp.S
diff -u src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.2 src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.3
--- src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.2 Tue Aug 18 06:52:09 2009
+++ src/lib/libc/arch/mips/gen/setjmp.S Sat Dec 12 19:08:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.17.34.2 2009/08/18 06:52:09 matt Exp $ */
+/* $NetBSD: setjmp.S,v 1.17.34.3 2009/12/12 19:08:57 cliff Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
#if 0
RCSID("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93")
#else
- RCSID("$NetBSD: setjmp.S,v 1.17.34.2 2009/08/18 06:52:09 matt Exp $")
+ RCSID("$NetBSD: setjmp.S,v 1.17.34.3 2009/12/12 19:08:57 cliff Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -115,6 +115,7 @@
INT_S v0, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 1
cfc1 v0, $31
INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
+#ifndef SOFTFLOAT_FOR_GCC
#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
FP_S $f20, _OFFSETOF_SC_FPREGS_F20(a0)
FP_S $f22, _OFFSETOF_SC_FPREGS_F22(a0)
@@ -135,6 +136,7 @@
FP_S $f29, _OFFSETOF_SC_FPREGS_F29(a0)
FP_S $f31, _OFFSETOF_SC_FPREGS_F31(a0)
#endif
+#endif /* SOFTFLOAT_FOR_GCC */
REG_EPILOGUE
j ra
move v0, zero
