Fix tests for common <math.h> functions.

diff --git a/ChangeLog b/ChangeLog
index f2a0c7b28831eb404ffe78fc811351e71139300f..89e1a31e907814940b170e3a535ac8b32735f203 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2010-01-24  Bruno Haible  <bruno@clisp.org>
+
+       Fix tests for common <math.h> functions.
+       * m4/mathfunc.m4 (gl_MATHFUNC): Take two additional parameters. Use a
+       code snippet that references the function pointer, rather than merely
+       calling the function. Substitute the FUNC_LIBM variable.
+       * m4/sqrt.m4 (gl_FUNC_SQRT): Update gl_MATHFUNC invocation.
+       * modules/acos (configure.ac): Likewise.
+       * modules/asin (configure.ac): Likewise.
+       * modules/atan (configure.ac): Likewise.
+       * modules/atan2 (configure.ac): Likewise.
+       * modules/cbrt (configure.ac): Likewise.
+       * modules/copysign (configure.ac): Likewise.
+       * modules/cos (configure.ac): Likewise.
+       * modules/cosh (configure.ac): Likewise.
+       * modules/erf (configure.ac): Likewise.
+       * modules/erfc (configure.ac): Likewise.
+       * modules/exp (configure.ac): Likewise.
+       * modules/fabs (configure.ac): Likewise.
+       * modules/fmod (configure.ac): Likewise.
+       * modules/hypot (configure.ac): Likewise.
+       * modules/j0 (configure.ac): Likewise.
+       * modules/j1 (configure.ac): Likewise.
+       * modules/jn (configure.ac): Likewise.
+       * modules/ldexp (configure.ac): Likewise.
+       * modules/lgamma (configure.ac): Likewise.
+       * modules/log (configure.ac): Likewise.
+       * modules/log10 (configure.ac): Likewise.
+       * modules/log1p (configure.ac): Likewise.
+       * modules/logb (configure.ac): Likewise.
+       * modules/modf (configure.ac): Likewise.
+       * modules/nextafter (configure.ac): Likewise.
+       * modules/pow (configure.ac): Likewise.
+       * modules/remainder (configure.ac): Likewise.
+       * modules/rint (configure.ac): Likewise.
+       * modules/sin (configure.ac): Likewise.
+       * modules/sinh (configure.ac): Likewise.
+       * modules/tan (configure.ac): Likewise.
+       * modules/tanh (configure.ac): Likewise.
+       * modules/y0 (configure.ac): Likewise.
+       * modules/y1 (configure.ac): Likewise.
+       * modules/yn (configure.ac): Likewise.
+
 2010-01-24  Bruno Haible  <bruno@clisp.org>
 
        Tests: Defeat inlining of math functions by GCC >= 4.3.0.

diff --git a/m4/mathfunc.m4 b/m4/mathfunc.m4
index 8d9d826f206aec587b01250c4b768e6eeacd3b9f..5e79d4581aa48add2b48f58b3f1ad8704e9cf865 100644 (file)
--- a/m4/mathfunc.m4
+++ b/m4/mathfunc.m4
@@ -1,15 +1,21 @@
-# mathfunc.m4 serial 1
+# mathfunc.m4 serial 2
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-# gl_MATHFUNC([sqrt])
-# tests whether the sqrt function is available in libc or libm. It sets
-# SQRT_LIBM to empty or "-lm" accordingly.
+# gl_MATHFUNC(FUNC, RETTYPE, PARAMTYPES)
+# --------------------------------------------------
+# tests whether the function FUNC is available in libc or libm.
+# RETTYPE is the return type. PARAMTYPES is a parameter list, with parentheses.
+# It sets FUNC_LIBM to empty or "-lm" accordingly.
 
 AC_DEFUN([gl_MATHFUNC],
 [
+  dnl We need the RETTYPE and PARAMTYPES in order to force linking with the
+  dnl function. With gcc >= 4.3 on glibc/x86_64, calls to the 'fabs' function
+  dnl are inlined by the compiler, therefore linking of these calls does not
+  dnl require -lm, but taking the function pointer of 'fabs' does.
   m4_pushdef([func], [$1])
   m4_pushdef([FUNC], [translit([$1],[abcdefghijklmnopqrstuvwxyz],
                                     [ABCDEFGHIJKLMNOPQRSTUVWXYZ])])
@@ -22,8 +28,8 @@ AC_DEFUN([gl_MATHFUNC],
                            # define __NO_MATH_INLINES 1 /* for glibc */
                            #endif
                            #include <math.h>
-                           double x;]],
-                         [[return ]func[ (x) > 2 || ]func[ (x) < 0.4;]])],
+                           $2 (*funcptr) $3 = ]func[;]],
+                         [[return 0;]])],
         [gl_cv_func_]func[_no_libm=yes],
         [gl_cv_func_]func[_no_libm=no])
     ])
