From 81ba90be88fe306baebf8055bf0ea095ee61ffe4 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 29 Oct 2007 03:19:52 +0100 Subject: [PATCH 1/1] Fix link errors with Sun C 5.0 on Solaris 10. --- ChangeLog | 231 +++++--------------------------------------------- lib/math.in.h | 8 +- m4/ceilf.m4 | 12 ++- m4/ceill.m4 | 12 ++- m4/floorf.m4 | 12 ++- m4/floorl.m4 | 12 ++- m4/math_h.m4 | 82 +++++++++--------- modules/math | 8 +- 8 files changed, 100 insertions(+), 277 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3baecae5d1..f47b2b53e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2007-10-28 Bruno Haible + + Fix link errors with Sun C 5.0 on Solaris 10. + * m4/floorf.m4 (gl_FUNC_FLOORF): Consider also the case that the + function is declared but not present in the compiler's libm. + * m4/floorl.m4 (gl_FUNC_FLOORL): Likewise. + * m4/ceilf.m4 (gl_FUNC_CEILF): Likewise. + * m4/ceill.m4 (gl_FUNC_CEILL: Likewise. + * lib/math.in.h: Test REPLACE_CEILF instead of HAVE_DECL_CEILF. + Test REPLACE_CEILL instead of HAVE_DECL_CEILL. + Test REPLACE_FLOORF instead of HAVE_DECL_FLOORF. + Test REPLACE_FLOORL instead of HAVE_DECL_FLOORL. + * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Update. + * modules/math (Makefile.am): Substitute REPLACE_CEILF instead of + HAVE_DECL_CEILF, REPLACE_CEILL instead of HAVE_DECL_CEILL, + REPLACE_FLOORF instead of HAVE_DECL_FLOORF, REPLACE_FLOORL instead of + HAVE_DECL_FLOORL. + 2007-10-28 Bruno Haible * m4/floorl.m4 (gl_FUNC_FLOORL_LIBS): New macro, extracted from @@ -35176,215 +35194,4 @@ * m4/check-decl.m4 (jm_CHECK_DECLS): Likewise. (jm_CHECK_DECL_LOCALTIME_R): New macro. - * m4/mktime.m4: Test for spring-forward gap before long-running test. - -1998-10-14 Jim Meyering - - * m4/mktime.m4: Use the more portable "TZ=PST8PDT,M4.1.0,M10.5.0" - instead of "TZ=America/Vancouver". From Paul Eggert. - -1998-10-11 Jim Meyering - - * m4/mktime.m4 (jm_AM_FUNC_MKTIME): New file and macro. - This adds a test for a recently added compatibility fix for mktime.c. - * m4/jm-mktime.m4: Require jm_AM_FUNC_MKTIME, not AM_FUNC_MKTIME. - -1998-09-27 Jim Meyering - - * m4/jm-macros.m4 (jm_MACROS): Require jm_FUNC_FNMATCH. - - * m4/fnmatch.m4 (jm_FUNC_FNMATCH): New file/macro. Extracted from - ../configure.in, including a change from Gordon Matzigkeit to allow - cross-compiling for the Hurd. - - * m4/glibc.m4: New file/macro to test for the GNU C Library - versions 1 and 2. From Gordon Matzigkeit. - Indent. - -1998-09-21 Jim Meyering - - * m4/chown.m4: Declare locals: before, after. From Andries Brouwer. - -1998-08-18 Paul Eggert - - Port nanosecond-resolution times to UnixWare 2.1.2 and - pedantic Solaris 2.6. - - * m4/st_mtim.m4 (AC_STRUCT_ST_MTIM_NSEC): Renamed from - AC_STRUCT_ST_MTIM. - * m4/st_mtim.m4 (AC_STRUCT_ST_MTIM_NSEC): - Generate name of ns member, instead of just 1 or undef. - Allow for UnixWare 2.1.2 and Solaris 2.6 if in pedantic mode. - -1998-08-15 Jim Meyering - - * m4/ssize_t.m4 (jm_TYPE_SSIZE_T): Remove file. - * m4/check-type.m4: New file. Replacement for AC_CHECK_TYPE. - * m4/jm-macros.m4: Use the new AC_CHECK_TYPE(ssize_t, int) - instead of jm_TYPE_SSIZE_T. - -1998-08-12 Jim Meyering - - * m4/st_dm_mode.m4: New file. From Johan Danielsson. - -1998-08-02 Jim Meyering - - * m4/st_mtim.m4: Use hack to avoid having to put #undef HAVE_ST_MTIM - in acconfig.h manually. - -1998-07-31 Paul Eggert - - * m4/st_mtim.m4: New file. - -1998-07-28 Jim Meyering - - * m4/utimes.m4: Undef stat. - -1998-07-25 Jim Meyering - - * m4/utime.m4 (jm_FUNC_UTIME): New file and macro. - * m4/utimes.m4 (jm_FUNC_UTIMES_NULL): New file and macro. - -1998-07-09 Manfred Hollstein - - * m4/chown.m4 (jm_FUNC_CHOWN): Add a check to verify that the - uid and gid actually remain unchanged. - -1998-07-07 Jim Meyering - - * m4/jm-glibc-io.m4: Remove fclose_unlocked. - -1998-07-04 Jim Meyering - - * m4/regex.m4: Use syscmd, ifelse, and sysval. Mainly as an exercise - to prove that this macro can be used in packages without regex.c. - -1998-07-04 Andreas Schwab - - * m4/gettext.m4 (AM_WITH_NLS): Remove intl/libintl.h if - is to be used. - -1998-07-03 Jim Meyering - - * m4/gettext.m4: Add -lintl if it's found to be necessary. - - * m4/gettext.m4: New file -- from gettext-0.10.35. - * m4/lcmessage.m4: Likewise. - * m4/progtest.m4: Likewise. - - * m4/regex.m4 (jm_WITH_REGEX): New file and macro. - * m4/jm-macros.m4: Require the new macro. - -1998-06-29 Jim Meyering - - * m4/fstypename.m4: Include sys/param.h. NetBSD 1.3.1 requires this - for the definition of NGROUPS (used in a system header included - by sys/mount.h). - -1998-06-28 Jim Meyering - - * m4/ls-mntd-fs.m4: New file. - * m4/fstypename.m4: New file. - - * m4/jm-macros.m4: Require the new macro. - * m4/jm-glibc-io.m4: New file. - -1998-05-19 Jim Meyering - - * m4/jm-macros.m4: Add jm_FUNC_LCHOWN. - * m4/lchown.m4: New file. - - * m4/Makefile.am.in: New file. - * m4/Makefile.am (Makefile.am): Depend on Makefile.am.in. - -1998-05-14 Jim Meyering - - * m4/Makefile.am (EXTRA_DIST): Add them. - * m4/jm-macros.m4: New file. - * m4/utimbuf.m4: New file. - -1998-05-12 Jim Meyering - - * m4/Makefile.am (EXTRA_DIST): Add isc-posix.m4. - -1998-05-11 Jim Meyering - - * m4/isc-posix.m4: New file. - -1998-05-10 Jim Meyering - - * m4/jm-mktime.m4: Use AM_FUNC_MKTIME, now that it's up to date. - -1998-05-09 Jim Meyering - - * m4/Makefile.am (EXTRA_DIST): Add ssize_t.m4. - (EXTRA_DIST): Remove mktime.m4, now that the new version is included - with automake. - - * m4/ssize_t.m4: New file. - * m4/mktime.m4: Remove file -- the new automake has this now. - -1998-04-26 Jim Meyering - - * m4/assert.m4: New file. - * m4/Makefile.am (EXTRA_DIST): Add assert.m4. - -1998-04-05 Jim Meyering - - * m4/prereq.m4 (jm_PREREQ_REGEX): New macro. - (jm_PREREQ): Use it here. - -1998-03-23 Jim Meyering - - * m4/inttypes_h.m4: Kludges so I don't have to add HAVE_INTTYPES_H - in acconfig.h. - -1998-03-15 Jim Meyering - - * m4/prereq.m4: New file. - * m4/error.m4: New file. - * m4/Makefile.am (EXTRA_DIST): Add error.m4 and prereq.m4. - -1998-02-07 Jim Meyering - - * m4/getline.m4: Don't set am_cv_func_working_getline before the - cache-check for the same variable -- that defeated the purpose of - the test; the test program was never run. This was a problem only - on systems with losing getline functions -- HP-UX 10.20 is one. - Reported by Bjorn Helgaas. - -1998-02-06 Jim Meyering - - * m4/Makefile.am (EXTRA_DIST): Add perl.m4. - -1998-01-10 Jim Meyering - - * m4/Makefile.am (EXTRA_DIST): Add const.m4. - - * m4/const.m4: New file. Use an initializer in this declaration - typedef int charset[2]; const charset x; - Reported by Bob Glickstein. - -1997-12-21 Jim Meyering - - * m4/chown.m4: Fix reversed types on -1 args to chown. - From Kaveh Ghazi. - -1997-12-14 Jim Meyering - - * m4/check-decl.m4: s/DECLARATION_/DECL_/g. - Add lseek and memchr. - - * m4/decl.m4: s/HAVE_DECLARATION_/HAVE_DECL_/g. - T.E.Dickey said that some older preprocessors - have a 20-character limit on names. - -1997-11-30 Jim Meyering - - * m4/inttypes_h.m4: New file. - * m4/uintmax_t.m4: New file. - * m4/Makefile.am (EXTRA_DIST): Add inttypes_h.m4 and uintmax_t.m4. - -Copyright (C) 1997-2007 Free Software Foundation, Inc. -Copying and distribution of this file, with or without modification, -are permitted provided the copyright notice and this notice are preserved. + * m4/mktime.m4: Test for spring-forward gap before long-running test. \ No newline at end of file diff --git a/lib/math.in.h b/lib/math.in.h index 56527d6111..c40ae9c592 100644 --- a/lib/math.in.h +++ b/lib/math.in.h @@ -90,7 +90,7 @@ extern long double atanl (long double x); #if @GNULIB_CEILF@ -# if !@HAVE_DECL_CEILF@ +# if @REPLACE_CEILF@ # define ceilf rpl_ceilf extern float ceilf (float x); # endif @@ -103,7 +103,7 @@ extern float ceilf (float x); #endif #if @GNULIB_CEILL@ -# if !@HAVE_DECL_CEILL@ +# if @REPLACE_CEILL@ # define ceill rpl_ceill extern long double ceill (long double x); # endif @@ -141,7 +141,7 @@ extern long double expl (long double x); #if @GNULIB_FLOORF@ -# if !@HAVE_DECL_FLOORF@ +# if @REPLACE_FLOORF@ # define floorf rpl_floorf extern float floorf (float x); # endif @@ -154,7 +154,7 @@ extern float floorf (float x); #endif #if @GNULIB_FLOORL@ -# if !@HAVE_DECL_FLOORL@ +# if @REPLACE_FLOORL@ # define floorl rpl_floorl extern long double floorl (long double x); # endif diff --git a/m4/ceilf.m4 b/m4/ceilf.m4 index b409829945..9e261e5b39 100644 --- a/m4/ceilf.m4 +++ b/m4/ceilf.m4 @@ -1,4 +1,4 @@ -# ceilf.m4 serial 2 +# ceilf.m4 serial 3 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,14 +15,18 @@ AC_DEFUN([gl_FUNC_CEILF], dnl Test whether ceilf() can be used without libm. gl_FUNC_CEILF_LIBS if test "$CEILF_LIBM" = "?"; then - CEILF_LIBM= + dnl Sun C 5.0 on Solaris declares ceilf() and has it in the system-wide + dnl libm.so, but not in the libm.so that the compiler uses. + REPLACE_CEILF=1 fi else - HAVE_DECL_CEILF=0 + REPLACE_CEILF=1 + fi + if test $REPLACE_CEILF = 1; then AC_LIBOBJ([ceilf]) CEILF_LIBM= fi - AC_SUBST([HAVE_DECL_CEILF]) + AC_SUBST([REPLACE_CEILF]) AC_SUBST([CEILF_LIBM]) ]) diff --git a/m4/ceill.m4 b/m4/ceill.m4 index 577bc55369..4bf9caa0d6 100644 --- a/m4/ceill.m4 +++ b/m4/ceill.m4 @@ -1,4 +1,4 @@ -# ceill.m4 serial 2 +# ceill.m4 serial 3 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,14 +15,18 @@ AC_DEFUN([gl_FUNC_CEILL], dnl Test whether ceill() can be used without libm. gl_FUNC_CEILL_LIBS if test "$CEILL_LIBM" = "?"; then - CEILL_LIBM= + dnl Sun C 5.0 on Solaris declares ceill() and has it in the system-wide + dnl libm.so, but not in the libm.so that the compiler uses. + REPLACE_CEILL=1 fi else - HAVE_DECL_CEILL=0 + REPLACE_CEILL=1 + fi + if test $REPLACE_CEILL = 1; then AC_LIBOBJ([ceill]) CEILL_LIBM= fi - AC_SUBST([HAVE_DECL_CEILL]) + AC_SUBST([REPLACE_CEILL]) AC_SUBST([CEILL_LIBM]) ]) diff --git a/m4/floorf.m4 b/m4/floorf.m4 index 3baadc03d6..91b6900c75 100644 --- a/m4/floorf.m4 +++ b/m4/floorf.m4 @@ -1,4 +1,4 @@ -# floorf.m4 serial 2 +# floorf.m4 serial 3 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,14 +15,18 @@ AC_DEFUN([gl_FUNC_FLOORF], dnl Test whether floorf() can be used without libm. gl_FUNC_FLOORF_LIBS if test "$FLOORF_LIBM" = "?"; then - FLOORF_LIBM= + dnl Sun C 5.0 on Solaris declares floorf() and has it in the system-wide + dnl libm.so, but not in the libm.so that the compiler uses. + REPLACE_FLOORF=1 fi else - HAVE_DECL_FLOORF=0 + REPLACE_FLOORF=1 + fi + if test $REPLACE_FLOORF = 1; then AC_LIBOBJ([floorf]) FLOORF_LIBM= fi - AC_SUBST([HAVE_DECL_FLOORF]) + AC_SUBST([REPLACE_FLOORF]) AC_SUBST([FLOORF_LIBM]) ]) diff --git a/m4/floorl.m4 b/m4/floorl.m4 index ab54d939bd..3d580c5033 100644 --- a/m4/floorl.m4 +++ b/m4/floorl.m4 @@ -1,4 +1,4 @@ -# floorl.m4 serial 2 +# floorl.m4 serial 3 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,14 +15,18 @@ AC_DEFUN([gl_FUNC_FLOORL], dnl Test whether floorl() can be used without libm. gl_FUNC_FLOORL_LIBS if test "$FLOORL_LIBM" = "?"; then - FLOORL_LIBM= + dnl Sun C 5.0 on Solaris declares floorl() and has it in the system-wide + dnl libm.so, but not in the libm.so that the compiler uses. + REPLACE_FLOORL=1 fi else - HAVE_DECL_FLOORL=0 + REPLACE_FLOORL=1 + fi + if test $REPLACE_FLOORL = 1; then AC_LIBOBJ([floorl]) FLOORL_LIBM= fi - AC_SUBST([HAVE_DECL_FLOORL]) + AC_SUBST([REPLACE_FLOORL]) AC_SUBST([FLOORL_LIBM]) ]) diff --git a/m4/math_h.m4 b/m4/math_h.m4 index 890888cab8..530ca44dd1 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,4 +1,4 @@ -# math_h.m4 serial 6 +# math_h.m4 serial 7 dnl Copyright (C) 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -19,47 +19,47 @@ AC_DEFUN([gl_MATH_MODULE_INDICATOR], AC_DEFUN([gl_MATH_H_DEFAULTS], [ - GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) - GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) - GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) - GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) - GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) - GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) - GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) - GNULIB_MATHL=0; AC_SUBST([GNULIB_MATHL]) - GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) - GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) - GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) - GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) - GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) - GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) - GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) + GNULIB_CEILF=0; AC_SUBST([GNULIB_CEILF]) + GNULIB_CEILL=0; AC_SUBST([GNULIB_CEILL]) + GNULIB_FLOORF=0; AC_SUBST([GNULIB_FLOORF]) + GNULIB_FLOORL=0; AC_SUBST([GNULIB_FLOORL]) + GNULIB_FREXP=0; AC_SUBST([GNULIB_FREXP]) + GNULIB_FREXPL=0; AC_SUBST([GNULIB_FREXPL]) + GNULIB_LDEXPL=0; AC_SUBST([GNULIB_LDEXPL]) + GNULIB_MATHL=0; AC_SUBST([GNULIB_MATHL]) + GNULIB_ROUND=0; AC_SUBST([GNULIB_ROUND]) + GNULIB_ROUNDF=0; AC_SUBST([GNULIB_ROUNDF]) + GNULIB_ROUNDL=0; AC_SUBST([GNULIB_ROUNDL]) + GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT]) + GNULIB_TRUNC=0; AC_SUBST([GNULIB_TRUNC]) + GNULIB_TRUNCF=0; AC_SUBST([GNULIB_TRUNCF]) + GNULIB_TRUNCL=0; AC_SUBST([GNULIB_TRUNCL]) GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE]) dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_DECL_ACOSL=1; AC_SUBST([HAVE_DECL_ACOSL]) - HAVE_DECL_ASINL=1; AC_SUBST([HAVE_DECL_ASINL]) - HAVE_DECL_ATANL=1; AC_SUBST([HAVE_DECL_ATANL]) - HAVE_DECL_CEILF=1; AC_SUBST([HAVE_DECL_CEILF]) - HAVE_DECL_CEILL=1; AC_SUBST([HAVE_DECL_CEILL]) - HAVE_DECL_COSL=1; AC_SUBST([HAVE_DECL_COSL]) - HAVE_DECL_EXPL=1; AC_SUBST([HAVE_DECL_EXPL]) - HAVE_DECL_FLOORF=1; AC_SUBST([HAVE_DECL_FLOORF]) - HAVE_DECL_FLOORL=1; AC_SUBST([HAVE_DECL_FLOORL]) - HAVE_DECL_FREXPL=1; AC_SUBST([HAVE_DECL_FREXPL]) - HAVE_DECL_LDEXPL=1; AC_SUBST([HAVE_DECL_LDEXPL]) - HAVE_DECL_LOGL=1; AC_SUBST([HAVE_DECL_LOGL]) - HAVE_DECL_ROUND=1; AC_SUBST([HAVE_DECL_ROUND]) - HAVE_DECL_ROUNDF=1; AC_SUBST([HAVE_DECL_ROUNDF]) - HAVE_DECL_ROUNDL=1; AC_SUBST([HAVE_DECL_ROUNDL]) - HAVE_DECL_SINL=1; AC_SUBST([HAVE_DECL_SINL]) - HAVE_DECL_SQRTL=1; AC_SUBST([HAVE_DECL_SQRTL]) - HAVE_DECL_TANL=1; AC_SUBST([HAVE_DECL_TANL]) - HAVE_DECL_TRUNC=1; AC_SUBST([HAVE_DECL_TRUNC]) - HAVE_DECL_TRUNCF=1; AC_SUBST([HAVE_DECL_TRUNCF]) - HAVE_DECL_TRUNCL=1; AC_SUBST([HAVE_DECL_TRUNCL]) + HAVE_DECL_ACOSL=1; AC_SUBST([HAVE_DECL_ACOSL]) + HAVE_DECL_ASINL=1; AC_SUBST([HAVE_DECL_ASINL]) + HAVE_DECL_ATANL=1; AC_SUBST([HAVE_DECL_ATANL]) + HAVE_DECL_COSL=1; AC_SUBST([HAVE_DECL_COSL]) + HAVE_DECL_EXPL=1; AC_SUBST([HAVE_DECL_EXPL]) + HAVE_DECL_FREXPL=1; AC_SUBST([HAVE_DECL_FREXPL]) + HAVE_DECL_LDEXPL=1; AC_SUBST([HAVE_DECL_LDEXPL]) + HAVE_DECL_LOGL=1; AC_SUBST([HAVE_DECL_LOGL]) + HAVE_DECL_ROUND=1; AC_SUBST([HAVE_DECL_ROUND]) + HAVE_DECL_ROUNDF=1; AC_SUBST([HAVE_DECL_ROUNDF]) + HAVE_DECL_ROUNDL=1; AC_SUBST([HAVE_DECL_ROUNDL]) + HAVE_DECL_SINL=1; AC_SUBST([HAVE_DECL_SINL]) + HAVE_DECL_SQRTL=1; AC_SUBST([HAVE_DECL_SQRTL]) + HAVE_DECL_TANL=1; AC_SUBST([HAVE_DECL_TANL]) + HAVE_DECL_TRUNC=1; AC_SUBST([HAVE_DECL_TRUNC]) + HAVE_DECL_TRUNCF=1; AC_SUBST([HAVE_DECL_TRUNCF]) + HAVE_DECL_TRUNCL=1; AC_SUBST([HAVE_DECL_TRUNCL]) HAVE_DECL_ISFINITE=1; AC_SUBST([HAVE_DECL_ISFINITE]) - REPLACE_FREXP=0; AC_SUBST([REPLACE_FREXP]) - REPLACE_FREXPL=0; AC_SUBST([REPLACE_FREXPL]) - REPLACE_LDEXPL=0; AC_SUBST([REPLACE_LDEXPL]) - REPLACE_SIGNBIT=0; AC_SUBST([REPLACE_SIGNBIT]) + REPLACE_CEILF=0; AC_SUBST([REPLACE_CEILF]) + REPLACE_CEILL=0; AC_SUBST([REPLACE_CEILL]) + REPLACE_FLOORF=0; AC_SUBST([REPLACE_FLOORF]) + REPLACE_FLOORL=0; AC_SUBST([REPLACE_FLOORL]) + REPLACE_FREXP=0; AC_SUBST([REPLACE_FREXP]) + REPLACE_FREXPL=0; AC_SUBST([REPLACE_FREXPL]) + REPLACE_LDEXPL=0; AC_SUBST([REPLACE_LDEXPL]) + REPLACE_SIGNBIT=0; AC_SUBST([REPLACE_SIGNBIT]) ]) diff --git a/modules/math b/modules/math index 935bebb79f..12d8c87eb1 100644 --- a/modules/math +++ b/modules/math @@ -41,12 +41,8 @@ math.h: math.in.h -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \ -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \ -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \ - -e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \ - -e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \ -e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \ -e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \ - -e 's|@''HAVE_DECL_FLOORF''@|$(HAVE_DECL_FLOORF)|g' \ - -e 's|@''HAVE_DECL_FLOORL''@|$(HAVE_DECL_FLOORL)|g' \ -e 's|@''HAVE_DECL_FREXPL''@|$(HAVE_DECL_FREXPL)|g' \ -e 's|@''HAVE_DECL_LDEXPL''@|$(HAVE_DECL_LDEXPL)|g' \ -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \ @@ -60,6 +56,10 @@ math.h: math.in.h -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \ -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \ -e 's|@''HAVE_DECL_ISFINITE''@|$(HAVE_DECL_ISFINITE)|g' \ + -e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \ + -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \ + -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \ + -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \ -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \ -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \ -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \ -- 2.30.2