sinl: Simplify for platforms where 'long double' == 'double'.

* lib/sinl.c (sinl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New alternative
implementation.
* m4/sinl.m4 (gl_FUNC_SINL): Require gl_LONG_DOUBLE_VS_DOUBLE.
Determine SINL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
* modules/sinl (Depends-on): Add sin. Update conditions.
(configure.ac): Don't compile sincosl.c and trigl.c if
HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.

diff --git a/ChangeLog b/ChangeLog
index 7ca4425..d085207 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2011-10-10  Bruno Haible  <bruno@clisp.org>
 
+       sinl: Simplify for platforms where 'long double' == 'double'.
+       * lib/sinl.c (sinl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New alternative
+       implementation.
+       * m4/sinl.m4 (gl_FUNC_SINL): Require gl_LONG_DOUBLE_VS_DOUBLE.
+       Determine SINL_LIBM according to HAVE_SAME_LONG_DOUBLE_AS_DOUBLE.
+       * modules/sinl (Depends-on): Add sin. 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>
+
        logl: Simplify for platforms where 'long double' == 'double'.
        * lib/logl.c (logl) [HAVE_SAME_LONG_DOUBLE_AS_DOUBLE]: New alternative
        implementation.

diff --git a/lib/sinl.c b/lib/sinl.c
index b0106b4..3949e49 100644 (file)
--- a/lib/sinl.c
+++ b/lib/sinl.c
@@ -18,6 +18,16 @@
 /* Specification.  */
 #include <math.h>
 
+#if HAVE_SAME_LONG_DOUBLE_AS_DOUBLE
+
+long double
+sinl (long double x)
+{
+  return sin (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
 sinl (long double x)
@@ -88,6 +98,8 @@ sinl (long double x)
     }
 }
 
+#endif
+
 #if 0
 int
 main (void)

diff --git a/m4/sinl.m4 b/m4/sinl.m4
index 510c9b7..277dfdd 100644 (file)
--- a/m4/sinl.m4
+++ b/m4/sinl.m4
@@ -1,4 +1,4 @@
-# sinl.m4 serial 5
+# sinl.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 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_SINL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare sinl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -56,24 +58,29 @@ AC_DEFUN([gl_FUNC_SINL],
     HAVE_DECL_SINL=0
     HAVE_SINL=0
     dnl Find libraries needed to link lib/sinl.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 SINL_LIBM, avoiding gratuitous duplicates.
-    case " $SINL_LIBM " in
-      *" $ISNANL_LIBM "*) ;;
-      *) SINL_LIBM="$SINL_LIBM $ISNANL_LIBM" ;;
-    esac
-    dnl Append $FLOOR_LIBM to SINL_LIBM, avoiding gratuitous duplicates.
-    case " $SINL_LIBM " in
-      *" $FLOOR_LIBM "*) ;;
-      *) SINL_LIBM="$SINL_LIBM $FLOOR_LIBM" ;;
-    esac
-    dnl Append $FLOORL_LIBM to SINL_LIBM, avoiding gratuitous duplicates.
-    case " $SINL_LIBM " in
-      *" $FLOORL_LIBM "*) ;;
-      *) SINL_LIBM="$SINL_LIBM $FLOORL_LIBM" ;;
-    esac
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_SIN])
+      SINL_LIBM="$SIN_LIBM"
+    else
+      AC_REQUIRE([gl_FUNC_ISNANL])
+      AC_REQUIRE([gl_FUNC_FLOOR])
+      AC_REQUIRE([gl_FUNC_FLOORL])
+      dnl Append $ISNANL_LIBM to SINL_LIBM, avoiding gratuitous duplicates.
+      case " $SINL_LIBM " in
+        *" $ISNANL_LIBM "*) ;;
+        *) SINL_LIBM="$SINL_LIBM $ISNANL_LIBM" ;;
+      esac
+      dnl Append $FLOOR_LIBM to SINL_LIBM, avoiding gratuitous duplicates.
+      case " $SINL_LIBM " in
+        *" $FLOOR_LIBM "*) ;;
+        *) SINL_LIBM="$SINL_LIBM $FLOOR_LIBM" ;;
+      esac
+      dnl Append $FLOORL_LIBM to SINL_LIBM, avoiding gratuitous duplicates.
+      case " $SINL_LIBM " in
+        *" $FLOORL_LIBM "*) ;;
+        *) SINL_LIBM="$SINL_LIBM $FLOORL_LIBM" ;;
+      esac
+    fi
   fi
   AC_SUBST([SINL_LIBM])
 ])

diff --git a/modules/sinl b/modules/sinl
index 187f949..6ee7834 100644 (file)
--- a/modules/sinl
+++ b/modules/sinl
@@ -11,17 +11,20 @@ m4/sinl.m4
 Depends-on:
 math
 extensions
-float           [test $HAVE_SINL = 0]
-isnanl          [test $HAVE_SINL = 0]
-floor           [test $HAVE_SINL = 0]
-floorl          [test $HAVE_SINL = 0]
+sin             [test $HAVE_SINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1]
+float           [test $HAVE_SINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+isnanl          [test $HAVE_SINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+floor           [test $HAVE_SINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
+floorl          [test $HAVE_SINL = 0 && test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 0]
 
 configure.ac:
 gl_FUNC_SINL
 if test $HAVE_SINL = 0; then
   AC_LIBOBJ([sinl])
-  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([sinl])