[src/trunk]: src/sys/lib/libkern Update from libc.

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

details:   https://anonhg.NetBSD.org/src/rev/8ed9de6c31e2
branches:  trunk
changeset: 500470:8ed9de6c31e2
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Tue Dec 12 17:44:04 2000 +0000

description:
Update from libc.

diffstat:

 sys/lib/libkern/arch/arm32/byte_swap_2.S |  10 ++++------
 sys/lib/libkern/arch/arm32/byte_swap_4.S |  10 ++++------
 sys/lib/libkern/qdivrem.c                |  14 +++++++-------
 3 files changed, 15 insertions(+), 19 deletions(-)

diffs (88 lines):

diff -r 2c23a465672b -r 8ed9de6c31e2 sys/lib/libkern/arch/arm32/byte_swap_2.S
--- a/sys/lib/libkern/arch/arm32/byte_swap_2.S  Tue Dec 12 17:38:45 2000 +0000
+++ b/sys/lib/libkern/arch/arm32/byte_swap_2.S  Tue Dec 12 17:44:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_2.S,v 1.2 1999/01/22 09:17:47 mycroft Exp $  */
+/*     $NetBSD: byte_swap_2.S,v 1.3 2000/12/12 17:46:11 mycroft Exp $  */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -38,11 +38,9 @@
 
 #include <machine/asm.h>
 
-_BEGIN_ENTRY;
-_ENTRY(_C_FUNC(bswap16));
-_ENTRY(_C_FUNC(ntohs));
-_ENTRY(_C_FUNC(htons));
-_END_ENTRY
+ENTRY(__bswap16)
+ALTENTRY(ntohs)
+ALTENTRY(htons)
        and             r1, r0, #0xFF00
        mov             r0, r0, lsl #8
        orr             r0, r0, r1, lsr #8
diff -r 2c23a465672b -r 8ed9de6c31e2 sys/lib/libkern/arch/arm32/byte_swap_4.S
--- a/sys/lib/libkern/arch/arm32/byte_swap_4.S  Tue Dec 12 17:38:45 2000 +0000
+++ b/sys/lib/libkern/arch/arm32/byte_swap_4.S  Tue Dec 12 17:44:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: byte_swap_4.S,v 1.1 1999/01/15 13:31:29 bouyer Exp $   */
+/*     $NetBSD: byte_swap_4.S,v 1.2 2000/12/12 17:46:11 mycroft Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -38,11 +38,9 @@
 
 #include <machine/asm.h>
 
-_BEGIN_ENTRY;
-_ENTRY(_C_FUNC(bswap32));
-_ENTRY(_C_FUNC(ntohl));
-_ENTRY(_C_FUNC(htonl));
-_END_ENTRY
+ENTRY(__bswap32)
+ALTENTRY(ntohl)
+ALTENTRY(htonl)
        eor             r1, r0, r0, ror #16
        bic             r1, r1, #0x00FF0000
        mov             r0, r0, ror #8
diff -r 2c23a465672b -r 8ed9de6c31e2 sys/lib/libkern/qdivrem.c
--- a/sys/lib/libkern/qdivrem.c Tue Dec 12 17:38:45 2000 +0000
+++ b/sys/lib/libkern/qdivrem.c Tue Dec 12 17:44:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: qdivrem.c,v 1.7 1999/09/10 13:21:14 drochner Exp $     */
+/*     $NetBSD: qdivrem.c,v 1.8 2000/12/12 17:44:04 mycroft Exp $      */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -42,7 +42,7 @@
 #if 0
 static char sccsid[] = "@(#)qdivrem.c  8.1 (Berkeley) 6/4/93";
 #else
-__RCSID("$NetBSD: qdivrem.c,v 1.7 1999/09/10 13:21:14 drochner Exp $");
+__RCSID("$NetBSD: qdivrem.c,v 1.8 2000/12/12 17:44:04 mycroft Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -258,8 +258,8 @@
        if (arq) {
                if (d) {
                        for (i = m + n; i > m; --i)
-                               u[i] = ((u_long)u[i] >> d) |
-                                   LHALF((u_long)u[i - 1] << (HALF_BITS - d));
+                               u[i] = (digit)(((u_long)u[i] >> d) |
+                                   LHALF((u_long)u[i - 1] << (HALF_BITS - d)));
                        u[i] = 0;
                }
                tmp.ul[H] = COMBINE(uspace[1], uspace[2]);
@@ -283,7 +283,7 @@
        int i;
 
        for (i = 0; i < len; i++)
-               p[i] = LHALF((u_long)p[i] << sh) |
-                   (p[i + 1] >> (HALF_BITS - sh));
-       p[i] = (digit)LHALF(p[i] << sh);
+               p[i] = (digit)(LHALF((u_long)p[i] << sh) |
+                   ((u_long)p[i + 1] >> (HALF_BITS - sh)));
+       p[i] = (digit)(LHALF((u_long)p[i] << sh));
 }