[src/trunk]: src/common/lib/libc/arch libc wants __bswapNN, kernel wants bswa...

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

details:   https://anonhg.NetBSD.org/src/rev/e8f42780ae41
branches:  trunk
changeset: 587997:e8f42780ae41
user:      uwe <uwe%NetBSD.org@localhost>
date:      Sat Feb 04 21:53:31 2006 +0000

description:
libc wants __bswapNN, kernel wants bswapNN.  That was not accounted
for during the merge of kernel and libc versions.  Fix to match
e.g. i386 code.

diffstat:

 common/lib/libc/arch/arm/gen/byte_swap_2.S    |  6 +++++-
 common/lib/libc/arch/arm/gen/byte_swap_4.S    |  6 +++++-
 common/lib/libc/arch/x86_64/gen/byte_swap_2.S |  8 ++++++--
 common/lib/libc/arch/x86_64/gen/byte_swap_4.S |  8 ++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diffs (85 lines):

diff -r 52c620f919f4 -r e8f42780ae41 common/lib/libc/arch/arm/gen/byte_swap_2.S
--- a/common/lib/libc/arch/arm/gen/byte_swap_2.S        Sat Feb 04 21:29:11 2006 +0000
+++ b/common/lib/libc/arch/arm/gen/byte_swap_2.S        Sat Feb 04 21:53:31 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/04 21:53:31 uwe Exp $      */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,7 +38,11 @@
 
 #include <machine/asm.h>
 
+#if defined(_KERNEL) || defined(_STANDALONE)
+_ENTRY(_C_LABEL(bswap16))
+#else
 _ENTRY(_C_LABEL(__bswap16))
+#endif
 _ENTRY(_C_LABEL(ntohs))
 _ENTRY(_C_LABEL(htons))
 _PROF_PROLOGUE
diff -r 52c620f919f4 -r e8f42780ae41 common/lib/libc/arch/arm/gen/byte_swap_4.S
--- a/common/lib/libc/arch/arm/gen/byte_swap_4.S        Sat Feb 04 21:29:11 2006 +0000
+++ b/common/lib/libc/arch/arm/gen/byte_swap_4.S        Sat Feb 04 21:53:31 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/04 21:53:31 uwe Exp $      */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,7 +38,11 @@
 
 #include <machine/asm.h>
 
+#if defined(_KERNEL) || defined(_STANDALONE)
+_ENTRY(_C_LABEL(bswap32))
+#else
 _ENTRY(_C_LABEL(__bswap32))
+#endif
 _ENTRY(_C_LABEL(ntohl))
 _ENTRY(_C_LABEL(htonl))
 _PROF_PROLOGUE
diff -r 52c620f919f4 -r e8f42780ae41 common/lib/libc/arch/x86_64/gen/byte_swap_2.S
--- a/common/lib/libc/arch/x86_64/gen/byte_swap_2.S     Sat Feb 04 21:29:11 2006 +0000
+++ b/common/lib/libc/arch/x86_64/gen/byte_swap_2.S     Sat Feb 04 21:53:31 2006 +0000
@@ -1,12 +1,16 @@
-/*     $NetBSD: byte_swap_2.S,v 1.1 2005/12/20 19:28:51 christos Exp $ */
+/*     $NetBSD: byte_swap_2.S,v 1.2 2006/02/04 21:53:31 uwe Exp $      */
 
 #include <machine/asm.h>
 
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: byte_swap_2.S,v 1.1 2005/12/20 19:28:51 christos Exp $")
+       RCSID("$NetBSD: byte_swap_2.S,v 1.2 2006/02/04 21:53:31 uwe Exp $")
 #endif
 
+#if defined(_KERNEL) || defined(_STANDALONE)
+_ENTRY(_C_LABEL(bswap16))
+#else
 _ENTRY(_C_LABEL(__bswap16))
+#endif
 _ENTRY(_C_LABEL(ntohs))
 _ENTRY(_C_LABEL(htons))
 _PROF_PROLOGUE
diff -r 52c620f919f4 -r e8f42780ae41 common/lib/libc/arch/x86_64/gen/byte_swap_4.S
--- a/common/lib/libc/arch/x86_64/gen/byte_swap_4.S     Sat Feb 04 21:29:11 2006 +0000
+++ b/common/lib/libc/arch/x86_64/gen/byte_swap_4.S     Sat Feb 04 21:53:31 2006 +0000
@@ -1,11 +1,15 @@
-/*     $NetBSD: byte_swap_4.S,v 1.1 2005/12/20 19:28:51 christos Exp $ */
+/*     $NetBSD: byte_swap_4.S,v 1.2 2006/02/04 21:53:31 uwe Exp $      */
 
 #include <machine/asm.h>
 #if defined(LIBC_SCCS)
-       RCSID("$NetBSD: byte_swap_4.S,v 1.1 2005/12/20 19:28:51 christos Exp $")
+       RCSID("$NetBSD: byte_swap_4.S,v 1.2 2006/02/04 21:53:31 uwe Exp $")
 #endif
 
+#if defined(_KERNEL) || defined(_STANDALONE)
+_ENTRY(_C_LABEL(bswap32))
+#else
 _ENTRY(_C_LABEL(__bswap32))
+#endif
 _ENTRY(_C_LABEL(ntohl))
 _ENTRY(_C_LABEL(htonl))
 _PROF_PROLOGUE