Mercurial > hg > octave-lojdl > gnulib-hg
changeset 15940:564c0603a942
cosl: Simplify for platforms where 'long double' == 'double'.
* lib/cosl.c (cosl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New alternative
implementation.
* m4/cosl.m4 (gl_FUNC_COSL): Require gl_LONG_DOUBLE_VS_DOUBLE.
Determine COSL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
* modules/cosl (Depends-on): Add cos. Update conditions.
(configure.ac): Don't compile sincosl.c and trigl.c if
HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 11 Oct 2011 02:55:56 +0200 |
parents | 76734739cce2 |
children | 83c276c24d2a |
files | ChangeLog lib/cosl.c m4/cosl.m4 modules/cosl |
diffstat | 4 files changed, 59 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2011-10-10 Bruno Haible <bruno@clisp.org> + + cosl: Simplify for platforms where 'long double' == 'double'. + * lib/cosl.c (cosl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New alternative + implementation. + * m4/cosl.m4 (gl_FUNC_COSL): Require gl_LONG_DOUBLE_VS_DOUBLE. + Determine COSL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE. + * modules/cosl (Depends-on): Add cos. Update conditions. + (configure.ac): Don't compile sincosl.c and trigl.c if + HAVE_SAME_LONG_DOUBLE_AS_DOUBLE. + 2011-10-10 Bruno Haible <bruno@clisp.org> sinl: Simplify for platforms where 'long double' == 'double'.
--- a/lib/cosl.c +++ b/lib/cosl.c @@ -18,6 +18,16 @@ /* Specification. */ #include <math.h> +#if HAVE_SAME_LONG_DOUBLE_AS_DOUBLE + +long double +cosl (long double x) +{ + return cos (x); +} + +#else + /* sinl(x) * Return sine function of x. * @@ -49,7 +59,7 @@ * TRIG(x) returns trig(x) nearly rounded */ -#include "trigl.h" +# include "trigl.h" long double cosl (long double x) @@ -88,6 +98,8 @@ } } +#endif + #if 0 int main (void)
--- a/m4/cosl.m4 +++ b/m4/cosl.m4 @@ -1,4 +1,4 @@ -# cosl.m4 serial 5 +# cosl.m4 serial 6 dnl Copyright (C) 2010-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,6 +7,8 @@ AC_DEFUN([gl_FUNC_COSL], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) + AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE]) + dnl Persuade glibc <math.h> to declare cosl(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) @@ -56,24 +58,29 @@ HAVE_DECL_COSL=0 HAVE_COSL=0 dnl Find libraries needed to link lib/cosl.c, lib/sincosl.c, lib/trigl.c. - AC_REQUIRE([gl_FUNC_ISNANL]) - AC_REQUIRE([gl_FUNC_FLOOR]) - AC_REQUIRE([gl_FUNC_FLOORL]) - dnl Append $ISNANL_LIBM to COSL_LIBM, avoiding gratuitous duplicates. - case " $COSL_LIBM " in - *" $ISNANL_LIBM "*) ;; - *) COSL_LIBM="$COSL_LIBM $ISNANL_LIBM" ;; - esac - dnl Append $FLOOR_LIBM to COSL_LIBM, avoiding gratuitous duplicates. - case " $COSL_LIBM " in - *" $FLOOR_LIBM "*) ;; - *) COSL_LIBM="$COSL_LIBM $FLOOR_LIBM" ;; - esac - dnl Append $FLOORL_LIBM to COSL_LIBM, avoiding gratuitous duplicates. - case " $COSL_LIBM " in - *" $FLOORL_LIBM "*) ;; - *) COSL_LIBM="$COSL_LIBM $FLOORL_LIBM" ;; - esac + if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then + AC_REQUIRE([gl_FUNC_COS]) + COSL_LIBM="$COS_LIBM" + else + AC_REQUIRE([gl_FUNC_ISNANL]) + AC_REQUIRE([gl_FUNC_FLOOR]) + AC_REQUIRE([gl_FUNC_FLOORL]) + dnl Append $ISNANL_LIBM to COSL_LIBM, avoiding gratuitous duplicates. + case " $COSL_LIBM " in + *" $ISNANL_LIBM "*) ;; + *) COSL_LIBM="$COSL_LIBM $ISNANL_LIBM" ;; + esac + dnl Append $FLOOR_LIBM to COSL_LIBM, avoiding gratuitous duplicates. + case " $COSL_LIBM " in + *" $FLOOR_LIBM "*) ;; + *) COSL_LIBM="$COSL_LIBM $FLOOR_LIBM" ;; + esac + dnl Append $FLOORL_LIBM to COSL_LIBM, avoiding gratuitous duplicates. + case " $COSL_LIBM " in + *" $FLOORL_LIBM "*) ;; + *) COSL_LIBM="$COSL_LIBM $FLOORL_LIBM" ;; + esac + fi fi AC_SUBST([COSL_LIBM]) ])
--- a/modules/cosl +++ b/modules/cosl @@ -11,17 +11,20 @@ Depends-on: math extensions -float [test $HAVE_COSL = 0] -isnanl [test $HAVE_COSL = 0] -floor [test $HAVE_COSL = 0] -floorl [test $HAVE_COSL = 0] +cos [test $HAVE_COSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1] +float [test $HAVE_COSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +isnanl [test $HAVE_COSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +floor [test $HAVE_COSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] +floorl [test $HAVE_COSL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0] configure.ac: gl_FUNC_COSL if test $HAVE_COSL = 0; then AC_LIBOBJ([cosl]) - AC_LIBOBJ([sincosl]) - AC_LIBOBJ([trigl]) + if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0; then + AC_LIBOBJ([sincosl]) + AC_LIBOBJ([trigl]) + fi fi gl_MATH_MODULE_INDICATOR([cosl])