Module Name: src
Committed By: christos
Date: Fri Oct 7 11:10:44 UTC 2016
Modified Files:
src/lib/libc/arch/m68k/gen: Makefile.inc
src/lib/libc/arch/mips/gen: Makefile.inc
src/lib/libc/compat/gen: compat_modf_ieee754.c
Removed Files:
src/lib/libc/gen: ldexp_ieee754.c modf_ieee754.c
Log Message:
Sync with compat and remove dup implementations of ldexp and modf, switching
mips and m68k to the compat copies.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/arch/m68k/gen/Makefile.inc
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/arch/mips/gen/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/compat/gen/compat_modf_ieee754.c
cvs rdiff -u -r1.5 -r0 src/lib/libc/gen/ldexp_ieee754.c
cvs rdiff -u -r1.4 -r0 src/lib/libc/gen/modf_ieee754.c
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/m68k/gen/Makefile.inc
diff -u src/lib/libc/arch/m68k/gen/Makefile.inc:1.33 src/lib/libc/arch/m68k/gen/Makefile.inc:1.34
--- src/lib/libc/arch/m68k/gen/Makefile.inc:1.33 Tue Mar 18 14:20:37 2014
+++ src/lib/libc/arch/m68k/gen/Makefile.inc Fri Oct 7 07:10:44 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.33 2014/03/18 18:20:37 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.34 2016/10/07 11:10:44 christos Exp $
SRCS+= alloca.S fabs.S
@@ -32,7 +32,7 @@ CPPFLAGS._lwp.c += -D_LIBC_SOURCE
# much of the (soft)float and integer support that would
# otherwise be compiled here.
.if (${MACHINE_ARCH} == "m68000" || ${MKSOFTFLOAT} == "yes")
-SRCS+= modf_ieee754.c # generic ieee754 version
+SRCS+= compat_modf_ieee754.c # generic ieee754 version
SRCS+= flt_rounds_softfloat.S
.if ${MKSOFTFLOAT} != "yes"
SRCS+= fpfake.c
@@ -49,7 +49,7 @@ SRCS+= sigsetjmp.S
SRCS+= makecontext.c resumecontext.S swapcontext.S
-SRCS+= ldexp_ieee754.c # generic ieee754 version
+SRCS+= compat_ldexp_ieee754.c # generic ieee754 version
LSRCS.m68k.gen= Lint_bswap16.c Lint_bswap32.c Lint_bswap64.c \
Lint_resumecontext.c Lint_swapcontext.c
Index: src/lib/libc/arch/mips/gen/Makefile.inc
diff -u src/lib/libc/arch/mips/gen/Makefile.inc:1.34 src/lib/libc/arch/mips/gen/Makefile.inc:1.35
--- src/lib/libc/arch/mips/gen/Makefile.inc:1.34 Sun Jan 24 11:01:56 2016
+++ src/lib/libc/arch/mips/gen/Makefile.inc Fri Oct 7 07:10:44 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.34 2016/01/24 16:01:56 christos Exp $
+# $NetBSD: Makefile.inc,v 1.35 2016/10/07 11:10:44 christos Exp $
.if ${MKSOFTFLOAT} == "no"
SRCS+= fabs.S ldexp.S modf.S
.else
-SRCS+= fabs_ieee754.c ldexp_ieee754.c modf_ieee754.c
+SRCS+= fabs_ieee754.c compat_ldexp_ieee754.c compat_modf_ieee754.c
.endif
# Common ieee754 constants and functions
Index: src/lib/libc/compat/gen/compat_modf_ieee754.c
diff -u src/lib/libc/compat/gen/compat_modf_ieee754.c:1.4 src/lib/libc/compat/gen/compat_modf_ieee754.c:1.5
--- src/lib/libc/compat/gen/compat_modf_ieee754.c:1.4 Fri Apr 23 15:04:54 2010
+++ src/lib/libc/compat/gen/compat_modf_ieee754.c Fri Oct 7 07:10:44 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_modf_ieee754.c,v 1.4 2010/04/23 19:04:54 drochner Exp $ */
+/* $NetBSD: compat_modf_ieee754.c,v 1.5 2016/10/07 11:10:44 christos Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@@ -93,7 +93,7 @@ modf(double val, double *iptr)
frac = ((u_int64_t)v.dblu_dbl.dbl_frach << 32) + v.dblu_dbl.dbl_fracl;
frac >>= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS);
frac <<= DBL_FRACBITS - (u.dblu_dbl.dbl_exp - DBL_EXP_BIAS);
- v.dblu_dbl.dbl_fracl = (unsigned int)frac & 0xffffffff;
+ v.dblu_dbl.dbl_fracl = (unsigned int)(frac & 0xffffffffULL);
v.dblu_dbl.dbl_frach = (unsigned int)(frac >> 32);
*iptr = v.dblu_d;
