e63d0ebf2f
Copy from devel:libraries:c_c++/mpfr based on submit request 48543 from user rguenther OBS-URL: https://build.opensuse.org/request/show/48543 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpfr?expand=0&rev=23
686 lines
20 KiB
Diff
686 lines
20 KiB
Diff
diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
|
|
--- mpfr-3.0.0-a/PATCHES 2010-06-23 11:02:49.000000000 +0000
|
|
+++ mpfr-3.0.0-b/PATCHES 2010-06-23 11:03:36.000000000 +0000
|
|
@@ -0,0 +1 @@
|
|
+mpfr_out_str
|
|
diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
|
|
--- mpfr-3.0.0-a/VERSION 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/VERSION 2010-06-23 11:03:20.000000000 +0000
|
|
@@ -1 +1 @@
|
|
-3.0.0
|
|
+3.0.0-p1
|
|
diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
|
|
--- mpfr-3.0.0-a/mpfr.h 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/mpfr.h 2010-06-23 11:03:20.000000000 +0000
|
|
@@ -27,7 +27,7 @@
|
|
#define MPFR_VERSION_MAJOR 3
|
|
#define MPFR_VERSION_MINOR 0
|
|
#define MPFR_VERSION_PATCHLEVEL 0
|
|
-#define MPFR_VERSION_STRING "3.0.0"
|
|
+#define MPFR_VERSION_STRING "3.0.0-p1"
|
|
|
|
/* Macros dealing with MPFR VERSION */
|
|
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
|
diff -Naurd mpfr-3.0.0-a/mpfr.texi mpfr-3.0.0-b/mpfr.texi
|
|
--- mpfr-3.0.0-a/mpfr.texi 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/mpfr.texi 2010-06-23 11:03:12.000000000 +0000
|
|
@@ -2050,7 +2050,7 @@
|
|
are printed. If @var{base} is greater than 10, @samp{@@} will be used
|
|
instead of @samp{e} as exponent delimiter.
|
|
|
|
-Return the number of bytes written, or if an error occurred, return 0.
|
|
+Return the number of characters written, or if an error occurred, return 0.
|
|
@end deftypefun
|
|
|
|
@deftypefun size_t mpfr_inp_str (mpfr_t @var{rop}, FILE *@var{stream}, int @var{base}, mpfr_rnd_t @var{rnd})
|
|
diff -Naurd mpfr-3.0.0-a/out_str.c mpfr-3.0.0-b/out_str.c
|
|
--- mpfr-3.0.0-a/out_str.c 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/out_str.c 2010-06-23 11:03:12.000000000 +0000
|
|
@@ -22,6 +22,16 @@
|
|
|
|
#include "mpfr-impl.h"
|
|
|
|
+/* Warning! S should not contain "%". */
|
|
+#define OUT_STR_RET(S) \
|
|
+ do \
|
|
+ { \
|
|
+ int r; \
|
|
+ r = fprintf (stream, (S)); \
|
|
+ return r < 0 ? 0 : r; \
|
|
+ } \
|
|
+ while (0)
|
|
+
|
|
size_t
|
|
mpfr_out_str (FILE *stream, int base, size_t n_digits, mpfr_srcptr op,
|
|
mpfr_rnd_t rnd_mode)
|
|
@@ -29,6 +39,7 @@
|
|
char *s, *s0;
|
|
size_t l;
|
|
mpfr_exp_t e;
|
|
+ int err;
|
|
|
|
MPFR_ASSERTN (base >= 2 && base <= 62);
|
|
|
|
@@ -36,37 +47,16 @@
|
|
if (stream == NULL)
|
|
stream = stdout;
|
|
|
|
- if (MPFR_IS_NAN(op))
|
|
- {
|
|
- fprintf (stream, "@NaN@");
|
|
- return 3;
|
|
- }
|
|
-
|
|
- if (MPFR_IS_INF(op))
|
|
- {
|
|
- if (MPFR_SIGN(op) > 0)
|
|
- {
|
|
- fprintf (stream, "@Inf@");
|
|
- return 3;
|
|
- }
|
|
- else
|
|
- {
|
|
- fprintf (stream, "-@Inf@");
|
|
- return 4;
|
|
- }
|
|
- }
|
|
-
|
|
- if (MPFR_IS_ZERO(op))
|
|
+ if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (op)))
|
|
{
|
|
- if (MPFR_SIGN(op) > 0)
|
|
- {
|
|
- fprintf(stream, "0");
|
|
- return 1;
|
|
- }
|
|
+ if (MPFR_IS_NAN (op))
|
|
+ OUT_STR_RET ("@NaN@");
|
|
+ else if (MPFR_IS_INF (op))
|
|
+ OUT_STR_RET (MPFR_IS_POS (op) ? "@Inf@" : "-@Inf@");
|
|
else
|
|
{
|
|
- fprintf(stream, "-0");
|
|
- return 2;
|
|
+ MPFR_ASSERTD (MPFR_IS_ZERO (op));
|
|
+ OUT_STR_RET (MPFR_IS_POS (op) ? "0" : "-0");
|
|
}
|
|
}
|
|
|
|
@@ -77,21 +67,31 @@
|
|
|
|
l = strlen (s) + 1; /* size of allocated block returned by mpfr_get_str
|
|
- may be incorrect, as only an upper bound? */
|
|
- if (*s == '-')
|
|
- fputc (*s++, stream);
|
|
|
|
- /* outputs mantissa */
|
|
- fputc (*s++, stream); e--; /* leading digit */
|
|
- fputc ((unsigned char) MPFR_DECIMAL_POINT, stream);
|
|
- fputs (s, stream); /* rest of mantissa */
|
|
+ /* outputs possible sign and significand */
|
|
+ err = (*s == '-' && fputc (*s++, stream) == EOF)
|
|
+ || fputc (*s++, stream) == EOF /* leading digit */
|
|
+ || fputc ((unsigned char) MPFR_DECIMAL_POINT, stream) == EOF
|
|
+ || fputs (s, stream) == EOF; /* trailing significand */
|
|
(*__gmp_free_func) (s0, l);
|
|
+ if (MPFR_UNLIKELY (err))
|
|
+ return 0;
|
|
+
|
|
+ e--; /* due to the leading digit */
|
|
|
|
/* outputs exponent */
|
|
if (e)
|
|
{
|
|
+ int r;
|
|
+
|
|
MPFR_ASSERTN(e >= LONG_MIN);
|
|
MPFR_ASSERTN(e <= LONG_MAX);
|
|
- l += fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
|
|
+
|
|
+ r = fprintf (stream, (base <= 10 ? "e%ld" : "@%ld"), (long) e);
|
|
+ if (MPFR_UNLIKELY (r < 0))
|
|
+ return 0;
|
|
+
|
|
+ l += r;
|
|
}
|
|
|
|
return l;
|
|
diff -Naurd mpfr-3.0.0-a/tests/tout_str.c mpfr-3.0.0-b/tests/tout_str.c
|
|
--- mpfr-3.0.0-a/tests/tout_str.c 2010-06-10 11:00:13.000000000 +0000
|
|
+++ mpfr-3.0.0-b/tests/tout_str.c 2010-06-23 11:03:12.000000000 +0000
|
|
@@ -46,22 +46,54 @@
|
|
special (void)
|
|
{
|
|
mpfr_t x;
|
|
+ unsigned int n;
|
|
|
|
mpfr_init (x);
|
|
|
|
mpfr_set_nan (x);
|
|
- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ if (n != 5)
|
|
+ {
|
|
+ printf ("Error: mpfr_out_str (file, 10, 0, NaN, MPFR_RNDN) wrote %u "
|
|
+ "characters instead of 5.\n", n);
|
|
+ exit (1);
|
|
+ }
|
|
|
|
mpfr_set_inf (x, 1);
|
|
- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ if (n != 5)
|
|
+ {
|
|
+ printf ("Error: mpfr_out_str (file, 10, 0, +Inf, MPFR_RNDN) wrote %u "
|
|
+ "characters instead of 5.\n", n);
|
|
+ exit (1);
|
|
+ }
|
|
|
|
mpfr_set_inf (x, -1);
|
|
- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ if (n != 6)
|
|
+ {
|
|
+ printf ("Error: mpfr_out_str (file, 10, 0, -Inf, MPFR_RNDN) wrote %u "
|
|
+ "characters instead of 6.\n", n);
|
|
+ exit (1);
|
|
+ }
|
|
|
|
mpfr_set_ui (x, 0, MPFR_RNDN);
|
|
- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ if (n != 1)
|
|
+ {
|
|
+ printf ("Error: mpfr_out_str (file, 10, 0, +0, MPFR_RNDN) wrote %u "
|
|
+ "characters instead of 1.\n", n);
|
|
+ exit (1);
|
|
+ }
|
|
+
|
|
mpfr_neg (x, x, MPFR_RNDN);
|
|
- mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ n = mpfr_out_str (fout, 10, 0, x, MPFR_RNDN);
|
|
+ if (n != 2)
|
|
+ {
|
|
+ printf ("Error: mpfr_out_str (file, 10, 0, -0, MPFR_RNDN) wrote %u "
|
|
+ "characters instead of 2.\n", n);
|
|
+ exit (1);
|
|
+ }
|
|
|
|
mpfr_clear (x);
|
|
}
|
|
diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
|
|
--- mpfr-3.0.0-a/version.c 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/version.c 2010-06-23 11:03:20.000000000 +0000
|
|
@@ -25,5 +25,5 @@
|
|
const char *
|
|
mpfr_get_version (void)
|
|
{
|
|
- return "3.0.0";
|
|
+ return "3.0.0-p1";
|
|
}
|
|
diff -Naurd mpfr-3.0.0-a/Makefile.in mpfr-3.0.0-b/Makefile.in
|
|
--- mpfr-3.0.0-a/Makefile.in 2010-06-10 11:00:52.000000000 +0000
|
|
+++ mpfr-3.0.0-b/Makefile.in 2010-06-10 11:00:52.000000000 +0000
|
|
@@ -239,6 +239,7 @@
|
|
distuninstallcheck_listfiles = find . -type f -print
|
|
distcleancheck_listfiles = find . -type f -print
|
|
ACLOCAL = @ACLOCAL@
|
|
+ALLOCA = @ALLOCA@
|
|
AMTAR = @AMTAR@
|
|
AR = @AR@
|
|
AS = @AS@
|
|
diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
|
|
--- mpfr-3.0.0-a/PATCHES 2010-06-23 11:03:36.000000000 +0000
|
|
+++ mpfr-3.0.0-b/PATCHES 2010-06-25 13:23:13.000000000 +0000
|
|
@@ -0,0 +1 @@
|
|
+alloca
|
|
diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
|
|
--- mpfr-3.0.0-a/VERSION 2010-06-23 11:03:20.000000000 +0000
|
|
+++ mpfr-3.0.0-b/VERSION 2010-06-25 13:23:13.000000000 +0000
|
|
@@ -1 +1 @@
|
|
-3.0.0-p1
|
|
+3.0.0-p2
|
|
diff -Naurd mpfr-3.0.0-a/acinclude.m4 mpfr-3.0.0-b/acinclude.m4
|
|
--- mpfr-3.0.0-a/acinclude.m4 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/acinclude.m4 2010-06-10 11:00:14.000000000 +0000
|
|
@@ -59,6 +59,9 @@
|
|
dnl sys/fpu.h - MIPS specific
|
|
AC_CHECK_HEADERS([sys/time.h sys/fpu.h])
|
|
|
|
+dnl Check how to get `alloca'
|
|
+AC_FUNC_ALLOCA
|
|
+
|
|
dnl SIZE_MAX macro
|
|
gl_SIZE_MAX
|
|
|
|
diff -Naurd mpfr-3.0.0-a/configure mpfr-3.0.0-b/configure
|
|
--- mpfr-3.0.0-a/configure 2010-06-10 11:00:51.000000000 +0000
|
|
+++ mpfr-3.0.0-b/configure 2010-06-25 13:23:05.000000000 +0000
|
|
@@ -783,6 +783,7 @@
|
|
OBJDUMP
|
|
DLLTOOL
|
|
AS
|
|
+ALLOCA
|
|
MPFR_LIBM
|
|
ANSI2KNR
|
|
U
|
|
@@ -5622,6 +5623,197 @@
|
|
done
|
|
|
|
|
|
+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
|
|
+# for constant arguments. Useless!
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
|
|
+$as_echo_n "checking for working alloca.h... " >&6; }
|
|
+if test "${ac_cv_working_alloca_h+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#include <alloca.h>
|
|
+int
|
|
+main ()
|
|
+{
|
|
+char *p = (char *) alloca (2 * sizeof (int));
|
|
+ if (p) return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_working_alloca_h=yes
|
|
+else
|
|
+ ac_cv_working_alloca_h=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
|
|
+$as_echo "$ac_cv_working_alloca_h" >&6; }
|
|
+if test $ac_cv_working_alloca_h = yes; then
|
|
+
|
|
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
|
|
+
|
|
+fi
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
|
|
+$as_echo_n "checking for alloca... " >&6; }
|
|
+if test "${ac_cv_func_alloca_works+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#ifdef __GNUC__
|
|
+# define alloca __builtin_alloca
|
|
+#else
|
|
+# ifdef _MSC_VER
|
|
+# include <malloc.h>
|
|
+# define alloca _alloca
|
|
+# else
|
|
+# ifdef HAVE_ALLOCA_H
|
|
+# include <alloca.h>
|
|
+# else
|
|
+# ifdef _AIX
|
|
+ #pragma alloca
|
|
+# else
|
|
+# ifndef alloca /* predefined by HP cc +Olibcalls */
|
|
+char *alloca ();
|
|
+# endif
|
|
+# endif
|
|
+# endif
|
|
+# endif
|
|
+#endif
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+char *p = (char *) alloca (1);
|
|
+ if (p) return 0;
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ ac_cv_func_alloca_works=yes
|
|
+else
|
|
+ ac_cv_func_alloca_works=no
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
|
|
+$as_echo "$ac_cv_func_alloca_works" >&6; }
|
|
+
|
|
+if test $ac_cv_func_alloca_works = yes; then
|
|
+
|
|
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
|
|
+
|
|
+else
|
|
+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions
|
|
+# that cause trouble. Some versions do not even contain alloca or
|
|
+# contain a buggy version. If you still want to use their alloca,
|
|
+# use ar to extract alloca.o from them instead of compiling alloca.c.
|
|
+
|
|
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
|
|
+
|
|
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
|
|
+
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
|
|
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
|
|
+if test "${ac_cv_os_cray+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+#if defined CRAY && ! defined CRAY2
|
|
+webecray
|
|
+#else
|
|
+wenotbecray
|
|
+#endif
|
|
+
|
|
+_ACEOF
|
|
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
+ $EGREP "webecray" >/dev/null 2>&1; then :
|
|
+ ac_cv_os_cray=yes
|
|
+else
|
|
+ ac_cv_os_cray=no
|
|
+fi
|
|
+rm -f conftest*
|
|
+
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
|
|
+$as_echo "$ac_cv_os_cray" >&6; }
|
|
+if test $ac_cv_os_cray = yes; then
|
|
+ for ac_func in _getb67 GETB67 getb67; do
|
|
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
|
|
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
|
|
+eval as_val=\$$as_ac_var
|
|
+ if test "x$as_val" = x""yes; then :
|
|
+
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define CRAY_STACKSEG_END $ac_func
|
|
+_ACEOF
|
|
+
|
|
+ break
|
|
+fi
|
|
+
|
|
+ done
|
|
+fi
|
|
+
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
|
|
+$as_echo_n "checking stack direction for C alloca... " >&6; }
|
|
+if test "${ac_cv_c_stack_direction+set}" = set; then :
|
|
+ $as_echo_n "(cached) " >&6
|
|
+else
|
|
+ if test "$cross_compiling" = yes; then :
|
|
+ ac_cv_c_stack_direction=0
|
|
+else
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+$ac_includes_default
|
|
+int
|
|
+find_stack_direction ()
|
|
+{
|
|
+ static char *addr = 0;
|
|
+ auto char dummy;
|
|
+ if (addr == 0)
|
|
+ {
|
|
+ addr = &dummy;
|
|
+ return find_stack_direction ();
|
|
+ }
|
|
+ else
|
|
+ return (&dummy > addr) ? 1 : -1;
|
|
+}
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+ return find_stack_direction () < 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_run "$LINENO"; then :
|
|
+ ac_cv_c_stack_direction=1
|
|
+else
|
|
+ ac_cv_c_stack_direction=-1
|
|
+fi
|
|
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
|
|
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
|
|
+fi
|
|
+
|
|
+fi
|
|
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
|
|
+$as_echo "$ac_cv_c_stack_direction" >&6; }
|
|
+cat >>confdefs.h <<_ACEOF
|
|
+#define STACK_DIRECTION $ac_cv_c_stack_direction
|
|
+_ACEOF
|
|
+
|
|
+
|
|
+fi
|
|
+
|
|
+
|
|
|
|
for ac_header in stdint.h
|
|
do :
|
|
@@ -7564,13 +7756,13 @@
|
|
else
|
|
lt_cv_nm_interface="BSD nm"
|
|
echo "int some_variable = 0;" > conftest.$ac_ext
|
|
- (eval echo "\"\$as_me:7567: $ac_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:7759: $ac_compile\"" >&5)
|
|
(eval "$ac_compile" 2>conftest.err)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:7570: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
+ (eval echo "\"\$as_me:7762: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
|
|
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
|
|
cat conftest.err >&5
|
|
- (eval echo "\"\$as_me:7573: output\"" >&5)
|
|
+ (eval echo "\"\$as_me:7765: output\"" >&5)
|
|
cat conftest.out >&5
|
|
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
|
|
lt_cv_nm_interface="MS dumpbin"
|
|
@@ -8772,7 +8964,7 @@
|
|
;;
|
|
*-*-irix6*)
|
|
# Find out which ABI we are using.
|
|
- echo '#line 8775 "configure"' > conftest.$ac_ext
|
|
+ echo '#line 8967 "configure"' > conftest.$ac_ext
|
|
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
|
(eval $ac_compile) 2>&5
|
|
ac_status=$?
|
|
@@ -10032,11 +10224,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:10035: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:10227: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:10039: \$? = $ac_status" >&5
|
|
+ echo "$as_me:10231: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -10371,11 +10563,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:10374: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:10566: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>conftest.err)
|
|
ac_status=$?
|
|
cat conftest.err >&5
|
|
- echo "$as_me:10378: \$? = $ac_status" >&5
|
|
+ echo "$as_me:10570: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
# So say no if there are warnings other than the usual output.
|
|
@@ -10476,11 +10668,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:10479: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:10671: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:10483: \$? = $ac_status" >&5
|
|
+ echo "$as_me:10675: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -10531,11 +10723,11 @@
|
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
|
-e 's:$: $lt_compiler_flag:'`
|
|
- (eval echo "\"\$as_me:10534: $lt_compile\"" >&5)
|
|
+ (eval echo "\"\$as_me:10726: $lt_compile\"" >&5)
|
|
(eval "$lt_compile" 2>out/conftest.err)
|
|
ac_status=$?
|
|
cat out/conftest.err >&5
|
|
- echo "$as_me:10538: \$? = $ac_status" >&5
|
|
+ echo "$as_me:10730: \$? = $ac_status" >&5
|
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
|
then
|
|
# The compiler can only warn and ignore the option if not recognized
|
|
@@ -12915,7 +13107,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 12918 "configure"
|
|
+#line 13110 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
@@ -13011,7 +13203,7 @@
|
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
|
lt_status=$lt_dlunknown
|
|
cat > conftest.$ac_ext <<_LT_EOF
|
|
-#line 13014 "configure"
|
|
+#line 13206 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#if HAVE_DLFCN_H
|
|
diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
|
|
--- mpfr-3.0.0-a/mpfr.h 2010-06-23 11:03:20.000000000 +0000
|
|
+++ mpfr-3.0.0-b/mpfr.h 2010-06-25 13:23:13.000000000 +0000
|
|
@@ -27,7 +27,7 @@
|
|
#define MPFR_VERSION_MAJOR 3
|
|
#define MPFR_VERSION_MINOR 0
|
|
#define MPFR_VERSION_PATCHLEVEL 0
|
|
-#define MPFR_VERSION_STRING "3.0.0-p1"
|
|
+#define MPFR_VERSION_STRING "3.0.0-p2"
|
|
|
|
/* Macros dealing with MPFR VERSION */
|
|
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
|
diff -Naurd mpfr-3.0.0-a/tests/Makefile.in mpfr-3.0.0-b/tests/Makefile.in
|
|
--- mpfr-3.0.0-a/tests/Makefile.in 2010-06-10 11:00:52.000000000 +0000
|
|
+++ mpfr-3.0.0-b/tests/Makefile.in 2010-06-10 11:00:52.000000000 +0000
|
|
@@ -960,6 +960,7 @@
|
|
red=; grn=; lgn=; blu=; std=
|
|
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
|
ACLOCAL = @ACLOCAL@
|
|
+ALLOCA = @ALLOCA@
|
|
AMTAR = @AMTAR@
|
|
AR = @AR@
|
|
AS = @AS@
|
|
diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
|
|
--- mpfr-3.0.0-a/version.c 2010-06-23 11:03:20.000000000 +0000
|
|
+++ mpfr-3.0.0-b/version.c 2010-06-25 13:23:13.000000000 +0000
|
|
@@ -25,5 +25,5 @@
|
|
const char *
|
|
mpfr_get_version (void)
|
|
{
|
|
- return "3.0.0-p1";
|
|
+ return "3.0.0-p2";
|
|
}
|
|
diff -Naurd mpfr-3.0.0-a/PATCHES mpfr-3.0.0-b/PATCHES
|
|
--- mpfr-3.0.0-a/PATCHES 2010-07-10 00:11:19.000000000 +0000
|
|
+++ mpfr-3.0.0-b/PATCHES 2010-07-10 00:12:50.000000000 +0000
|
|
@@ -0,0 +1 @@
|
|
+gamma_underflow
|
|
diff -Naurd mpfr-3.0.0-a/VERSION mpfr-3.0.0-b/VERSION
|
|
--- mpfr-3.0.0-a/VERSION 2010-06-25 13:23:13.000000000 +0000
|
|
+++ mpfr-3.0.0-b/VERSION 2010-07-10 00:11:53.000000000 +0000
|
|
@@ -1 +1 @@
|
|
-3.0.0-p2
|
|
+3.0.0-p3
|
|
diff -Naurd mpfr-3.0.0-a/gamma.c mpfr-3.0.0-b/gamma.c
|
|
--- mpfr-3.0.0-a/gamma.c 2010-06-10 11:00:14.000000000 +0000
|
|
+++ mpfr-3.0.0-b/gamma.c 2010-07-10 00:11:46.000000000 +0000
|
|
@@ -274,7 +274,7 @@
|
|
/* we want an upper bound for x * [log(2-x)-1].
|
|
since x < 0, we need a lower bound on log(2-x) */
|
|
mpfr_ui_sub (xp, 2, x, MPFR_RNDD);
|
|
- mpfr_log (xp, xp, MPFR_RNDD);
|
|
+ mpfr_log2 (xp, xp, MPFR_RNDD);
|
|
mpfr_sub_ui (xp, xp, 1, MPFR_RNDD);
|
|
mpfr_mul (xp, xp, x, MPFR_RNDU);
|
|
|
|
@@ -303,8 +303,8 @@
|
|
{
|
|
mpfr_sub (tmp, tmp, tmp2, MPFR_RNDZ); /* low bnd on |sin(Pi*(2-x))| */
|
|
mpfr_ui_div (tmp, 12, tmp, MPFR_RNDU); /* upper bound */
|
|
- mpfr_log (tmp, tmp, MPFR_RNDU);
|
|
- mpfr_add (tmp, tmp, xp, MPFR_RNDU);
|
|
+ mpfr_log2 (tmp, tmp, MPFR_RNDU);
|
|
+ mpfr_add (xp, tmp, xp, MPFR_RNDU);
|
|
underflow = mpfr_cmp_si (xp, expo.saved_emin - 2) <= 0;
|
|
}
|
|
|
|
diff -Naurd mpfr-3.0.0-a/mpfr.h mpfr-3.0.0-b/mpfr.h
|
|
--- mpfr-3.0.0-a/mpfr.h 2010-06-25 13:23:13.000000000 +0000
|
|
+++ mpfr-3.0.0-b/mpfr.h 2010-07-10 00:11:53.000000000 +0000
|
|
@@ -27,7 +27,7 @@
|
|
#define MPFR_VERSION_MAJOR 3
|
|
#define MPFR_VERSION_MINOR 0
|
|
#define MPFR_VERSION_PATCHLEVEL 0
|
|
-#define MPFR_VERSION_STRING "3.0.0-p2"
|
|
+#define MPFR_VERSION_STRING "3.0.0-p3"
|
|
|
|
/* Macros dealing with MPFR VERSION */
|
|
#define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
|
|
diff -Naurd mpfr-3.0.0-a/tests/tgamma.c mpfr-3.0.0-b/tests/tgamma.c
|
|
--- mpfr-3.0.0-a/tests/tgamma.c 2010-06-10 11:00:13.000000000 +0000
|
|
+++ mpfr-3.0.0-b/tests/tgamma.c 2010-07-10 00:11:46.000000000 +0000
|
|
@@ -461,6 +461,20 @@
|
|
mpfr_clear (x);
|
|
}
|
|
|
|
+/* bug found by Stathis, only occurs on 32-bit machines */
|
|
+static void
|
|
+test20100709 (void)
|
|
+{
|
|
+ mpfr_t x;
|
|
+ int inex;
|
|
+
|
|
+ mpfr_init2 (x, 100);
|
|
+ mpfr_set_str (x, "-4.6308260837372266e+07", 10, MPFR_RNDN);
|
|
+ inex = mpfr_gamma (x, x, MPFR_RNDN);
|
|
+ MPFR_ASSERTN(MPFR_IS_ZERO(x) && MPFR_IS_NEG(x) && inex > 0);
|
|
+ mpfr_clear (x);
|
|
+}
|
|
+
|
|
int
|
|
main (int argc, char *argv[])
|
|
{
|
|
@@ -471,6 +485,7 @@
|
|
test_generic (2, 100, 2);
|
|
gamma_integer ();
|
|
test20071231 ();
|
|
+ test20100709 ();
|
|
|
|
data_check ("data/gamma", mpfr_gamma, "mpfr_gamma");
|
|
|
|
diff -Naurd mpfr-3.0.0-a/version.c mpfr-3.0.0-b/version.c
|
|
--- mpfr-3.0.0-a/version.c 2010-06-25 13:23:13.000000000 +0000
|
|
+++ mpfr-3.0.0-b/version.c 2010-07-10 00:11:53.000000000 +0000
|
|
@@ -25,5 +25,5 @@
|
|
const char *
|
|
mpfr_get_version (void)
|
|
{
|
|
- return "3.0.0-p2";
|
|
+ return "3.0.0-p3";
|
|
}
|