@@ -38,8 +44,8 @@ AC_DEFUN([gl_MATHFUNC],
                              # define __NO_MATH_INLINES 1 /* for glibc */
                              #endif
                              #include <math.h>
-                             double x;]],
-                           [[return ]func[ (x) > 2 || ]func[ (x) < 0.4;]])],
+                             $2 (*funcptr) $3 = ]func[;]],
+                           [[return 0;]])],
           [gl_cv_func_]func[_in_libm=yes],
           [gl_cv_func_]func[_in_libm=no])
         LIBS="$save_LIBS"
@@ -48,6 +54,7 @@ AC_DEFUN([gl_MATHFUNC],
       FUNC[]_LIBM=-lm
     fi
   fi
+  AC_SUBST(FUNC[_LIBM])
   m4_popdef([FUNC])
   m4_popdef([func])
 ])

diff --git a/m4/sqrt.m4 b/m4/sqrt.m4
index 947389a927e53f3680223e5c76404a2e6002a1e1..d87648cc9f076b3d3e47df5f5ab5de2217f689b1 100644 (file)
--- a/m4/sqrt.m4
+++ b/m4/sqrt.m4
@@ -1,4 +1,4 @@
-# sqrt.m4 serial 1
+# sqrt.m4 serial 2
 dnl Copyright (C) 2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,5 +6,5 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_SQRT],
 [
-  gl_MATHFUNC([sqrt])
+  gl_MATHFUNC([sqrt], [double], [(double)])
 ])

