Module Name: src
Committed By: matt
Date: Wed Feb 3 23:51:40 UTC 2010
Modified Files:
src/lib/libc/arch/mips/gen [matt-nb5-mips64]: setjmp.S
src/lib/libc/compat/arch/mips/gen [matt-nb5-mips64]: compat_setjmp.S
Log Message:
Cleanup #ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.17.34.5 -r1.17.34.6 src/lib/libc/arch/mips/gen/setjmp.S
cvs rdiff -u -r1.1.34.3 -r1.1.34.4 \
src/lib/libc/compat/arch/mips/gen/compat_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.17.34.5 src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.6
--- src/lib/libc/arch/mips/gen/setjmp.S:1.17.34.5 Wed Feb 3 23:46:47 2010
+++ src/lib/libc/arch/mips/gen/setjmp.S Wed Feb 3 23:51:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.S,v 1.17.34.5 2010/02/03 23:46:47 matt Exp $ */
+/* $NetBSD: setjmp.S,v 1.17.34.6 2010/02/03 23:51:40 matt 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.5 2010/02/03 23:46:47 matt Exp $")
+ RCSID("$NetBSD: setjmp.S,v 1.17.34.6 2010/02/03 23:51:40 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -111,13 +111,11 @@
REG_S gp, _OFFSETOF_SC_REGS_GP(a0)
REG_S sp, _OFFSETOF_SC_REGS_SP(a0)
REG_S s8, _OFFSETOF_SC_REGS_S8(a0)
-#ifndef SOFTFLOAT_FOR_GCC
+#ifdef SOFTFLOAT_FOR_GCC
+ INT_S zero, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 0
+#else
li v0, 1 # be nice if we could tell
INT_S v0, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 1
-#else
- INT_S zero, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 0
-#endif
-#ifndef SOFTFLOAT_FOR_GCC
cfc1 v0, $31
INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
Index: src/lib/libc/compat/arch/mips/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/mips/gen/compat_setjmp.S:1.1.34.3 src/lib/libc/compat/arch/mips/gen/compat_setjmp.S:1.1.34.4
--- src/lib/libc/compat/arch/mips/gen/compat_setjmp.S:1.1.34.3 Wed Jan 27 06:55:25 2010
+++ src/lib/libc/compat/arch/mips/gen/compat_setjmp.S Wed Feb 3 23:51:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.1.34.3 2010/01/27 06:55:25 matt Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.1.34.4 2010/02/03 23:51:39 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
#if 0
RCSID("from: @(#)setjmp.s 8.1 (Berkeley) 6/4/93")
#else
- RCSID("$NetBSD: compat_setjmp.S,v 1.1.34.3 2010/01/27 06:55:25 matt Exp $")
+ RCSID("$NetBSD: compat_setjmp.S,v 1.1.34.4 2010/02/03 23:51:39 matt Exp $")
#endif
#endif /* LIBC_SCCS and not lint */
@@ -111,9 +111,11 @@
REG_S gp, _OFFSETOF_SC_REGS_GP(a0)
REG_S sp, _OFFSETOF_SC_REGS_SP(a0)
REG_S s8, _OFFSETOF_SC_REGS_S8(a0)
+#if defined(SOFTFLOAT_FOR_GCC)
+ INT_S zero, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 0
+#else
li v0, 1 # be nice if we could tell
INT_S v0, _OFFSETOF_SC_FPUSED(a0) # sc_fpused = 1
-#if !defined(SOFTFLOAT_FOR_GCC)
cfc1 v0, $31
INT_S v0, _OFFSETOF_SC_FPREGS_FCSR(a0)
#if defined(__mips_o32) || defined(__mips_o64) || defined(__mips_n32)
