From 69ca2d586d42db5b43f8e1fa55d6096eedceee2c Mon Sep 17 00:00:00 2001 From: Juan Jose Garcia Ripoll Date: Fri, 29 Oct 2010 22:29:05 +0200 Subject: [PATCH] Only use long double when the special functions are available --- msvc/ecl/config.h.msvc6 | 5 +- src/CHANGELOG | 3 + src/aclocal.m4 | 14 +++++ src/configure | 123 +++++++++++++++++++++++++++++++++++++++- src/configure.in | 7 +-- src/h/config.h.in | 8 +-- 6 files changed, 142 insertions(+), 18 deletions(-) diff --git a/msvc/ecl/config.h.msvc6 b/msvc/ecl/config.h.msvc6 index 603bc047b..21de97253 100755 --- a/msvc/ecl/config.h.msvc6 +++ b/msvc/ecl/config.h.msvc6 @@ -207,10 +207,7 @@ typedef unsigned int cl_hashkey; #define ECL_SLOTS_LIMIT 32768 /* compiler understands long double */ -/* #undef HAVE_LONG_DOUBLE */ -#ifdef HAVE_LONG_DOUBLE -# define ECL_LONG_FLOAT -#endif +/* #undef ECL_LONG_FLOAT */ /* compiler understands complex */ /* #undef HAVE_DOUBLE_COMPLEX */ /* #undef HAVE_FLOAT_COMPLEX */ diff --git a/src/CHANGELOG b/src/CHANGELOG index 8bb99c609..d294af395 100755 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -126,6 +126,9 @@ ECL 10.5.1: consequences regarding things like creation of packages or class and function definition. + - ECL will use long double whenever the type is avalailable AND the special + functions cosl, sinl and similar are defined. + ;;; Local Variables: *** ;;; mode:text *** ;;; fill-column:79 *** diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 7ee52f376..db6b64389 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -1,5 +1,19 @@ dnl -*- autoconf -*- +dnl -------------------------------------------------------------- +dnl check existence of long double and supporting functions +AC_DEFUN([ECL_LONG_DOUBLE],[ +if test "$enable_longdouble" != "no" ; then +AC_CHECK_TYPES([long double],[enable_longdouble=yes],[enable_longdouble=no]) +if test "$enable_longdouble" != "no" ; then +AC_CHECK_FUNCS([sinl cosl tanl logl expl],[],[enable_longdouble=no; break]) +if test "$enable_longdouble" != "no" ; then +AC_DEFINE(ECL_LONG_FLOAT) +fi +fi +fi +]) + dnl -------------------------------------------------------------- dnl http://autoconf-archive.cryp.to/ac_c_long_long_.html dnl Provides a test for the existance of the long long int type and defines HAVE_LONG_LONG if it is found. diff --git a/src/configure b/src/configure index 4e5e60a2d..9440eecc6 100755 --- a/src/configure +++ b/src/configure @@ -1469,7 +1469,8 @@ Optional Features: --enable-opcode8 interpreter uses 8-bit codes (default=NO, only works on Intel) --enable-unicode enable support for unicode (default=NO) - --enable-longdouble include support for long double (default=YES) + --enable-longdouble include support for long double (yes|no|auto, + default=AUTO) --enable-c99complex include support for C complex type (default=NO) --enable-hierarchical-packages hierarchical package names (default=YES) @@ -10965,10 +10966,128 @@ cat >>confdefs.h <<_ACEOF #define HAVE_LONG_DOUBLE 1 _ACEOF - +enable_longdouble=yes +else + enable_longdouble=no fi +if test "$enable_longdouble" != "no" ; then + + + + + +for ac_func in sinl cosl tanl logl expl +do +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$ac_func || defined __stub___$ac_func +choke me +#endif + +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then + eval "$as_ac_var=yes" +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi + +rm -rf conftest.dSYM +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +else + enable_longdouble=no; break +fi +done + +if test "$enable_longdouble" != "no" ; then +cat >>confdefs.h <<\_ACEOF +#define ECL_LONG_FLOAT 1 +_ACEOF + +fi +fi +fi + if test "$enable_c99complex" != "no" ; then { $as_echo "$as_me:$LINENO: checking for double complex" >&5 $as_echo_n "checking for double complex... " >&6; } diff --git a/src/configure.in b/src/configure.in index f24f8f100..dd6803675 100644 --- a/src/configure.in +++ b/src/configure.in @@ -213,7 +213,7 @@ AC_ARG_ENABLE(unicode, AC_ARG_ENABLE(longdouble, AS_HELP_STRING( [--enable-longdouble], [include support for long double] - [(default=YES)]), + [(yes|no|auto, default=AUTO)]), [enable_longdouble=${enableval}], [enable_longdouble=yes]) AC_ARG_ENABLE(c99complex, @@ -668,10 +668,7 @@ ECL_FFI fi ECL_FPE_MODEL ECL_SSE - -if test "$enable_longdouble" != "no" ; then -AC_CHECK_TYPES([long double]) -fi +ECL_LONG_DOUBLE if test "$enable_c99complex" != "no" ; then AC_CHECK_TYPES([double complex, float complex],[],[],[#include ]) fi diff --git a/src/h/config.h.in b/src/h/config.h.in index a9c07f660..bb073fe0d 100644 --- a/src/h/config.h.in +++ b/src/h/config.h.in @@ -215,13 +215,7 @@ typedef unsigned @CL_FIXNUM_TYPE@ cl_hashkey; #define ECL_SLOTS_LIMIT 32768 /* compiler understands long double */ -#undef HAVE_LONG_DOUBLE -#ifdef HAVE_LONG_DOUBLE -# define ECL_LONG_FLOAT -# define ECL_LARGE_FLOAT long double -#else -# define ECL_LARGE_FLOAT double -#endif +#undef ECL_LONG_FLOAT /* compiler understands complex */ #undef HAVE_DOUBLE_COMPLEX #undef HAVE_FLOAT_COMPLEX