diff --git a/modules/acos b/modules/acos
index 472fd7b1f575a856f132610119508f75a4d91262..8f03317c38dbdfb8b1a4ef3672d792339d3e0251 100644 (file)
--- a/modules/acos
+++ b/modules/acos
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([acos])
+gl_MATHFUNC([acos], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/asin b/modules/asin
index 1e42c0758bf40a226f04ed4a61e97b82c390e5d9..5bbef73a0c2770a4fdb64b5a23ddfaadb2764b93 100644 (file)
--- a/modules/asin
+++ b/modules/asin
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([asin])
+gl_MATHFUNC([asin], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/atan b/modules/atan
index 811d70e22f21c7c0b7bcafc5a673584c4d949a6d..fd1abe5efcf43cc842831cf081fdebcc393a3fc7 100644 (file)
--- a/modules/atan
+++ b/modules/atan
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([atan])
+gl_MATHFUNC([atan], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/atan2 b/modules/atan2
index fc312679737d326a33019e500a317e5605e173ee..22820a1f0420663bd3a43552dfdc973e8288f13f 100644 (file)
--- a/modules/atan2
+++ b/modules/atan2
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([atan2])
+gl_MATHFUNC([atan2], [double], [(double, double)])
 
 Makefile.am:
 

diff --git a/modules/cbrt b/modules/cbrt
index c88da5736fa5564c7c6b33bf17c16163262c891b..bcfb2936e00107b615696e1ff55f2514216f11b0 100644 (file)
--- a/modules/cbrt
+++ b/modules/cbrt
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([cbrt])
+gl_MATHFUNC([cbrt], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/copysign b/modules/copysign
index 6c919ae40c62ebf2b9074f016adae041a6fdf977..5318e80271f876ad42244fe9261e38db780eed34 100644 (file)
--- a/modules/copysign
+++ b/modules/copysign
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([copysign])
+gl_MATHFUNC([copysign], [double], [(double, double)])
 
 Makefile.am:
 

diff --git a/modules/cos b/modules/cos
index 77a4aca618d44233e12ff28cd9f885c8246c601f..5ed327d42e7fe3ef59044c04d237c2c6d056f46b 100644 (file)
--- a/modules/cos
+++ b/modules/cos
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([cos])
+gl_MATHFUNC([cos], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/cosh b/modules/cosh
index 4a9d71e7e8104e233ced56940fbd39a2772832a9..efaee3a03b82e1d6183e26df31a602368da518ed 100644 (file)
--- a/modules/cosh
+++ b/modules/cosh
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([cosh])
+gl_MATHFUNC([cosh], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/erf b/modules/erf
index 8315997f23b9fb879aad1b68a3dcc0b6b499748a..02243bdc72efc1312710386a9129ce2d754808f3 100644 (file)
--- a/modules/erf
+++ b/modules/erf
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([erf])
+gl_MATHFUNC([erf], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/erfc b/modules/erfc
index d2b8aed28ab286170c0bdd9ba0d876eacec8e5cc..5f93d8006df06543f1fb71ea6929d0e74e20f8e3 100644 (file)
--- a/modules/erfc
+++ b/modules/erfc
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([erfc])
+gl_MATHFUNC([erfc], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/exp b/modules/exp
index 51bbce306a0a1e6b5085ab00349075a38bf36468..6a7a6854e9b6a4d5aa9ca9cbef14ef7c99d9f9ed 100644 (file)
--- a/modules/exp
+++ b/modules/exp
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([exp])
+gl_MATHFUNC([exp], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/fabs b/modules/fabs
index b621c3f8f0631459805d7b0353744b988c6d4b41..8b70430e223646a47d4fa7e36ee84d8260f0aa24 100644 (file)
--- a/modules/fabs
+++ b/modules/fabs
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([fabs])
+gl_MATHFUNC([fabs], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/fmod b/modules/fmod
index 0862fe9d12a288276d9b73ba023575b039f42338..43997d8b25767c6a09daf11e10a6b0cecfc15522 100644 (file)
--- a/modules/fmod
+++ b/modules/fmod
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([fmod])
+gl_MATHFUNC([fmod], [double], [(double, double)])
 
 Makefile.am:
 

diff --git a/modules/hypot b/modules/hypot
index 3a58d28578cc2de7734d5e929d233133b7a0ea93..2c3f66ff2ba06d800085fa6f3609e5b618312ac0 100644 (file)
--- a/modules/hypot
+++ b/modules/hypot
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([hypot])
+gl_MATHFUNC([hypot], [double], [(double, double)])
 
 Makefile.am:
 

diff --git a/modules/j0 b/modules/j0
index 215180c1ff083a77beba6dd971db55a4685c9e5c..1dc9d44dd73766a7a2940f18e35afc7ffb191b98 100644 (file)
--- a/modules/j0
+++ b/modules/j0
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([j0])
+gl_MATHFUNC([j0], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/j1 b/modules/j1
index b2480c5f82d9fe760a258e7333047d322d43ba4a..d4e0b3cbe0fd79cc2436843c45d0e95a680ad1a6 100644 (file)
--- a/modules/j1
+++ b/modules/j1
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([j1])
+gl_MATHFUNC([j1], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/jn b/modules/jn
index 6eff0e34b1b2f9635ead1c8fb52da08751515e5c..ef8b418762aa42f4039a162424bd76b7566d45db 100644 (file)
--- a/modules/jn
+++ b/modules/jn
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([jn])
+gl_MATHFUNC([jn], [double], [(int, double)])
 
 Makefile.am:
 

diff --git a/modules/ldexp b/modules/ldexp
index eaa4a1321d7721bc8489ff938242904fa72fba79..20818ededd2899cafe940d7e091bfdcb24ea5eb7 100644 (file)
--- a/modules/ldexp
+++ b/modules/ldexp
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([ldexp])
+gl_MATHFUNC([ldexp], [double], [(double, int)])
 
 Makefile.am:
 

diff --git a/modules/lgamma b/modules/lgamma
index 5a2d53750022dbcdfb712bd5c5f9f2c10046791a..40cc49c3235f287e168f9b62a789752b9044dc6e 100644 (file)
--- a/modules/lgamma
+++ b/modules/lgamma
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([lgamma])
+gl_MATHFUNC([lgamma], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/log b/modules/log
index 5e7d8336a5af62debf83fa8db83a55a7a34ad74c..95279699fac4fa54212c9fbf619680d37d8f4c3b 100644 (file)
--- a/modules/log
+++ b/modules/log
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([log])
+gl_MATHFUNC([log], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/log10 b/modules/log10
index d3d8bbf56adc58bd39b0c7ae6f1d54fc335f6dab..bb857a277fb5cdf0f75456f7d7c1678685cf82c4 100644 (file)
--- a/modules/log10
+++ b/modules/log10
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([log10])
+gl_MATHFUNC([log10], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/log1p b/modules/log1p
index 7c006140cf60b53714e53166e8de2f74fc39bed6..6b387e206016f93ad5032bee90ea9da76037fb15 100644 (file)
--- a/modules/log1p
+++ b/modules/log1p
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([log1p])
+gl_MATHFUNC([log1p], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/logb b/modules/logb
index 0388803bcb60e7ba322e93e40613bbc1cceb9975..8816840d5400fd46b278ee2fc2fc5a130a929d02 100644 (file)
--- a/modules/logb
+++ b/modules/logb
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([logb])
+gl_MATHFUNC([logb], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/modf b/modules/modf
index a075374857240a3736caa8fd3b71622c02d81041..0c5e4677d79bc273440240ed15806fe344d4d76d 100644 (file)
--- a/modules/modf
+++ b/modules/modf
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([modf])
+gl_MATHFUNC([modf], [double], [(double, double *)])
 
 Makefile.am:
 

diff --git a/modules/nextafter b/modules/nextafter
index 8b6d4a72ca13f9b7f1aef2780c3071d1600373b3..ed93418b8bbcd98b7a6fccdb81f4d89790e0ba64 100644 (file)
--- a/modules/nextafter
+++ b/modules/nextafter
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([nextafter])
+gl_MATHFUNC([nextafter], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/pow b/modules/pow
index 8eead4847f0c03adb618b4d110376f6baad940dc..dbcc10c71e431e132f0984e8daa66ba7a4f37c6f 100644 (file)
--- a/modules/pow
+++ b/modules/pow
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([pow])
+gl_MATHFUNC([pow], [double], [(double, double)])
 
 Makefile.am:
 

diff --git a/modules/remainder b/modules/remainder
index 2d35318c0990bcef1894719fb66ca800ed666abe..9d25419f623b1ab8302e954bdce7aefecf55f9ee 100644 (file)
--- a/modules/remainder
+++ b/modules/remainder
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([remainder])
+gl_MATHFUNC([remainder], [double], [(double, double)])
 
 Makefile.am:
 

diff --git a/modules/rint b/modules/rint
index 304bcf57b40043831c44db2f3c733ec5a15aff4c..276c9263f979ce7a98f61c609f4e1f2a9d30089e 100644 (file)
--- a/modules/rint
+++ b/modules/rint
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([rint])
+gl_MATHFUNC([rint], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/sin b/modules/sin
index 0d8dc60c25b62ede61a1f48b4d8a1d243bcd56ae..87ed8e663246f92f427ef1814b5c33c75298c0cb 100644 (file)
--- a/modules/sin
+++ b/modules/sin
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([sin])
+gl_MATHFUNC([sin], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/sinh b/modules/sinh
index d1c5c1fc3c9a937bd9fd8b45a2dae724d9f6f0ee..ffcef67d7217b2914156efe2d6a3e40bd317b045 100644 (file)
--- a/modules/sinh
+++ b/modules/sinh
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([sinh])
+gl_MATHFUNC([sinh], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/tan b/modules/tan
index 2b2eceece72aff901c84fec9184e0f493e5a8b35..6ec8a587f9306d9f9d072df4cb4057b15cd1e469 100644 (file)
--- a/modules/tan
+++ b/modules/tan
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([tan])
+gl_MATHFUNC([tan], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/tanh b/modules/tanh
index 3e5e309d22c08961e0b773c05357890f038d9acd..c7f078943f40477659d648b4156c18d9fdcca5e2 100644 (file)
--- a/modules/tanh
+++ b/modules/tanh
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([tanh])
+gl_MATHFUNC([tanh], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/y0 b/modules/y0
index bb1cfb663b824375a31f874a2ed7bf992f3d7c78..de188af1c3ed59c6507b7da1e0526048391023de 100644 (file)
--- a/modules/y0
+++ b/modules/y0
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([y0])
+gl_MATHFUNC([y0], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/y1 b/modules/y1
index 27dcdaacd2651181ae7ddbb14ba3d424b88b78c1..dbe884d48eb510af7d98fd3a63cb685b5ce383ad 100644 (file)
--- a/modules/y1
+++ b/modules/y1
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([y1])
+gl_MATHFUNC([y1], [double], [(double)])
 
 Makefile.am:
 

diff --git a/modules/yn b/modules/yn
index eab9f58cfae032535471379ab824f8f92a560d7a..63d05f64728a138235b9d697e63bba381c9e9d5c 100644 (file)
--- a/modules/yn
+++ b/modules/yn
@@ -7,7 +7,7 @@ m4/mathfunc.m4
 Depends-on:
 
 configure.ac:
-gl_MATHFUNC([yn])
+gl_MATHFUNC([yn], [double], [(int, double)])
 
 Makefile.am: