[src/trunk]: src/common/lib/libc/arch/mips/gen Don't rename bswap{16, 32} if e...

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

details:   https://anonhg.NetBSD.org/src/rev/443c7279f8c9
branches:  trunk
changeset: 588128:443c7279f8c9
user:      simonb <simonb%NetBSD.org@localhost>
date:      Wed Feb 08 21:52:36 2006 +0000

description:
Don't rename bswap{16,32} if either _KERNEL or _STANDALONE are defined,
instead of just if _KERNEL was defined.
Fixes sbmips bootblocks build problems.
Thanks to Valeriy Ushakov for showing me where the problem was.

diffstat:

 common/lib/libc/arch/mips/gen/byte_swap_2.S |  6 +++---
 common/lib/libc/arch/mips/gen/byte_swap_4.S |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r 1e7d90a82080 -r 443c7279f8c9 common/lib/libc/arch/mips/gen/byte_swap_2.S
--- a/common/lib/libc/arch/mips/gen/byte_swap_2.S       Wed Feb 08 21:42:45 2006 +0000
+++ b/common/lib/libc/arch/mips/gen/byte_swap_2.S       Wed Feb 08 21:52:36 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_2.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */
+/*     $NetBSD: byte_swap_2.S,v 1.2 2006/02/08 21:52:36 simonb Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -36,14 +36,14 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
        ASMSTR("from: @(#)htons.s       8.1 (Berkeley) 6/4/93")
-       ASMSTR("$NetBSD: byte_swap_2.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       ASMSTR("$NetBSD: byte_swap_2.S,v 1.2 2006/02/08 21:52:36 simonb Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 #undef _LOCORE
 #define _LOCORE                /* XXX not really, just assembly-code source */
 #include <machine/endian.h>
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_STANDALONE)
 #define        BSWAP16_NAME    bswap16
 #else
 #ifdef __ABICALLS__
diff -r 1e7d90a82080 -r 443c7279f8c9 common/lib/libc/arch/mips/gen/byte_swap_4.S
--- a/common/lib/libc/arch/mips/gen/byte_swap_4.S       Wed Feb 08 21:42:45 2006 +0000
+++ b/common/lib/libc/arch/mips/gen/byte_swap_4.S       Wed Feb 08 21:52:36 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_4.S,v 1.1 2005/12/20 19:28:49 christos Exp $ */
+/*     $NetBSD: byte_swap_4.S,v 1.2 2006/02/08 21:52:36 simonb Exp $   */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -36,14 +36,14 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
        ASMSTR("from: @(#)htonl.s       8.1 (Berkeley) 6/4/93")
-       ASMSTR("$NetBSD: byte_swap_4.S,v 1.1 2005/12/20 19:28:49 christos Exp $")
+       ASMSTR("$NetBSD: byte_swap_4.S,v 1.2 2006/02/08 21:52:36 simonb Exp $")
 #endif /* LIBC_SCCS and not lint */
 
 #undef _LOCORE
 #define _LOCORE                /* XXX not really, just assembly-code source */
 #include <machine/endian.h>
 
-#ifdef _KERNEL
+#if defined(_KERNEL) || defined(_STANDALONE)
 #define        BSWAP32_NAME    bswap32
 #else
 #ifdef __ABICALLS__