From 25363975c46ac4e3b6c0dfe16b64ecff794a519d Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 14 Dec 1995 02:45:15 +0000 Subject: [PATCH] from netbsd: Changed w_gamma.c, w_gamma_r.c, w_gammaf.c, w_gammaf_r.c to call __ieee754_lgamma_r or __ieee754_lgammaf_r. Removed e_gamma.c, e_gamma_r.c, e_gammaf.c, e_gammaf_r.c, e_lgamma.c, e_lgamma_f.c. --- lib/libm/Makefile | 9 ++++---- lib/libm/arch/i387/s_ilogb.S | 2 +- lib/libm/arch/i387/s_ilogbf.S | 2 +- lib/libm/src/e_gamma.c | 37 --------------------------------- lib/libm/src/e_gamma_r.c | 35 ------------------------------- lib/libm/src/e_gammaf.c | 39 ----------------------------------- lib/libm/src/e_gammaf_r.c | 38 ---------------------------------- lib/libm/src/e_lgamma.c | 36 -------------------------------- lib/libm/src/e_lgammaf.c | 39 ----------------------------------- lib/libm/src/w_gamma.c | 6 +++--- lib/libm/src/w_gamma_r.c | 6 +++--- lib/libm/src/w_gammaf.c | 6 +++--- lib/libm/src/w_gammaf_r.c | 6 +++--- 13 files changed, 18 insertions(+), 243 deletions(-) delete mode 100644 lib/libm/src/e_gamma.c delete mode 100644 lib/libm/src/e_gamma_r.c delete mode 100644 lib/libm/src/e_gammaf.c delete mode 100644 lib/libm/src/e_gammaf_r.c delete mode 100644 lib/libm/src/e_lgamma.c delete mode 100644 lib/libm/src/e_lgammaf.c diff --git a/lib/libm/Makefile b/lib/libm/Makefile index dcfcd9fa712..2dc47978fe9 100644 --- a/lib/libm/Makefile +++ b/lib/libm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 1995/10/10 23:43:31 ragge Exp $ +# $NetBSD: Makefile,v 1.28 1995/11/20 22:06:19 jtc Exp $ # # @(#)Makefile 5.1beta 93/09/24 # @@ -75,10 +75,9 @@ CFLAGS+= -D_MULTI_LIBM -D_POSIX_MODE LIB= m COMMON_SRCS = e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \ e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \ - e_expf.c e_fmod.c e_fmodf.c e_gamma.c e_gamma_r.c e_gammaf.c \ - e_gammaf_r.c e_hypot.c e_hypotf.c e_j0.c e_j0f.c e_j1.c e_j1f.c \ - e_jn.c e_jnf.c e_lgamma.c e_lgamma_r.c e_lgammaf.c e_lgammaf_r.c \ - e_log.c e_log10.c e_log10f.c e_logf.c e_pow.c e_powf.c e_rem_pio2.c \ + e_expf.c e_fmod.c e_fmodf.c e_hypot.c e_hypotf.c e_j0.c e_j0f.c \ + e_j1.c e_j1f.c e_jn.c e_jnf.c e_lgamma_r.c e_lgammaf_r.c e_log.c \ + e_log10.c e_log10f.c e_logf.c e_pow.c e_powf.c e_rem_pio2.c \ e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c e_scalbf.c \ e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c \ k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \ diff --git a/lib/libm/arch/i387/s_ilogb.S b/lib/libm/arch/i387/s_ilogb.S index 9fc9655aa24..6abb58a7fc8 100644 --- a/lib/libm/arch/i387/s_ilogb.S +++ b/lib/libm/arch/i387/s_ilogb.S @@ -5,7 +5,7 @@ #include -RCSID("$NetBSD: s_ilogb.S,v 1.4.2.1 1995/10/22 20:37:24 pk Exp $") +RCSID("$NetBSD: s_ilogb.S,v 1.5 1995/10/12 15:53:09 jtc Exp $") ENTRY(ilogb) pushl %ebp diff --git a/lib/libm/arch/i387/s_ilogbf.S b/lib/libm/arch/i387/s_ilogbf.S index 0785731a24e..a76082a6bdd 100644 --- a/lib/libm/arch/i387/s_ilogbf.S +++ b/lib/libm/arch/i387/s_ilogbf.S @@ -5,7 +5,7 @@ #include -RCSID("$NetBSD: s_ilogbf.S,v 1.3.2.1 1995/10/22 20:37:25 pk Exp $") +RCSID("$NetBSD: s_ilogbf.S,v 1.4 1995/10/22 20:32:43 pk Exp $") ENTRY(ilogbf) pushl %ebp diff --git a/lib/libm/src/e_gamma.c b/lib/libm/src/e_gamma.c deleted file mode 100644 index fbfeb7c045f..00000000000 --- a/lib/libm/src/e_gamma.c +++ /dev/null @@ -1,37 +0,0 @@ -/* @(#)e_gamma.c 5.1 93/09/24 */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - * - */ - -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: e_gamma.c,v 1.6 1995/05/10 20:45:11 jtc Exp $"; -#endif - -/* __ieee754_gamma(x) - * Return the logarithm of the Gamma function of x. - * - * Method: call __ieee754_gamma_r - */ - -#include "math.h" -#include "math_private.h" - -extern int signgam; - -#ifdef __STDC__ - double __ieee754_gamma(double x) -#else - double __ieee754_gamma(x) - double x; -#endif -{ - return __ieee754_gamma_r(x,&signgam); -} diff --git a/lib/libm/src/e_gamma_r.c b/lib/libm/src/e_gamma_r.c deleted file mode 100644 index 0f4468e77dd..00000000000 --- a/lib/libm/src/e_gamma_r.c +++ /dev/null @@ -1,35 +0,0 @@ -/* @(#)er_gamma.c 5.1 93/09/24 */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: e_gamma_r.c,v 1.6 1995/05/10 20:45:13 jtc Exp $"; -#endif - -/* __ieee754_gamma_r(x, signgamp) - * Reentrant version of the logarithm of the Gamma function - * with user provide pointer for the sign of Gamma(x). - * - * Method: See __ieee754_lgamma_r - */ - -#include "math.h" -#include "math_private.h" - -#ifdef __STDC__ - double __ieee754_gamma_r(double x, int *signgamp) -#else - double __ieee754_gamma_r(x,signgamp) - double x; int *signgamp; -#endif -{ - return __ieee754_lgamma_r(x,signgamp); -} diff --git a/lib/libm/src/e_gammaf.c b/lib/libm/src/e_gammaf.c deleted file mode 100644 index c51f02229a3..00000000000 --- a/lib/libm/src/e_gammaf.c +++ /dev/null @@ -1,39 +0,0 @@ -/* e_gammaf.c -- float version of e_gamma.c. - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ - -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: e_gammaf.c,v 1.3 1995/05/10 20:45:15 jtc Exp $"; -#endif - -/* __ieee754_gammaf(x) - * Return the logarithm of the Gamma function of x. - * - * Method: call __ieee754_gammaf_r - */ - -#include "math.h" -#include "math_private.h" - -extern int signgam; - -#ifdef __STDC__ - float __ieee754_gammaf(float x) -#else - float __ieee754_gammaf(x) - float x; -#endif -{ - return __ieee754_gammaf_r(x,&signgam); -} diff --git a/lib/libm/src/e_gammaf_r.c b/lib/libm/src/e_gammaf_r.c deleted file mode 100644 index 6ab5dd32967..00000000000 --- a/lib/libm/src/e_gammaf_r.c +++ /dev/null @@ -1,38 +0,0 @@ -/* e_gammaf_r.c -- float version of e_gamma_r.c. - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ - -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: e_gammaf_r.c,v 1.3 1995/05/10 20:45:16 jtc Exp $"; -#endif - -/* __ieee754_gammaf_r(x, signgamp) - * Reentrant version of the logarithm of the Gamma function - * with user provide pointer for the sign of Gamma(x). - * - * Method: See __ieee754_lgammaf_r - */ - -#include "math.h" -#include "math_private.h" - -#ifdef __STDC__ - float __ieee754_gammaf_r(float x, int *signgamp) -#else - float __ieee754_gammaf_r(x,signgamp) - float x; int *signgamp; -#endif -{ - return __ieee754_lgammaf_r(x,signgamp); -} diff --git a/lib/libm/src/e_lgamma.c b/lib/libm/src/e_lgamma.c deleted file mode 100644 index ae91f28e6d4..00000000000 --- a/lib/libm/src/e_lgamma.c +++ /dev/null @@ -1,36 +0,0 @@ -/* @(#)e_lgamma.c 5.1 93/09/24 */ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: e_lgamma.c,v 1.6 1995/05/10 20:45:39 jtc Exp $"; -#endif - -/* __ieee754_lgamma(x) - * Return the logarithm of the Gamma function of x. - * - * Method: call __ieee754_lgamma_r - */ - -#include "math.h" -#include "math_private.h" - -extern int signgam; - -#ifdef __STDC__ - double __ieee754_lgamma(double x) -#else - double __ieee754_lgamma(x) - double x; -#endif -{ - return __ieee754_lgamma_r(x,&signgam); -} diff --git a/lib/libm/src/e_lgammaf.c b/lib/libm/src/e_lgammaf.c deleted file mode 100644 index 72d035c6ce5..00000000000 --- a/lib/libm/src/e_lgammaf.c +++ /dev/null @@ -1,39 +0,0 @@ -/* e_lgammaf.c -- float version of e_lgamma.c. - * Conversion to float by Ian Lance Taylor, Cygnus Support, ian@cygnus.com. - */ - -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -#if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: e_lgammaf.c,v 1.3 1995/05/10 20:45:45 jtc Exp $"; -#endif - -/* __ieee754_lgammaf(x) - * Return the logarithm of the Gamma function of x. - * - * Method: call __ieee754_lgammaf_r - */ - -#include "math.h" -#include "math_private.h" - -extern int signgam; - -#ifdef __STDC__ - float __ieee754_lgammaf(float x) -#else - float __ieee754_lgammaf(x) - float x; -#endif -{ - return __ieee754_lgammaf_r(x,&signgam); -} diff --git a/lib/libm/src/w_gamma.c b/lib/libm/src/w_gamma.c index 4979843a375..59fe8f64009 100644 --- a/lib/libm/src/w_gamma.c +++ b/lib/libm/src/w_gamma.c @@ -11,7 +11,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: w_gamma.c,v 1.6 1995/05/10 20:49:00 jtc Exp $"; +static char rcsid[] = "$NetBSD: w_gamma.c,v 1.7 1995/11/20 22:06:43 jtc Exp $"; #endif /* double gamma(double x) @@ -33,10 +33,10 @@ extern int signgam; #endif { #ifdef _IEEE_LIBM - return __ieee754_gamma_r(x,&signgam); + return __ieee754_lgamma_r(x,&signgam); #else double y; - y = __ieee754_gamma_r(x,&signgam); + y = __ieee754_lgamma_r(x,&signgam); if(_LIB_VERSION == _IEEE_) return y; if(!finite(y)&&finite(x)) { if(floor(x)==x&&x<=0.0) diff --git a/lib/libm/src/w_gamma_r.c b/lib/libm/src/w_gamma_r.c index 26aeb77a101..b0ed3c1b411 100644 --- a/lib/libm/src/w_gamma_r.c +++ b/lib/libm/src/w_gamma_r.c @@ -11,7 +11,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.6 1995/05/10 20:49:02 jtc Exp $"; +static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.7 1995/11/20 22:06:45 jtc Exp $"; #endif /* @@ -30,10 +30,10 @@ static char rcsid[] = "$NetBSD: w_gamma_r.c,v 1.6 1995/05/10 20:49:02 jtc Exp $" #endif { #ifdef _IEEE_LIBM - return __ieee754_gamma_r(x,signgamp); + return __ieee754_lgamma_r(x,signgamp); #else double y; - y = __ieee754_gamma_r(x,signgamp); + y = __ieee754_lgamma_r(x,signgamp); if(_LIB_VERSION == _IEEE_) return y; if(!finite(y)&&finite(x)) { if(floor(x)==x&&x<=0.0) diff --git a/lib/libm/src/w_gammaf.c b/lib/libm/src/w_gammaf.c index 4c4046ae635..ecc2be2d615 100644 --- a/lib/libm/src/w_gammaf.c +++ b/lib/libm/src/w_gammaf.c @@ -14,7 +14,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.3 1995/05/10 20:49:04 jtc Exp $"; +static char rcsid[] = "$NetBSD: w_gammaf.c,v 1.4 1995/11/20 22:06:48 jtc Exp $"; #endif #include "math.h" @@ -30,10 +30,10 @@ extern int signgam; #endif { #ifdef _IEEE_LIBM - return __ieee754_gammaf_r(x,&signgam); + return __ieee754_lgammaf_r(x,&signgam); #else float y; - y = __ieee754_gammaf_r(x,&signgam); + y = __ieee754_lgammaf_r(x,&signgam); if(_LIB_VERSION == _IEEE_) return y; if(!finitef(y)&&finitef(x)) { if(floorf(x)==x&&x<=(float)0.0) diff --git a/lib/libm/src/w_gammaf_r.c b/lib/libm/src/w_gammaf_r.c index 37943492220..2425447f4dc 100644 --- a/lib/libm/src/w_gammaf_r.c +++ b/lib/libm/src/w_gammaf_r.c @@ -14,7 +14,7 @@ */ #if defined(LIBM_SCCS) && !defined(lint) -static char rcsid[] = "$NetBSD: w_gammaf_r.c,v 1.3 1995/05/10 20:49:05 jtc Exp $"; +static char rcsid[] = "$NetBSD: w_gammaf_r.c,v 1.4 1995/11/20 22:06:50 jtc Exp $"; #endif /* @@ -33,10 +33,10 @@ static char rcsid[] = "$NetBSD: w_gammaf_r.c,v 1.3 1995/05/10 20:49:05 jtc Exp $ #endif { #ifdef _IEEE_LIBM - return __ieee754_gammaf_r(x,signgamp); + return __ieee754_lgammaf_r(x,signgamp); #else float y; - y = __ieee754_gammaf_r(x,signgamp); + y = __ieee754_lgammaf_r(x,signgamp); if(_LIB_VERSION == _IEEE_) return y; if(!finitef(y)&&finitef(x)) { if(floorf(x)==x&&x<=(float)0.0) -- 2.20.1