From c66a201ca32db2b40e1bb00451fb95af5971ee2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:21:27 +0000 Subject: [PATCH 01/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 5ab1de0..5725b9b 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 3.1.5 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.mpfr.org/ Source0: http://www.mpfr.org/mpfr-current/%{name}-%{version}.tar.xz # GFDL (mpfr.texi, mpfr.info and fdl.texi) @@ -82,6 +82,9 @@ fi %{_infodir}/mpfr.info* %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 3.1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 3.1.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From f422ddcf5e90501befbdd964ac07e1ce66e4a899 Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Sun, 25 Feb 2018 21:34:41 +0100 Subject: [PATCH 02/43] Rebase to 3.1.6 - related: #1489625 Correct encoding of the info file - resolves: #1299649 BuildRequire gcc (https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires) Other minor cleanups. Mostly provided by James Paul Turner --- .gitignore | 1 + mpfr.spec | 38 ++++--- rev11783.patch | 285 +++++++++++++++++++++++++++++++++++++++++++++++++ rev11982.patch | 111 +++++++++++++++++++ sources | 2 +- 5 files changed, 424 insertions(+), 13 deletions(-) create mode 100644 rev11783.patch create mode 100644 rev11982.patch diff --git a/.gitignore b/.gitignore index 217d397..1a3e231 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /mpfr-3.1.3.tar.xz /mpfr-3.1.4.tar.xz /mpfr-3.1.5.tar.xz +/mpfr-3.1.6.tar.xz diff --git a/mpfr.spec b/mpfr.spec index 5725b9b..5503110 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,16 +1,24 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr -Version: 3.1.5 -Release: 6%{?dist} +Version: 3.1.6 +Release: 1%{?dist} URL: http://www.mpfr.org/ -Source0: http://www.mpfr.org/mpfr-current/%{name}-%{version}.tar.xz -# GFDL (mpfr.texi, mpfr.info and fdl.texi) +# GFDL (mpfr.texi, mpfr.info and fdl.texi) License: LGPLv3+ and GPLv3+ and GFDL - -BuildRequires: autoconf libtool gmp-devel +BuildRequires: autoconf libtool gmp-devel gcc Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig -Requires: gmp >= 4.2.1 +Requires: gmp >= 4.2.3 + +Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=11783&view=revision +# http://www.mpfr.org/mpfr-3.1.6/patch01 +Patch0: rev11783.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=11982&view=revision +# http://www.mpfr.org/mpfr-3.1.6/patch02 +Patch1: rev11982.patch %description The MPFR library is a C library for multiple-precision floating-point @@ -20,7 +28,7 @@ ANSI/IEEE-754 standard for double-precision floating-point arithmetic (53-bit mantissa). MPFR is based on the GMP multiple-precision library. %package devel -Summary: Development tools A C library for mpfr library +Summary: Development files for the MPFR library Requires: %{name} = %{version}-%{release} Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -31,19 +39,17 @@ Header files and documentation for using the MPFR multiple-precision floating-point library in applications. If you want to develop applications which will use the MPFR library, -you'll need to install the mpfr-devel package. You'll also need to +you'll need to install the mpfr-devel package. You'll also need to install the mpfr package. %prep -%setup -q +%autosetup -p1 %build %configure --disable-assert --disable-static make %{?_smp_mflags} %install -iconv -f iso-8859-1 -t utf-8 doc/mpfr.info > doc/mpfr.info.aux -mv doc/mpfr.info.aux doc/mpfr.info make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -82,6 +88,14 @@ fi %{_infodir}/mpfr.info* %changelog +* Sun Feb 25 2018 James Paul Turner - 3.1.6-1 +- Update to MPFR version 3.1.6 +- Use autosetup specfile macro for applying patches (patches 1 and 2 applied) +- Removed iconv calls, as they were breaking .info files, which are now unicode + resolves #1299649 +- Other minor cleanups +- BuildRequire gcc per https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires + * Thu Feb 08 2018 Fedora Release Engineering - 3.1.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/rev11783.patch b/rev11783.patch new file mode 100644 index 0000000..5c742f0 --- /dev/null +++ b/rev11783.patch @@ -0,0 +1,285 @@ +diff -Naurd mpfr-3.1.6-a/PATCHES mpfr-3.1.6-b/PATCHES +--- mpfr-3.1.6-a/PATCHES 2017-10-26 13:55:51.168013439 +0000 ++++ mpfr-3.1.6-b/PATCHES 2017-10-26 13:55:51.236013121 +0000 +@@ -0,0 +1 @@ ++mpfr_get +diff -Naurd mpfr-3.1.6-a/VERSION mpfr-3.1.6-b/VERSION +--- mpfr-3.1.6-a/VERSION 2017-09-07 11:36:44.000000000 +0000 ++++ mpfr-3.1.6-b/VERSION 2017-10-26 13:55:51.236013121 +0000 +@@ -1 +1 @@ +-3.1.6 ++3.1.6-p1 +diff -Naurd mpfr-3.1.6-a/src/get_ld.c mpfr-3.1.6-b/src/get_ld.c +--- mpfr-3.1.6-a/src/get_ld.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/get_ld.c 2017-10-26 13:55:51.208013252 +0000 +@@ -41,6 +41,9 @@ + mpfr_exp_t sh; /* exponent shift, so that x/2^sh is in the double range */ + mpfr_t y, z; + int sign; ++ MPFR_SAVE_EXPO_DECL (expo); ++ ++ MPFR_SAVE_EXPO_MARK (expo); + + /* first round x to the target long double precision, so that + all subsequent operations are exact (this avoids double rounding +@@ -103,6 +106,7 @@ + } + if (sign < 0) + r = -r; ++ MPFR_SAVE_EXPO_FREE (expo); + return r; + } + } +diff -Naurd mpfr-3.1.6-a/src/get_si.c mpfr-3.1.6-b/src/get_si.c +--- mpfr-3.1.6-a/src/get_si.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/get_si.c 2017-10-26 13:55:51.208013252 +0000 +@@ -28,6 +28,7 @@ + mpfr_prec_t prec; + long s; + mpfr_t x; ++ MPFR_SAVE_EXPO_DECL (expo); + + if (MPFR_UNLIKELY (!mpfr_fits_slong_p (f, rnd))) + { +@@ -39,14 +40,22 @@ + if (MPFR_IS_ZERO (f)) + return (long) 0; + +- /* determine prec of long */ +- for (s = LONG_MIN, prec = 0; s != 0; s /= 2, prec++) ++ /* Determine the precision of long. |LONG_MIN| may have one more bit ++ as an integer, but in this case, this is a power of 2, thus fits ++ in a precision-prec floating-point number. */ ++ for (s = LONG_MAX, prec = 0; s != 0; s /= 2, prec++) + { } + ++ MPFR_SAVE_EXPO_MARK (expo); ++ + /* first round to prec bits */ + mpfr_init2 (x, prec); + mpfr_rint (x, f, rnd); + ++ /* The flags from mpfr_rint are the wanted ones. In particular, ++ it sets the inexact flag when necessary. */ ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); ++ + /* warning: if x=0, taking its exponent is illegal */ + if (MPFR_UNLIKELY (MPFR_IS_ZERO(x))) + s = 0; +@@ -65,5 +74,7 @@ + + mpfr_clear (x); + ++ MPFR_SAVE_EXPO_FREE (expo); ++ + return s; + } +diff -Naurd mpfr-3.1.6-a/src/get_sj.c mpfr-3.1.6-b/src/get_sj.c +--- mpfr-3.1.6-a/src/get_sj.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/get_sj.c 2017-10-26 13:55:51.208013252 +0000 +@@ -35,6 +35,7 @@ + intmax_t r; + mpfr_prec_t prec; + mpfr_t x; ++ MPFR_SAVE_EXPO_DECL (expo); + + if (MPFR_UNLIKELY (!mpfr_fits_intmax_p (f, rnd))) + { +@@ -46,20 +47,24 @@ + if (MPFR_IS_ZERO (f)) + return (intmax_t) 0; + +- /* determine the precision of intmax_t */ +- for (r = MPFR_INTMAX_MIN, prec = 0; r != 0; r /= 2, prec++) ++ /* Determine the precision of intmax_t. |INTMAX_MIN| may have one ++ more bit as an integer, but in this case, this is a power of 2, ++ thus fits in a precision-prec floating-point number. */ ++ for (r = MPFR_INTMAX_MAX, prec = 0; r != 0; r /= 2, prec++) + { } +- /* Note: though INTMAX_MAX would have been sufficient for the conversion, +- we chose INTMAX_MIN so that INTMAX_MIN - 1 is always representable in +- precision prec; this is useful to detect overflows in MPFR_RNDZ (will +- be needed later). */ + +- /* Now, r = 0. */ ++ MPFR_ASSERTD (r == 0); ++ ++ MPFR_SAVE_EXPO_MARK (expo); + + mpfr_init2 (x, prec); + mpfr_rint (x, f, rnd); + MPFR_ASSERTN (MPFR_IS_FP (x)); + ++ /* The flags from mpfr_rint are the wanted ones. In particular, ++ it sets the inexact flag when necessary. */ ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); ++ + if (MPFR_NOTZERO (x)) + { + mp_limb_t *xp; +@@ -67,15 +72,15 @@ + + xp = MPFR_MANT (x); + sh = MPFR_GET_EXP (x); +- MPFR_ASSERTN ((mpfr_prec_t) sh <= prec); ++ MPFR_ASSERTN ((mpfr_prec_t) sh <= prec + 1); + if (MPFR_INTMAX_MIN + MPFR_INTMAX_MAX != 0 +- && MPFR_UNLIKELY ((mpfr_prec_t) sh == prec)) ++ && MPFR_UNLIKELY ((mpfr_prec_t) sh > prec)) + { + /* 2's complement and x <= INTMAX_MIN: in the case mp_limb_t + has the same size as intmax_t, we cannot use the code in + the for loop since the operations would be performed in + unsigned arithmetic. */ +- MPFR_ASSERTN (MPFR_IS_NEG (x) && (mpfr_powerof2_raw (x))); ++ MPFR_ASSERTN (MPFR_IS_NEG (x) && mpfr_powerof2_raw (x)); + r = MPFR_INTMAX_MIN; + } + else if (MPFR_IS_POS (x)) +@@ -117,6 +122,8 @@ + + mpfr_clear (x); + ++ MPFR_SAVE_EXPO_FREE (expo); ++ + return r; + } + +diff -Naurd mpfr-3.1.6-a/src/get_ui.c mpfr-3.1.6-b/src/get_ui.c +--- mpfr-3.1.6-a/src/get_ui.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/get_ui.c 2017-10-26 13:55:51.208013252 +0000 +@@ -30,6 +30,7 @@ + mpfr_t x; + mp_size_t n; + mpfr_exp_t exp; ++ MPFR_SAVE_EXPO_DECL (expo); + + if (MPFR_UNLIKELY (!mpfr_fits_ulong_p (f, rnd))) + { +@@ -44,10 +45,16 @@ + for (s = ULONG_MAX, prec = 0; s != 0; s /= 2, prec ++) + { } + ++ MPFR_SAVE_EXPO_MARK (expo); ++ + /* first round to prec bits */ + mpfr_init2 (x, prec); + mpfr_rint (x, f, rnd); + ++ /* The flags from mpfr_rint are the wanted ones. In particular, ++ it sets the inexact flag when necessary. */ ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); ++ + /* warning: if x=0, taking its exponent is illegal */ + if (MPFR_IS_ZERO(x)) + s = 0; +@@ -61,5 +68,7 @@ + + mpfr_clear (x); + ++ MPFR_SAVE_EXPO_FREE (expo); ++ + return s; + } +diff -Naurd mpfr-3.1.6-a/src/get_uj.c mpfr-3.1.6-b/src/get_uj.c +--- mpfr-3.1.6-a/src/get_uj.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/get_uj.c 2017-10-26 13:55:51.208013252 +0000 +@@ -35,6 +35,7 @@ + uintmax_t r; + mpfr_prec_t prec; + mpfr_t x; ++ MPFR_SAVE_EXPO_DECL (expo); + + if (MPFR_UNLIKELY (!mpfr_fits_uintmax_p (f, rnd))) + { +@@ -50,12 +51,18 @@ + for (r = MPFR_UINTMAX_MAX, prec = 0; r != 0; r /= 2, prec++) + { } + +- /* Now, r = 0. */ ++ MPFR_ASSERTD (r == 0); ++ ++ MPFR_SAVE_EXPO_MARK (expo); + + mpfr_init2 (x, prec); + mpfr_rint (x, f, rnd); + MPFR_ASSERTN (MPFR_IS_FP (x)); + ++ /* The flags from mpfr_rint are the wanted ones. In particular, ++ it sets the inexact flag when necessary. */ ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); ++ + if (MPFR_NOTZERO (x)) + { + mp_limb_t *xp; +@@ -76,6 +83,8 @@ + + mpfr_clear (x); + ++ MPFR_SAVE_EXPO_FREE (expo); ++ + return r; + } + +diff -Naurd mpfr-3.1.6-a/src/get_z.c mpfr-3.1.6-b/src/get_z.c +--- mpfr-3.1.6-a/src/get_z.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/get_z.c 2017-10-26 13:55:51.208013252 +0000 +@@ -29,6 +29,7 @@ + int inex; + mpfr_t r; + mpfr_exp_t exp; ++ MPFR_SAVE_EXPO_DECL (expo); + + if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) + { +@@ -41,6 +42,8 @@ + return 0; + } + ++ MPFR_SAVE_EXPO_MARK (expo); ++ + exp = MPFR_GET_EXP (f); + /* if exp <= 0, then |f|<1, thus |o(f)|<=1 */ + MPFR_ASSERTN (exp < 0 || exp <= MPFR_PREC_MAX); +@@ -50,6 +53,11 @@ + MPFR_ASSERTN (inex != 1 && inex != -1); /* integral part of f is + representable in r */ + MPFR_ASSERTN (MPFR_IS_FP (r)); ++ ++ /* The flags from mpfr_rint are the wanted ones. In particular, ++ it sets the inexact flag when necessary. */ ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); ++ + exp = mpfr_get_z_2exp (z, r); + if (exp >= 0) + mpz_mul_2exp (z, z, exp); +@@ -57,5 +65,7 @@ + mpz_fdiv_q_2exp (z, z, -exp); + mpfr_clear (r); + ++ MPFR_SAVE_EXPO_FREE (expo); ++ + return inex; + } +diff -Naurd mpfr-3.1.6-a/src/mpfr.h mpfr-3.1.6-b/src/mpfr.h +--- mpfr-3.1.6-a/src/mpfr.h 2017-09-07 11:36:44.000000000 +0000 ++++ mpfr-3.1.6-b/src/mpfr.h 2017-10-26 13:55:51.232013138 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 6 +-#define MPFR_VERSION_STRING "3.1.6" ++#define MPFR_VERSION_STRING "3.1.6-p1" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.6-a/src/version.c mpfr-3.1.6-b/src/version.c +--- mpfr-3.1.6-a/src/version.c 2017-09-07 11:36:44.000000000 +0000 ++++ mpfr-3.1.6-b/src/version.c 2017-10-26 13:55:51.232013138 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.6"; ++ return "3.1.6-p1"; + } diff --git a/rev11982.patch b/rev11982.patch new file mode 100644 index 0000000..6bf8322 --- /dev/null +++ b/rev11982.patch @@ -0,0 +1,111 @@ +diff -Naurd mpfr-3.1.6-a/PATCHES mpfr-3.1.6-b/PATCHES +--- mpfr-3.1.6-a/PATCHES 2017-12-15 12:37:44.074256548 +0000 ++++ mpfr-3.1.6-b/PATCHES 2017-12-15 12:37:44.146256304 +0000 +@@ -0,0 +1 @@ ++root +diff -Naurd mpfr-3.1.6-a/VERSION mpfr-3.1.6-b/VERSION +--- mpfr-3.1.6-a/VERSION 2017-10-26 13:55:51.236013121 +0000 ++++ mpfr-3.1.6-b/VERSION 2017-12-15 12:37:44.142256319 +0000 +@@ -1 +1 @@ +-3.1.6-p1 ++3.1.6-p2 +diff -Naurd mpfr-3.1.6-a/src/mpfr.h mpfr-3.1.6-b/src/mpfr.h +--- mpfr-3.1.6-a/src/mpfr.h 2017-10-26 13:55:51.232013138 +0000 ++++ mpfr-3.1.6-b/src/mpfr.h 2017-12-15 12:37:44.142256319 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 3 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 6 +-#define MPFR_VERSION_STRING "3.1.6-p1" ++#define MPFR_VERSION_STRING "3.1.6-p2" + + /* Macros dealing with MPFR VERSION */ + #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) +diff -Naurd mpfr-3.1.6-a/src/root.c mpfr-3.1.6-b/src/root.c +--- mpfr-3.1.6-a/src/root.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/src/root.c 2017-12-15 12:37:44.118256398 +0000 +@@ -107,6 +107,11 @@ + MPFR_RET_NAN; + } + ++ /* Special case |x| = 1. Note that if x = -1, then k is odd ++ (NaN results have already been filtered), so that y = -1. */ ++ if (mpfr_cmpabs (x, __gmpfr_one) == 0) ++ return mpfr_set (y, x, rnd_mode); ++ + /* General case */ + + /* For large k, use exp(log(x)/k). The threshold of 100 seems to be quite +@@ -188,6 +193,14 @@ + Assume all special cases have been eliminated before. + In the extended exponent range, overflows/underflows are not possible. + Assume x > 0, or x < 0 and k odd. ++ Also assume |x| <> 1 because log(1) = 0, which does not have an exponent ++ and would yield a failure in the error bound computation. A priori, this ++ constraint is quite artificial because if |x| is close enough to 1, then ++ the exponent of log|x| does not need to be used (in the code, err would ++ be 1 in such a domain). So this constraint |x| <> 1 could be avoided in ++ the code. However, this is an exact case easy to detect, so that such a ++ change would be useless. Values very close to 1 are not an issue, since ++ an underflow is not possible before the MPFR_GET_EXP. + */ + static int + mpfr_root_aux (mpfr_ptr y, mpfr_srcptr x, unsigned long k, mpfr_rnd_t rnd_mode) +@@ -219,7 +232,8 @@ + mpfr_log (t, absx, MPFR_RNDN); + /* t = log|x| * (1 + theta) with |theta| <= 2^(-w) */ + mpfr_div_ui (t, t, k, MPFR_RNDN); +- expt = MPFR_GET_EXP (t); ++ /* No possible underflow in mpfr_log and mpfr_div_ui. */ ++ expt = MPFR_GET_EXP (t); /* assumes t <> 0 */ + /* t = log|x|/k * (1 + theta) + eps with |theta| <= 2^(-w) + and |eps| <= 1/2 ulp(t), thus the total error is bounded + by 1.5 * 2^(expt - w) */ +diff -Naurd mpfr-3.1.6-a/src/version.c mpfr-3.1.6-b/src/version.c +--- mpfr-3.1.6-a/src/version.c 2017-10-26 13:55:51.232013138 +0000 ++++ mpfr-3.1.6-b/src/version.c 2017-12-15 12:37:44.142256319 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "3.1.6-p1"; ++ return "3.1.6-p2"; + } +diff -Naurd mpfr-3.1.6-a/tests/troot.c mpfr-3.1.6-b/tests/troot.c +--- mpfr-3.1.6-a/tests/troot.c 2017-01-01 01:39:09.000000000 +0000 ++++ mpfr-3.1.6-b/tests/troot.c 2017-12-15 12:37:44.118256398 +0000 +@@ -405,6 +405,26 @@ + mpfr_clears (x, y1, y2, (mpfr_ptr) 0); + } + ++static void ++bug20171214 (void) ++{ ++ mpfr_t x, y; ++ int inex; ++ ++ mpfr_init2 (x, 805); ++ mpfr_init2 (y, 837); ++ mpfr_set_ui (x, 1, MPFR_RNDN); ++ inex = mpfr_root (y, x, 120, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ MPFR_ASSERTN (mpfr_cmp_ui (y, 1) == 0); ++ mpfr_set_si (x, -1, MPFR_RNDN); ++ inex = mpfr_root (y, x, 121, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ MPFR_ASSERTN (mpfr_cmp_si (y, -1) == 0); ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ + int + main (void) + { +@@ -415,6 +435,7 @@ + + tests_start_mpfr (); + ++ bug20171214 (); + exact_powers (3, 1000); + special (); + bigint (); diff --git a/sources b/sources index 3cc9763..470faba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c4ac246cf9795a4491e7766002cd528f mpfr-3.1.5.tar.xz +SHA512 (mpfr-3.1.6.tar.xz) = 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 From 981068def2591acb10a284d5b9fbc8a59a51420c Mon Sep 17 00:00:00 2001 From: Pavel Cahyna Date: Mon, 12 Mar 2018 15:25:48 +0100 Subject: [PATCH 03/43] Add a simple test: computing a number in the Sylvester sequence https://www.gnu.org/software/gawk/manual/html_node/Arbitrary-Precision-Integers.html#Arbitrary-Precision-Integers --- tests/tests.yml | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 tests/tests.yml diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..dd32ccf --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,46 @@ +- hosts: all + vars: + - ansible_python_interpreter: /usr/bin/python3 + - artifacts: ./artifacts + tags: + - classic + - container + - atomic + tasks: + - name: create artifacts + file: + path: "{{ artifacts }}" + state: directory + delegate_to: localhost + + - name: do it all + block: + - name: calculate Silvester number + command: | + gawk -M 'BEGIN { + s = 2 + for (i = 1; i <= 7; i++) + s = s * (s - 1) + 1 + print s + }' + register: silvester + + - name: verify Silvester number + fail: + when: silvester.stdout != '113423713055421844361000443' + + always: + - name: write log + copy: + content: | + stderr: + {{ silvester.stderr }} + stdout: + {{ silvester.stdout }} + dest: "{{ artifacts }}/test.log" + delegate_to: localhost + +# fetch: +# dest: "{{ artifacts }}/" +# src: "/tmp/test.log" +# flat: yes From 14044d1ec9e7a66c1243aeaac53f97e57f60c383 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:05:54 +0000 Subject: [PATCH 04/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 5503110..551f215 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 3.1.6 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mpfr.org/ # GFDL (mpfr.texi, mpfr.info and fdl.texi) License: LGPLv3+ and GPLv3+ and GFDL @@ -88,6 +88,9 @@ fi %{_infodir}/mpfr.info* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 25 2018 James Paul Turner - 3.1.6-1 - Update to MPFR version 3.1.6 - Use autosetup specfile macro for applying patches (patches 1 and 2 applied) From f4dc0f3ecf220026ee999f07c8820a7b28d33ff3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 30 Oct 2018 07:03:02 -0500 Subject: [PATCH 05/43] update scriptlets (#1644106) use %make_build %make_install if this is intended to be used in fedora (28+) only, can drop the %%ldconfig_scriptlets and info-related scriptlets altogether. --- mpfr.spec | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/mpfr.spec b/mpfr.spec index 551f215..78709bc 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,13 +1,11 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 3.1.6 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mpfr.org/ # GFDL (mpfr.texi, mpfr.info and fdl.texi) License: LGPLv3+ and GPLv3+ and GFDL BuildRequires: autoconf libtool gmp-devel gcc -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig Requires: gmp >= 4.2.3 Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz @@ -29,9 +27,13 @@ ANSI/IEEE-754 standard for double-precision floating-point arithmetic %package devel Summary: Development files for the MPFR library -Requires: %{name} = %{version}-%{release} -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info +Requires: %{name}%{?_isa} = %{version}-%{release} +# https://fedoraproject.org/wiki/Packaging:Scriptlets#Texinfo +%if 0%{?fedora} < 28 && 0%{?rhel} < 8 +%global info_scriptlet 1 +Requires(post): info +Requires(preun): info +%endif Requires: gmp-devel %description devel @@ -47,10 +49,10 @@ install the mpfr package. %build %configure --disable-assert --disable-static -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.la rm -f $RPM_BUILD_ROOT%{_infodir}/dir @@ -60,10 +62,9 @@ rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/COPYING $RPM_BUILD_ROOT%{_pkgdocdir}/COPYING %check make %{?_smp_mflags} check -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets +%if 0%{?info_scriptlet} %post devel if [ -f %{_infodir}/mpfr.info.gz ]; then /sbin/install-info %{_infodir}/mpfr.info.gz %{_infodir}/dir || : @@ -75,6 +76,7 @@ if [ "$1" = 0 ]; then /sbin/install-info --delete %{_infodir}/mpfr.info.gz %{_infodir}/dir || : fi fi +%endif %files %license COPYING COPYING.LESSER @@ -88,6 +90,10 @@ fi %{_infodir}/mpfr.info* %changelog +* Tue Oct 30 2018 Rex Dieter - 3.1.6-3 +- update scriptlets (#1644106) +- use %%make_build %%make_install + * Fri Jul 13 2018 Fedora Release Engineering - 3.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 22423e7314fcbf9c1cde72e831545c2381d4fa56 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 27 Jan 2019 19:39:22 +0100 Subject: [PATCH 06/43] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- mpfr.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/mpfr.spec b/mpfr.spec index 78709bc..c28e6fc 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -64,20 +64,6 @@ make %{?_smp_mflags} check %ldconfig_scriptlets -%if 0%{?info_scriptlet} -%post devel -if [ -f %{_infodir}/mpfr.info.gz ]; then - /sbin/install-info %{_infodir}/mpfr.info.gz %{_infodir}/dir || : -fi - -%preun devel -if [ "$1" = 0 ]; then - if [ -f %{_infodir}/mpfr.info.gz ]; then - /sbin/install-info --delete %{_infodir}/mpfr.info.gz %{_infodir}/dir || : - fi -fi -%endif - %files %license COPYING COPYING.LESSER %doc NEWS README AUTHORS BUGS TODO doc/FAQ.html From 715bcf1e4e08ba6ade6c10a8b4e8e486a336fec2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:34:21 +0000 Subject: [PATCH 07/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index c28e6fc..5816691 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 3.1.6 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mpfr.org/ # GFDL (mpfr.texi, mpfr.info and fdl.texi) License: LGPLv3+ and GPLv3+ and GFDL @@ -76,6 +76,9 @@ make %{?_smp_mflags} check %{_infodir}/mpfr.info* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 3.1.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Oct 30 2018 Rex Dieter - 3.1.6-3 - update scriptlets (#1644106) - use %%make_build %%make_install From 6fea43f235ff5bbf67831f4e494bb3680e0a9e40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:48:22 +0000 Subject: [PATCH 08/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 5816691..80abca4 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 3.1.6 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.mpfr.org/ # GFDL (mpfr.texi, mpfr.info and fdl.texi) License: LGPLv3+ and GPLv3+ and GFDL @@ -76,6 +76,9 @@ make %{?_smp_mflags} check %{_infodir}/mpfr.info* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 3.1.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From aaf4648ad58bfa48e3d76067284306fedbfe7674 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 8 Oct 2019 14:28:34 -0600 Subject: [PATCH 09/43] Update to MPFR version 4.0.2 plus patch01. Also: - Make mpfr3 and mpfr3-devel subpackages for version 3.1.6 - Add a -doc subpackage to hold the GFDL-licensed content - The main package license is LGPLv3+; the GPLv3+ content is not packaged - Drop unnecessary autoconf and libtool BRs - Drop explicit R on gmp; it is autogenerated - Drop info scriptlets; this version can never appear in Fedora < 32 or RHEL < 9 - Drop ldconfig_scriptlets for the same reason - Make sure there are no rpaths and that -Wl,--as-needed takes effect - Do not use the %%doc macro; the files have already been copied --- .gitignore | 9 +-- mpfr.rpmlintrc | 5 ++ mpfr.spec | 188 +++++++++++++++++++++++++++++++++++++++++-------- rev13499.patch | 44 ++++++++++++ sources | 1 + 5 files changed, 210 insertions(+), 37 deletions(-) create mode 100644 mpfr.rpmlintrc create mode 100644 rev13499.patch diff --git a/.gitignore b/.gitignore index 1a3e231..90b17ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,2 @@ -/mpfr-3.1.1.tar.xz -/mpfr-3.1.2.zip -/mpfr-3.1.2.tar.xz -/mpfr-3.1.3.tar.xz -/mpfr-3.1.4.tar.xz -/mpfr-3.1.5.tar.xz -/mpfr-3.1.6.tar.xz +/mpfr-*.zip +/mpfr-*.tar.xz diff --git a/mpfr.rpmlintrc b/mpfr.rpmlintrc new file mode 100644 index 0000000..1379528 --- /dev/null +++ b/mpfr.rpmlintrc @@ -0,0 +1,5 @@ +# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON +# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors + +# Documentation is in the -doc subpackage +addFilter(r'^mpfr.?-devel\.[^:]+: W: no-documentation') diff --git a/mpfr.spec b/mpfr.spec index 80abca4..4b4eb1e 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,81 +1,209 @@ +# MPFR versions 3 and 4 must exist in parallel until we can move all +# consumers to version 4. +%global mpfr3ver 3.1.6 + Summary: A C library for multiple-precision floating-point computations Name: mpfr -Version: 3.1.6 -Release: 5%{?dist} +Version: 4.0.2 +Release: 1%{?dist} URL: http://www.mpfr.org/ -# GFDL (mpfr.texi, mpfr.info and fdl.texi) -License: LGPLv3+ and GPLv3+ and GFDL -BuildRequires: autoconf libtool gmp-devel gcc -Requires: gmp >= 4.2.3 + +License: LGPLv3+ +BuildRequires: gmp-devel gcc Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz +Source1: http://www.mpfr.org/%{name}-%{mpfr3ver}/%{name}-%{mpfr3ver}.tar.xz + +## MPFR 4 patches + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13499&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch01 +Patch0: rev13499.patch + +## MPFR 3 patches # https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=11783&view=revision # http://www.mpfr.org/mpfr-3.1.6/patch01 -Patch0: rev11783.patch +Patch100: rev11783.patch # https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=11982&view=revision # http://www.mpfr.org/mpfr-3.1.6/patch02 -Patch1: rev11982.patch +Patch101: rev11982.patch %description The MPFR library is a C library for multiple-precision floating-point -computations with "correct rounding". The MPFR is efficient and -also has a well-defined semantics. It copies the good ideas from the -ANSI/IEEE-754 standard for double-precision floating-point arithmetic +computations with "correct rounding". The MPFR is efficient and +also has a well-defined semantics. It copies the good ideas from the +ANSI/IEEE-754 standard for double-precision floating-point arithmetic (53-bit mantissa). MPFR is based on the GMP multiple-precision library. %package devel Summary: Development files for the MPFR library Requires: %{name}%{?_isa} = %{version}-%{release} -# https://fedoraproject.org/wiki/Packaging:Scriptlets#Texinfo -%if 0%{?fedora} < 28 && 0%{?rhel} < 8 -%global info_scriptlet 1 -Requires(post): info -Requires(preun): info -%endif -Requires: gmp-devel +Requires: gmp-devel%{?_isa} %description devel -Header files and documentation for using the MPFR +Header files and documentation for using the MPFR multiple-precision floating-point library in applications. If you want to develop applications which will use the MPFR library, you'll need to install the mpfr-devel package. You'll also need to install the mpfr package. +%package doc +Summary: Documentation for the MPFR library +License: GFDL +BuildArch: noarch + +%description doc +Documentation for the MPFR library. + +%package -n mpfr3 +Version: %{mpfr3ver} +Summary: C library for multiple-precision floating point computations + +%description -n mpfr3 +The MPFR library is a C library for multiple-precision floating-point +computations with "correct rounding". The MPFR is efficient and +also has a well-defined semantics. It copies the good ideas from the +ANSI/IEEE-754 standard for double-precision floating-point arithmetic +(53-bit mantissa). MPFR is based on the GMP multiple-precision library. + +%package -n mpfr3-devel +Version: %{mpfr3ver} +Summary: Development files for the MPFR library +Requires: mpfr3%{?_isa} = %{mpfr3ver}-%{release} +Requires: gmp-devel%{?_isa} + +%description -n mpfr3-devel +Header files and documentation for using the MPFR +multiple-precision floating-point library in applications. + +If you want to develop applications which will use the MPFR library, +you'll need to install the mpfr3-devel package. You'll also need to +install the mpfr3 package. + %prep -%autosetup -p1 +%setup -q +%setup -q -T -D -a 1 +%patch0 -p1 + +# Apply mpfr3 patches +cd %{name}-%{mpfr3ver} +%patch100 -p1 +%patch101 -p1 +cd - %build %configure --disable-assert --disable-static + +# Get rid of undesirable hardcoded rpaths; workaround libtool reordering +# -Wl,--as-needed after all the libraries. +sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \ + -i libtool + %make_build +# Build mpfr3 +cd %{name}-%{mpfr3ver} +%configure --disable-assert --disable-static + +# Get rid of undesirable hardcoded rpaths; workaround libtool reordering +# -Wl,--as-needed after all the libraries. +sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e 's|CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \ + -i libtool + +%make_build +cd - + %install +# Install mpfr3 +cd %{name}-%{mpfr3ver} %make_install -rm -f $RPM_BUILD_ROOT%{_libdir}/libmpfr.la -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -fr %{buildroot}%{_infodir} +rm %{buildroot}%{_libdir}/libmpfr.so +ln -s libmpfr.so.4 %{buildroot}%{_libdir}/libmpfr3.so + +# Fix up the documentation +mv %{buildroot}%{_datadir}/doc/mpfr %{buildroot}%{_docdir}/mpfr3 +cp -p PATCHES README %{buildroot}%{_docdir}/mpfr3 +rm -fr %{buildroot}%{_docdir}/mpfr3/{AUTHORS,examples,FAQ.html,TODO} + +# These go into licenses, not doc +rm -f %{buildroot}%{_docdir}/mpfr3/COPYING{,.LESSER} + +# Stay out of the way of mpfr 4 +mv %{buildroot}%{_includedir}/mpf2mpfr.h %{buildroot}%{_includedir}/mpf2mpfr3.h +mv %{buildroot}%{_includedir}/mpfr.h %{buildroot}%{_includedir}/mpfr3.h +cd - + +# Install mpfr4 +%make_install +cp -p PATCHES README %{buildroot}%{_pkgdocdir} +rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_infodir}/dir #these go into licenses, not doc -rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/COPYING $RPM_BUILD_ROOT%{_pkgdocdir}/COPYING.LESSER +rm -f %{buildroot}%{_pkgdocdir}/COPYING{,.LESSER} %check -make %{?_smp_mflags} check - -%ldconfig_scriptlets +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +%make_build check +cd %{name}-%{mpfr3ver} +%make_build check +cd - %files %license COPYING COPYING.LESSER -%doc NEWS README AUTHORS BUGS TODO doc/FAQ.html -%{_libdir}/libmpfr.so.* +%{_pkgdocdir}/BUGS +%{_pkgdocdir}/NEWS +%{_pkgdocdir}/PATCHES +%{_pkgdocdir}/README +%{_libdir}/libmpfr.so.6* %files devel -%{_pkgdocdir}/examples %{_libdir}/libmpfr.so -%{_includedir}/*.h +%{_includedir}/mpfr.h +%{_includedir}/mpf2mpfr.h +%{_libdir}/pkgconfig/mpfr.pc + +%files doc +%{_pkgdocdir}/AUTHORS +%{_pkgdocdir}/examples +%{_pkgdocdir}/FAQ.html +%{_pkgdocdir}/TODO %{_infodir}/mpfr.info* +%files -n mpfr3 +%license COPYING COPYING.LESSER +%{_docdir}/mpfr3/BUGS +%{_docdir}/mpfr3/NEWS +%{_docdir}/mpfr3/PATCHES +%{_docdir}/mpfr3/README +%{_libdir}/libmpfr.so.4* + +%files -n mpfr3-devel +%{_libdir}/libmpfr3.so +%{_includedir}/mpfr3.h +%{_includedir}/mpf2mpfr3.h + %changelog +* Tue Oct 8 2019 Jerry James - 4.0.2-1 +- Update to MPFR version 4.0.2 plus patch01 +- Make mpfr3 and mpfr3-devel subpackages for version 3.1.6 +- Add a -doc subpackage to hold the GFDL-licensed content +- The main package license is LGPLv3+; the GPLv3+ content is not packaged +- Drop unnecessary autoconf and libtool BRs +- Drop explicit R on gmp; it is autogenerated +- Drop info scriptlets; this version can never appear in Fedora < 32 or RHEL < 9 +- Drop ldconfig_scriptlets for the same reason +- Make sure there are no rpaths and that -Wl,--as-needed takes effect +- Do not use the %%doc macro; the files have already been copied + * Thu Jul 25 2019 Fedora Release Engineering - 3.1.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/rev13499.patch b/rev13499.patch new file mode 100644 index 0000000..ea51e29 --- /dev/null +++ b/rev13499.patch @@ -0,0 +1,44 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2019-06-02 17:05:36.121226916 +0000 ++++ mpfr-4.0.2-b/PATCHES 2019-06-02 17:05:36.157226621 +0000 +@@ -0,0 +1 @@ ++include-float +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2019-01-31 20:29:48.000000000 +0000 ++++ mpfr-4.0.2-b/VERSION 2019-06-02 17:05:36.157226621 +0000 +@@ -1 +1 @@ +-4.0.2 ++4.0.2-p1 +diff -Naurd mpfr-4.0.2-a/src/mpfr-impl.h mpfr-4.0.2-b/src/mpfr-impl.h +--- mpfr-4.0.2-a/src/mpfr-impl.h 2019-01-27 18:30:16.000000000 +0000 ++++ mpfr-4.0.2-b/src/mpfr-impl.h 2019-06-02 17:05:36.145226719 +0000 +@@ -57,6 +57,7 @@ + + #include + #include ++#include /* for FLT_RADIX, etc., tested below */ + + + /****************************************************** +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2019-01-31 20:29:48.000000000 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2019-06-02 17:05:36.153226653 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2" ++#define MPFR_VERSION_STRING "4.0.2-p1" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2019-01-31 20:29:48.000000000 +0000 ++++ mpfr-4.0.2-b/src/version.c 2019-06-02 17:05:36.153226653 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2"; ++ return "4.0.2-p1"; + } diff --git a/sources b/sources index 470faba..6422b9f 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (mpfr-3.1.6.tar.xz) = 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 +SHA512 (mpfr-4.0.2.tar.xz) = d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88 From acb683824180b8d2ee9c163f9023305199f84a8e Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Oct 2019 10:41:13 -0600 Subject: [PATCH 10/43] Drop the mpfr3 and mpfr3-devel subpackages. --- mpfr.spec | 114 +++----------------- rev11783.patch | 285 ------------------------------------------------- rev11982.patch | 111 ------------------- sources | 1 - 4 files changed, 12 insertions(+), 499 deletions(-) delete mode 100644 rev11783.patch delete mode 100644 rev11982.patch diff --git a/mpfr.spec b/mpfr.spec index 4b4eb1e..cee6f50 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,34 +1,21 @@ -# MPFR versions 3 and 4 must exist in parallel until we can move all -# consumers to version 4. -%global mpfr3ver 3.1.6 - Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 4.0.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ BuildRequires: gmp-devel gcc Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz -Source1: http://www.mpfr.org/%{name}-%{mpfr3ver}/%{name}-%{mpfr3ver}.tar.xz - -## MPFR 4 patches # https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13499&view=revision # https://www.mpfr.org/mpfr-4.0.2/patch01 Patch0: rev13499.patch -## MPFR 3 patches - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=11783&view=revision -# http://www.mpfr.org/mpfr-3.1.6/patch01 -Patch100: rev11783.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=11982&view=revision -# http://www.mpfr.org/mpfr-3.1.6/patch02 -Patch101: rev11982.patch +# This can be removed before the next build +Obsoletes: mpfr3 < 4.0.0 +Provides: mpfr3 = %{version}-%{release} %description The MPFR library is a C library for multiple-precision floating-point @@ -42,6 +29,10 @@ Summary: Development files for the MPFR library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} +# This can be removed before the next build +Obsoletes: mpfr3-devel < 4.0.0 +Provides: mpfr3-devel = %{version}-%{release} + %description devel Header files and documentation for using the MPFR multiple-precision floating-point library in applications. @@ -58,41 +49,8 @@ BuildArch: noarch %description doc Documentation for the MPFR library. -%package -n mpfr3 -Version: %{mpfr3ver} -Summary: C library for multiple-precision floating point computations - -%description -n mpfr3 -The MPFR library is a C library for multiple-precision floating-point -computations with "correct rounding". The MPFR is efficient and -also has a well-defined semantics. It copies the good ideas from the -ANSI/IEEE-754 standard for double-precision floating-point arithmetic -(53-bit mantissa). MPFR is based on the GMP multiple-precision library. - -%package -n mpfr3-devel -Version: %{mpfr3ver} -Summary: Development files for the MPFR library -Requires: mpfr3%{?_isa} = %{mpfr3ver}-%{release} -Requires: gmp-devel%{?_isa} - -%description -n mpfr3-devel -Header files and documentation for using the MPFR -multiple-precision floating-point library in applications. - -If you want to develop applications which will use the MPFR library, -you'll need to install the mpfr3-devel package. You'll also need to -install the mpfr3 package. - %prep -%setup -q -%setup -q -T -D -a 1 -%patch0 -p1 - -# Apply mpfr3 patches -cd %{name}-%{mpfr3ver} -%patch100 -p1 -%patch101 -p1 -cd - +%autosetup -p1 %build %configure --disable-assert --disable-static @@ -106,42 +64,7 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ %make_build -# Build mpfr3 -cd %{name}-%{mpfr3ver} -%configure --disable-assert --disable-static - -# Get rid of undesirable hardcoded rpaths; workaround libtool reordering -# -Wl,--as-needed after all the libraries. -sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ - -e 's|CC="\(g..\)"|CC="\1 -Wl,--as-needed"|' \ - -i libtool - -%make_build -cd - - %install -# Install mpfr3 -cd %{name}-%{mpfr3ver} -%make_install -rm -fr %{buildroot}%{_infodir} -rm %{buildroot}%{_libdir}/libmpfr.so -ln -s libmpfr.so.4 %{buildroot}%{_libdir}/libmpfr3.so - -# Fix up the documentation -mv %{buildroot}%{_datadir}/doc/mpfr %{buildroot}%{_docdir}/mpfr3 -cp -p PATCHES README %{buildroot}%{_docdir}/mpfr3 -rm -fr %{buildroot}%{_docdir}/mpfr3/{AUTHORS,examples,FAQ.html,TODO} - -# These go into licenses, not doc -rm -f %{buildroot}%{_docdir}/mpfr3/COPYING{,.LESSER} - -# Stay out of the way of mpfr 4 -mv %{buildroot}%{_includedir}/mpf2mpfr.h %{buildroot}%{_includedir}/mpf2mpfr3.h -mv %{buildroot}%{_includedir}/mpfr.h %{buildroot}%{_includedir}/mpfr3.h -cd - - -# Install mpfr4 %make_install cp -p PATCHES README %{buildroot}%{_pkgdocdir} rm -f %{buildroot}%{_libdir}/*.la @@ -153,9 +76,6 @@ rm -f %{buildroot}%{_pkgdocdir}/COPYING{,.LESSER} %check export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %make_build check -cd %{name}-%{mpfr3ver} -%make_build check -cd - %files %license COPYING COPYING.LESSER @@ -178,20 +98,10 @@ cd - %{_pkgdocdir}/TODO %{_infodir}/mpfr.info* -%files -n mpfr3 -%license COPYING COPYING.LESSER -%{_docdir}/mpfr3/BUGS -%{_docdir}/mpfr3/NEWS -%{_docdir}/mpfr3/PATCHES -%{_docdir}/mpfr3/README -%{_libdir}/libmpfr.so.4* - -%files -n mpfr3-devel -%{_libdir}/libmpfr3.so -%{_includedir}/mpfr3.h -%{_includedir}/mpf2mpfr3.h - %changelog +* Fri Oct 11 2019 Jerry James - 4.0.2-2 +- Drop the mpfr3 and mpfr3-devel subpackages + * Tue Oct 8 2019 Jerry James - 4.0.2-1 - Update to MPFR version 4.0.2 plus patch01 - Make mpfr3 and mpfr3-devel subpackages for version 3.1.6 diff --git a/rev11783.patch b/rev11783.patch deleted file mode 100644 index 5c742f0..0000000 --- a/rev11783.patch +++ /dev/null @@ -1,285 +0,0 @@ -diff -Naurd mpfr-3.1.6-a/PATCHES mpfr-3.1.6-b/PATCHES ---- mpfr-3.1.6-a/PATCHES 2017-10-26 13:55:51.168013439 +0000 -+++ mpfr-3.1.6-b/PATCHES 2017-10-26 13:55:51.236013121 +0000 -@@ -0,0 +1 @@ -+mpfr_get -diff -Naurd mpfr-3.1.6-a/VERSION mpfr-3.1.6-b/VERSION ---- mpfr-3.1.6-a/VERSION 2017-09-07 11:36:44.000000000 +0000 -+++ mpfr-3.1.6-b/VERSION 2017-10-26 13:55:51.236013121 +0000 -@@ -1 +1 @@ --3.1.6 -+3.1.6-p1 -diff -Naurd mpfr-3.1.6-a/src/get_ld.c mpfr-3.1.6-b/src/get_ld.c ---- mpfr-3.1.6-a/src/get_ld.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/get_ld.c 2017-10-26 13:55:51.208013252 +0000 -@@ -41,6 +41,9 @@ - mpfr_exp_t sh; /* exponent shift, so that x/2^sh is in the double range */ - mpfr_t y, z; - int sign; -+ MPFR_SAVE_EXPO_DECL (expo); -+ -+ MPFR_SAVE_EXPO_MARK (expo); - - /* first round x to the target long double precision, so that - all subsequent operations are exact (this avoids double rounding -@@ -103,6 +106,7 @@ - } - if (sign < 0) - r = -r; -+ MPFR_SAVE_EXPO_FREE (expo); - return r; - } - } -diff -Naurd mpfr-3.1.6-a/src/get_si.c mpfr-3.1.6-b/src/get_si.c ---- mpfr-3.1.6-a/src/get_si.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/get_si.c 2017-10-26 13:55:51.208013252 +0000 -@@ -28,6 +28,7 @@ - mpfr_prec_t prec; - long s; - mpfr_t x; -+ MPFR_SAVE_EXPO_DECL (expo); - - if (MPFR_UNLIKELY (!mpfr_fits_slong_p (f, rnd))) - { -@@ -39,14 +40,22 @@ - if (MPFR_IS_ZERO (f)) - return (long) 0; - -- /* determine prec of long */ -- for (s = LONG_MIN, prec = 0; s != 0; s /= 2, prec++) -+ /* Determine the precision of long. |LONG_MIN| may have one more bit -+ as an integer, but in this case, this is a power of 2, thus fits -+ in a precision-prec floating-point number. */ -+ for (s = LONG_MAX, prec = 0; s != 0; s /= 2, prec++) - { } - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - /* first round to prec bits */ - mpfr_init2 (x, prec); - mpfr_rint (x, f, rnd); - -+ /* The flags from mpfr_rint are the wanted ones. In particular, -+ it sets the inexact flag when necessary. */ -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); -+ - /* warning: if x=0, taking its exponent is illegal */ - if (MPFR_UNLIKELY (MPFR_IS_ZERO(x))) - s = 0; -@@ -65,5 +74,7 @@ - - mpfr_clear (x); - -+ MPFR_SAVE_EXPO_FREE (expo); -+ - return s; - } -diff -Naurd mpfr-3.1.6-a/src/get_sj.c mpfr-3.1.6-b/src/get_sj.c ---- mpfr-3.1.6-a/src/get_sj.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/get_sj.c 2017-10-26 13:55:51.208013252 +0000 -@@ -35,6 +35,7 @@ - intmax_t r; - mpfr_prec_t prec; - mpfr_t x; -+ MPFR_SAVE_EXPO_DECL (expo); - - if (MPFR_UNLIKELY (!mpfr_fits_intmax_p (f, rnd))) - { -@@ -46,20 +47,24 @@ - if (MPFR_IS_ZERO (f)) - return (intmax_t) 0; - -- /* determine the precision of intmax_t */ -- for (r = MPFR_INTMAX_MIN, prec = 0; r != 0; r /= 2, prec++) -+ /* Determine the precision of intmax_t. |INTMAX_MIN| may have one -+ more bit as an integer, but in this case, this is a power of 2, -+ thus fits in a precision-prec floating-point number. */ -+ for (r = MPFR_INTMAX_MAX, prec = 0; r != 0; r /= 2, prec++) - { } -- /* Note: though INTMAX_MAX would have been sufficient for the conversion, -- we chose INTMAX_MIN so that INTMAX_MIN - 1 is always representable in -- precision prec; this is useful to detect overflows in MPFR_RNDZ (will -- be needed later). */ - -- /* Now, r = 0. */ -+ MPFR_ASSERTD (r == 0); -+ -+ MPFR_SAVE_EXPO_MARK (expo); - - mpfr_init2 (x, prec); - mpfr_rint (x, f, rnd); - MPFR_ASSERTN (MPFR_IS_FP (x)); - -+ /* The flags from mpfr_rint are the wanted ones. In particular, -+ it sets the inexact flag when necessary. */ -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); -+ - if (MPFR_NOTZERO (x)) - { - mp_limb_t *xp; -@@ -67,15 +72,15 @@ - - xp = MPFR_MANT (x); - sh = MPFR_GET_EXP (x); -- MPFR_ASSERTN ((mpfr_prec_t) sh <= prec); -+ MPFR_ASSERTN ((mpfr_prec_t) sh <= prec + 1); - if (MPFR_INTMAX_MIN + MPFR_INTMAX_MAX != 0 -- && MPFR_UNLIKELY ((mpfr_prec_t) sh == prec)) -+ && MPFR_UNLIKELY ((mpfr_prec_t) sh > prec)) - { - /* 2's complement and x <= INTMAX_MIN: in the case mp_limb_t - has the same size as intmax_t, we cannot use the code in - the for loop since the operations would be performed in - unsigned arithmetic. */ -- MPFR_ASSERTN (MPFR_IS_NEG (x) && (mpfr_powerof2_raw (x))); -+ MPFR_ASSERTN (MPFR_IS_NEG (x) && mpfr_powerof2_raw (x)); - r = MPFR_INTMAX_MIN; - } - else if (MPFR_IS_POS (x)) -@@ -117,6 +122,8 @@ - - mpfr_clear (x); - -+ MPFR_SAVE_EXPO_FREE (expo); -+ - return r; - } - -diff -Naurd mpfr-3.1.6-a/src/get_ui.c mpfr-3.1.6-b/src/get_ui.c ---- mpfr-3.1.6-a/src/get_ui.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/get_ui.c 2017-10-26 13:55:51.208013252 +0000 -@@ -30,6 +30,7 @@ - mpfr_t x; - mp_size_t n; - mpfr_exp_t exp; -+ MPFR_SAVE_EXPO_DECL (expo); - - if (MPFR_UNLIKELY (!mpfr_fits_ulong_p (f, rnd))) - { -@@ -44,10 +45,16 @@ - for (s = ULONG_MAX, prec = 0; s != 0; s /= 2, prec ++) - { } - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - /* first round to prec bits */ - mpfr_init2 (x, prec); - mpfr_rint (x, f, rnd); - -+ /* The flags from mpfr_rint are the wanted ones. In particular, -+ it sets the inexact flag when necessary. */ -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); -+ - /* warning: if x=0, taking its exponent is illegal */ - if (MPFR_IS_ZERO(x)) - s = 0; -@@ -61,5 +68,7 @@ - - mpfr_clear (x); - -+ MPFR_SAVE_EXPO_FREE (expo); -+ - return s; - } -diff -Naurd mpfr-3.1.6-a/src/get_uj.c mpfr-3.1.6-b/src/get_uj.c ---- mpfr-3.1.6-a/src/get_uj.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/get_uj.c 2017-10-26 13:55:51.208013252 +0000 -@@ -35,6 +35,7 @@ - uintmax_t r; - mpfr_prec_t prec; - mpfr_t x; -+ MPFR_SAVE_EXPO_DECL (expo); - - if (MPFR_UNLIKELY (!mpfr_fits_uintmax_p (f, rnd))) - { -@@ -50,12 +51,18 @@ - for (r = MPFR_UINTMAX_MAX, prec = 0; r != 0; r /= 2, prec++) - { } - -- /* Now, r = 0. */ -+ MPFR_ASSERTD (r == 0); -+ -+ MPFR_SAVE_EXPO_MARK (expo); - - mpfr_init2 (x, prec); - mpfr_rint (x, f, rnd); - MPFR_ASSERTN (MPFR_IS_FP (x)); - -+ /* The flags from mpfr_rint are the wanted ones. In particular, -+ it sets the inexact flag when necessary. */ -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); -+ - if (MPFR_NOTZERO (x)) - { - mp_limb_t *xp; -@@ -76,6 +83,8 @@ - - mpfr_clear (x); - -+ MPFR_SAVE_EXPO_FREE (expo); -+ - return r; - } - -diff -Naurd mpfr-3.1.6-a/src/get_z.c mpfr-3.1.6-b/src/get_z.c ---- mpfr-3.1.6-a/src/get_z.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/get_z.c 2017-10-26 13:55:51.208013252 +0000 -@@ -29,6 +29,7 @@ - int inex; - mpfr_t r; - mpfr_exp_t exp; -+ MPFR_SAVE_EXPO_DECL (expo); - - if (MPFR_UNLIKELY (MPFR_IS_SINGULAR (f))) - { -@@ -41,6 +42,8 @@ - return 0; - } - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - exp = MPFR_GET_EXP (f); - /* if exp <= 0, then |f|<1, thus |o(f)|<=1 */ - MPFR_ASSERTN (exp < 0 || exp <= MPFR_PREC_MAX); -@@ -50,6 +53,11 @@ - MPFR_ASSERTN (inex != 1 && inex != -1); /* integral part of f is - representable in r */ - MPFR_ASSERTN (MPFR_IS_FP (r)); -+ -+ /* The flags from mpfr_rint are the wanted ones. In particular, -+ it sets the inexact flag when necessary. */ -+ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags); -+ - exp = mpfr_get_z_2exp (z, r); - if (exp >= 0) - mpz_mul_2exp (z, z, exp); -@@ -57,5 +65,7 @@ - mpz_fdiv_q_2exp (z, z, -exp); - mpfr_clear (r); - -+ MPFR_SAVE_EXPO_FREE (expo); -+ - return inex; - } -diff -Naurd mpfr-3.1.6-a/src/mpfr.h mpfr-3.1.6-b/src/mpfr.h ---- mpfr-3.1.6-a/src/mpfr.h 2017-09-07 11:36:44.000000000 +0000 -+++ mpfr-3.1.6-b/src/mpfr.h 2017-10-26 13:55:51.232013138 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 6 --#define MPFR_VERSION_STRING "3.1.6" -+#define MPFR_VERSION_STRING "3.1.6-p1" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.6-a/src/version.c mpfr-3.1.6-b/src/version.c ---- mpfr-3.1.6-a/src/version.c 2017-09-07 11:36:44.000000000 +0000 -+++ mpfr-3.1.6-b/src/version.c 2017-10-26 13:55:51.232013138 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.6"; -+ return "3.1.6-p1"; - } diff --git a/rev11982.patch b/rev11982.patch deleted file mode 100644 index 6bf8322..0000000 --- a/rev11982.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Naurd mpfr-3.1.6-a/PATCHES mpfr-3.1.6-b/PATCHES ---- mpfr-3.1.6-a/PATCHES 2017-12-15 12:37:44.074256548 +0000 -+++ mpfr-3.1.6-b/PATCHES 2017-12-15 12:37:44.146256304 +0000 -@@ -0,0 +1 @@ -+root -diff -Naurd mpfr-3.1.6-a/VERSION mpfr-3.1.6-b/VERSION ---- mpfr-3.1.6-a/VERSION 2017-10-26 13:55:51.236013121 +0000 -+++ mpfr-3.1.6-b/VERSION 2017-12-15 12:37:44.142256319 +0000 -@@ -1 +1 @@ --3.1.6-p1 -+3.1.6-p2 -diff -Naurd mpfr-3.1.6-a/src/mpfr.h mpfr-3.1.6-b/src/mpfr.h ---- mpfr-3.1.6-a/src/mpfr.h 2017-10-26 13:55:51.232013138 +0000 -+++ mpfr-3.1.6-b/src/mpfr.h 2017-12-15 12:37:44.142256319 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 3 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 6 --#define MPFR_VERSION_STRING "3.1.6-p1" -+#define MPFR_VERSION_STRING "3.1.6-p2" - - /* Macros dealing with MPFR VERSION */ - #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c)) -diff -Naurd mpfr-3.1.6-a/src/root.c mpfr-3.1.6-b/src/root.c ---- mpfr-3.1.6-a/src/root.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/src/root.c 2017-12-15 12:37:44.118256398 +0000 -@@ -107,6 +107,11 @@ - MPFR_RET_NAN; - } - -+ /* Special case |x| = 1. Note that if x = -1, then k is odd -+ (NaN results have already been filtered), so that y = -1. */ -+ if (mpfr_cmpabs (x, __gmpfr_one) == 0) -+ return mpfr_set (y, x, rnd_mode); -+ - /* General case */ - - /* For large k, use exp(log(x)/k). The threshold of 100 seems to be quite -@@ -188,6 +193,14 @@ - Assume all special cases have been eliminated before. - In the extended exponent range, overflows/underflows are not possible. - Assume x > 0, or x < 0 and k odd. -+ Also assume |x| <> 1 because log(1) = 0, which does not have an exponent -+ and would yield a failure in the error bound computation. A priori, this -+ constraint is quite artificial because if |x| is close enough to 1, then -+ the exponent of log|x| does not need to be used (in the code, err would -+ be 1 in such a domain). So this constraint |x| <> 1 could be avoided in -+ the code. However, this is an exact case easy to detect, so that such a -+ change would be useless. Values very close to 1 are not an issue, since -+ an underflow is not possible before the MPFR_GET_EXP. - */ - static int - mpfr_root_aux (mpfr_ptr y, mpfr_srcptr x, unsigned long k, mpfr_rnd_t rnd_mode) -@@ -219,7 +232,8 @@ - mpfr_log (t, absx, MPFR_RNDN); - /* t = log|x| * (1 + theta) with |theta| <= 2^(-w) */ - mpfr_div_ui (t, t, k, MPFR_RNDN); -- expt = MPFR_GET_EXP (t); -+ /* No possible underflow in mpfr_log and mpfr_div_ui. */ -+ expt = MPFR_GET_EXP (t); /* assumes t <> 0 */ - /* t = log|x|/k * (1 + theta) + eps with |theta| <= 2^(-w) - and |eps| <= 1/2 ulp(t), thus the total error is bounded - by 1.5 * 2^(expt - w) */ -diff -Naurd mpfr-3.1.6-a/src/version.c mpfr-3.1.6-b/src/version.c ---- mpfr-3.1.6-a/src/version.c 2017-10-26 13:55:51.232013138 +0000 -+++ mpfr-3.1.6-b/src/version.c 2017-12-15 12:37:44.142256319 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "3.1.6-p1"; -+ return "3.1.6-p2"; - } -diff -Naurd mpfr-3.1.6-a/tests/troot.c mpfr-3.1.6-b/tests/troot.c ---- mpfr-3.1.6-a/tests/troot.c 2017-01-01 01:39:09.000000000 +0000 -+++ mpfr-3.1.6-b/tests/troot.c 2017-12-15 12:37:44.118256398 +0000 -@@ -405,6 +405,26 @@ - mpfr_clears (x, y1, y2, (mpfr_ptr) 0); - } - -+static void -+bug20171214 (void) -+{ -+ mpfr_t x, y; -+ int inex; -+ -+ mpfr_init2 (x, 805); -+ mpfr_init2 (y, 837); -+ mpfr_set_ui (x, 1, MPFR_RNDN); -+ inex = mpfr_root (y, x, 120, MPFR_RNDN); -+ MPFR_ASSERTN (inex == 0); -+ MPFR_ASSERTN (mpfr_cmp_ui (y, 1) == 0); -+ mpfr_set_si (x, -1, MPFR_RNDN); -+ inex = mpfr_root (y, x, 121, MPFR_RNDN); -+ MPFR_ASSERTN (inex == 0); -+ MPFR_ASSERTN (mpfr_cmp_si (y, -1) == 0); -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ - int - main (void) - { -@@ -415,6 +435,7 @@ - - tests_start_mpfr (); - -+ bug20171214 (); - exact_powers (3, 1000); - special (); - bigint (); diff --git a/sources b/sources index 6422b9f..2388682 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (mpfr-3.1.6.tar.xz) = 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054 SHA512 (mpfr-4.0.2.tar.xz) = d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88 From 4f066edbc49073a0114f217b74c21703cda12a9a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:09:39 +0000 Subject: [PATCH 11/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index cee6f50..641ea47 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 4.0.2 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ @@ -99,6 +99,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 4.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Oct 11 2019 Jerry James - 4.0.2-2 - Drop the mpfr3 and mpfr3-devel subpackages From be947c1e216d50d7197114e26d0e01f5524508c4 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 16 Apr 2020 14:23:20 -0600 Subject: [PATCH 12/43] Add upstream patches 2 through 7. --- mpfr-array-length.patch | 58 ++ mpfr-const.patch | 184 ++++++ rev13499.patch => mpfr-include-float.patch | 0 mpfr-int-overflow.patch | 97 +++ mpfr-set-int.patch | 441 +++++++++++++ mpfr-sub1-ubf.patch | 722 +++++++++++++++++++++ mpfr-sub1-ubftest.patch | 100 +++ mpfr.spec | 37 +- 8 files changed, 1636 insertions(+), 3 deletions(-) create mode 100644 mpfr-array-length.patch create mode 100644 mpfr-const.patch rename rev13499.patch => mpfr-include-float.patch (100%) create mode 100644 mpfr-int-overflow.patch create mode 100644 mpfr-set-int.patch create mode 100644 mpfr-sub1-ubf.patch create mode 100644 mpfr-sub1-ubftest.patch diff --git a/mpfr-array-length.patch b/mpfr-array-length.patch new file mode 100644 index 0000000..fce5fe1 --- /dev/null +++ b/mpfr-array-length.patch @@ -0,0 +1,58 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-03-30 16:50:17.064231191 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-03-30 16:50:17.096230810 +0000 +@@ -0,0 +1 @@ ++array-length +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-03-30 15:17:31.535330224 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-03-30 16:50:17.096230810 +0000 +@@ -1 +1 @@ +-4.0.2-p5 ++4.0.2-p6 +diff -Naurd mpfr-4.0.2-a/src/mpfr-impl.h mpfr-4.0.2-b/src/mpfr-impl.h +--- mpfr-4.0.2-a/src/mpfr-impl.h 2020-03-30 13:09:17.490071686 +0000 ++++ mpfr-4.0.2-b/src/mpfr-impl.h 2020-03-30 16:50:17.084230953 +0000 +@@ -2026,7 +2026,21 @@ + struct mpfr_group_t { + size_t alloc; + mp_limb_t *mant; ++#if MPFR_GROUP_STATIC_SIZE != 0 + mp_limb_t tab[MPFR_GROUP_STATIC_SIZE]; ++#else ++ /* In order to detect memory leaks when testing, MPFR_GROUP_STATIC_SIZE ++ can be set to 0, in which case tab will not be used. ISO C does not ++ support zero-length arrays[*], thus let's use a flexible array member ++ (which will be equivalent here). Note: this is new in C99, but this ++ is just used for testing. ++ [*] Zero-length arrays are a GNU extension: ++ https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html ++ and as such an extension is forbidden in ISO C, it triggers an ++ error with -Werror=pedantic. ++ */ ++ mp_limb_t tab[]; ++#endif + }; + + #define MPFR_GROUP_DECL(g) struct mpfr_group_t g +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 15:17:31.535330224 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 16:50:17.096230810 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p5" ++#define MPFR_VERSION_STRING "4.0.2-p6" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-03-30 15:17:31.535330224 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-03-30 16:50:17.096230810 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p5"; ++ return "4.0.2-p6"; + } diff --git a/mpfr-const.patch b/mpfr-const.patch new file mode 100644 index 0000000..4e20d15 --- /dev/null +++ b/mpfr-const.patch @@ -0,0 +1,184 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-03-30 16:31:45.813415121 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-03-30 16:33:54.623893528 +0000 +@@ -0,0 +1 @@ ++const +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-03-30 13:09:17.502071540 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-03-30 15:17:31.535330224 +0000 +@@ -1,1 +1,1 @@ +-4.0.2-p4 ++4.0.2-p5 +diff -Naurd mpfr-4.0.2-a/configure mpfr-4.0.2-b/configure +--- mpfr-4.0.2-a/configure 2019-01-31 20:43:19.000000000 +0000 ++++ mpfr-4.0.2-b/configure 2020-03-30 16:33:29.340190160 +0000 +@@ -15868,9 +15868,9 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +-char *number = "0123456789"; +-char *lower = "abcdefghijklmnopqrstuvwxyz"; +-char *upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; ++const char *number = "0123456789"; ++const char *lower = "abcdefghijklmnopqrstuvwxyz"; ++const char *upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; + + int + main (void) +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 13:09:17.498071589 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 15:17:31.535330224 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p4" ++#define MPFR_VERSION_STRING "4.0.2-p5" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-03-30 13:09:17.502071540 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-03-30 15:17:31.535330224 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p4"; ++ return "4.0.2-p5"; + } +diff -Naurd mpfr-4.0.2-a/tests/tdiv.c mpfr-4.0.2-b/tests/tdiv.c +--- mpfr-4.0.2-a/tests/tdiv.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tdiv.c 2020-03-30 15:17:31.523330366 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-test.h" + + static void +-check_equal (mpfr_srcptr a, mpfr_srcptr a2, char *s, ++check_equal (mpfr_srcptr a, mpfr_srcptr a2, const char *s, + mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t r) + { + if (SAME_VAL (a, a2)) +diff -Naurd mpfr-4.0.2-a/tests/tfpif.c mpfr-4.0.2-b/tests/tfpif.c +--- mpfr-4.0.2-a/tests/tfpif.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tfpif.c 2020-03-30 15:17:31.523330366 +0000 +@@ -30,8 +30,8 @@ + static void + doit (int argc, char *argv[], mpfr_prec_t p1, mpfr_prec_t p2) + { +- char *filenameCompressed = FILE_NAME_RW; +- char *data = FILE_NAME_R; ++ const char *filenameCompressed = FILE_NAME_RW; ++ const char *data = FILE_NAME_R; + int status; + FILE *fh; + mpfr_t x[9]; +@@ -198,7 +198,7 @@ + static void + check_bad (void) + { +- char *filenameCompressed = FILE_NAME_RW; ++ const char *filenameCompressed = FILE_NAME_RW; + int status; + FILE *fh; + mpfr_t x; +@@ -340,7 +340,7 @@ + static void + extra (void) + { +- char *data = FILE_NAME_R2; ++ const char *data = FILE_NAME_R2; + mpfr_t x; + FILE *fp; + int ret; +diff -Naurd mpfr-4.0.2-a/tests/tmul_2exp.c mpfr-4.0.2-b/tests/tmul_2exp.c +--- mpfr-4.0.2-a/tests/tmul_2exp.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tmul_2exp.c 2020-03-30 15:17:31.523330366 +0000 +@@ -258,7 +258,7 @@ + mpfr_exp_t old_emax; + mpfr_t x, y1, y2; + int neg, r, op; +- static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; ++ static const char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; + + old_emax = mpfr_get_emax (); + set_emax (emax); +diff -Naurd mpfr-4.0.2-a/tests/trandom.c mpfr-4.0.2-b/tests/trandom.c +--- mpfr-4.0.2-a/tests/trandom.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/trandom.c 2020-03-30 15:17:31.523330366 +0000 +@@ -185,7 +185,7 @@ + { + gmp_randstate_t s; + mpfr_t x; +- char *str = "0.1010111100000000000000000000000000000000E-32"; ++ const char *str = "0.1010111100000000000000000000000000000000E-32"; + int k; + + gmp_randinit_default (s); +diff -Naurd mpfr-4.0.2-a/tests/trint.c mpfr-4.0.2-b/tests/trint.c +--- mpfr-4.0.2-a/tests/trint.c 2019-01-25 02:00:06.000000000 +0000 ++++ mpfr-4.0.2-b/tests/trint.c 2020-03-30 15:17:31.523330366 +0000 +@@ -308,7 +308,7 @@ + #if __MPFR_STDC (199901L) + + static void +-test_fct (double (*f)(double), int (*g)(), char *s, mpfr_rnd_t r) ++test_fct (double (*f)(double), int (*g)(), const char *s, mpfr_rnd_t r) + { + double d, y; + mpfr_t dd, yy; +diff -Naurd mpfr-4.0.2-a/tests/tsum.c mpfr-4.0.2-b/tests/tsum.c +--- mpfr-4.0.2-a/tests/tsum.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tsum.c 2020-03-30 15:17:31.523330366 +0000 +@@ -285,7 +285,7 @@ + static void + check_more_special (void) + { +- char *str[NC] = { "NaN", "+Inf", "-Inf", "+0", "-0", "+1", "-1" }; ++ const char *str[NC] = { "NaN", "+Inf", "-Inf", "+0", "-0", "+1", "-1" }; + int i, r, k[NS]; + mpfr_t c[NC], s[NS], sum; + mpfr_ptr p[NS]; +@@ -724,7 +724,7 @@ + { + mpfr_t sum, t[4]; + mpfr_ptr p[4]; +- char *s[4] = { ++ const char *s[4] = { + "0x1p1000", + "-0x0.fffffffffffff80000000000000001p1000", + "-0x1p947", +@@ -771,7 +771,11 @@ + { + mpfr_t sum1, sum2, t[3]; + mpfr_ptr p[3]; +- char *s[3] = { "0.10000111110101000010101011100001", "1E-100", "0.1E95" }; ++ const char *s[3] = { ++ "0.10000111110101000010101011100001", ++ "1E-100", ++ "0.1E95" ++ }; + int i, r; + + mpfr_inits2 (58, sum1, sum2, (mpfr_ptr) 0); +@@ -1268,7 +1272,7 @@ + { + mpfr_t r, t[4]; + mpfr_ptr p[4]; +- char *s[4] = { "0.10E20", "0", "0.11E382", "0.10E826" }; ++ const char *s[4] = { "0.10E20", "0", "0.11E382", "0.10E826" }; + int i; + + mpfr_init2 (r, 2); +diff -Naurd mpfr-4.0.2-a/tests/turandom.c mpfr-4.0.2-b/tests/turandom.c +--- mpfr-4.0.2-a/tests/turandom.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/turandom.c 2020-03-30 15:17:31.523330366 +0000 +@@ -526,7 +526,7 @@ + #define N 6 + /* Run this program with the MPFR_REPROD_ABI_OUTPUT environment variable + set to get the array of strings. */ +- char *t[5 * N] = { ++ const char *t[5 * N] = { + "1.0@-1", + "3.0@-1", + "7.0@-1", diff --git a/rev13499.patch b/mpfr-include-float.patch similarity index 100% rename from rev13499.patch rename to mpfr-include-float.patch diff --git a/mpfr-int-overflow.patch b/mpfr-int-overflow.patch new file mode 100644 index 0000000..de5ff06 --- /dev/null +++ b/mpfr-int-overflow.patch @@ -0,0 +1,97 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-03-30 13:02:08.103248669 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-03-30 13:02:08.143248189 +0000 +@@ -0,0 +1 @@ ++int-overflow +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2019-06-02 17:05:36.157226621 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-03-30 13:02:08.143248189 +0000 +@@ -1 +1 @@ +-4.0.2-p1 ++4.0.2-p2 +diff -Naurd mpfr-4.0.2-a/src/agm.c mpfr-4.0.2-b/src/agm.c +--- mpfr-4.0.2-a/src/agm.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/agm.c 2020-03-30 13:02:08.131248333 +0000 +@@ -220,7 +220,7 @@ + mpfr_add (vf, u, v, MPFR_RNDN); /* No overflow? */ + mpfr_div_2ui (vf, vf, 1, MPFR_RNDN); + /* See proof in algorithms.tex */ +- if (4*eq > p) ++ if (eq > p / 4) + { + mpfr_t w; + MPFR_BLOCK_DECL (flags3); +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2019-06-02 17:05:36.153226653 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 13:02:08.143248189 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p1" ++#define MPFR_VERSION_STRING "4.0.2-p2" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/pow.c mpfr-4.0.2-b/src/pow.c +--- mpfr-4.0.2-a/src/pow.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/pow.c 2020-03-30 13:02:08.131248333 +0000 +@@ -34,8 +34,7 @@ + mpfr_rnd_t rnd_mode, int *inexact) + { + mpz_t a, c; +- mpfr_exp_t d, b; +- unsigned long i; ++ mpfr_exp_t d, b, i; + int res; + + MPFR_ASSERTD (!MPFR_IS_SINGULAR (y)); +@@ -48,7 +47,9 @@ + if (MPFR_IS_NEG (y)) + return 0; /* x is not a power of two => x^-y is not exact */ + +- /* compute d such that y = c*2^d with c odd integer */ ++ /* Compute d such that y = c*2^d with c odd integer. ++ Since c comes from a regular MPFR number, due to the constraints on the ++ exponent and the precision, there can be no integer overflow below. */ + mpz_init (c); + d = mpfr_get_z_2exp (c, y); + i = mpz_scan1 (c, 0); +@@ -58,7 +59,9 @@ + /* Since y is not an integer, d is necessarily < 0 */ + MPFR_ASSERTD (d < 0); + +- /* Compute a,b such that x=a*2^b */ ++ /* Compute a,b such that x=a*2^b. ++ Since a comes from a regular MPFR number, due to the constrainst on the ++ exponent and the precision, there can be no integer overflow below. */ + mpz_init (a); + b = mpfr_get_z_2exp (a, x); + i = mpz_scan1 (a, 0); +diff -Naurd mpfr-4.0.2-a/src/rem1.c mpfr-4.0.2-b/src/rem1.c +--- mpfr-4.0.2-a/src/rem1.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/rem1.c 2020-03-30 13:02:08.131248333 +0000 +@@ -100,9 +100,11 @@ + mpz_abs (my, my); + q_is_odd = 0; + +- /* divide my by 2^k if possible to make operations mod my easier */ ++ /* Divide my by 2^k if possible to make operations mod my easier. ++ Since my comes from a regular MPFR number, due to the constraints on the ++ exponent and the precision, there can be no integer overflow below. */ + { +- unsigned long k = mpz_scan1 (my, 0); ++ mpfr_exp_t k = mpz_scan1 (my, 0); + ey += k; + mpz_fdiv_q_2exp (my, my, k); + } +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2019-06-02 17:05:36.153226653 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-03-30 13:02:08.143248189 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p1"; ++ return "4.0.2-p2"; + } diff --git a/mpfr-set-int.patch b/mpfr-set-int.patch new file mode 100644 index 0000000..7194b31 --- /dev/null +++ b/mpfr-set-int.patch @@ -0,0 +1,441 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-03-30 13:05:16.224990169 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-03-30 13:05:16.264989689 +0000 +@@ -0,0 +1 @@ ++set-int +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-03-30 13:02:08.143248189 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-03-30 13:05:16.264989689 +0000 +@@ -1 +1 @@ +-4.0.2-p2 ++4.0.2-p3 +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 13:02:08.143248189 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 13:05:16.260989737 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p2" ++#define MPFR_VERSION_STRING "4.0.2-p3" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/set_si_2exp.c mpfr-4.0.2-b/src/set_si_2exp.c +--- mpfr-4.0.2-a/src/set_si_2exp.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/set_si_2exp.c 2020-03-30 13:05:16.248989881 +0000 +@@ -40,6 +40,15 @@ + mp_limb_t ai, *xp; + int inex = 0; + ++ /* Early underflow/overflow checking is necessary to avoid ++ integer overflow or errors due to special exponent values. */ ++ if (MPFR_UNLIKELY (e < __gmpfr_emin - (mpfr_exp_t) ++ (sizeof (unsigned long) * CHAR_BIT + 1))) ++ return mpfr_underflow (x, rnd_mode == MPFR_RNDN ? ++ MPFR_RNDZ : rnd_mode, i < 0 ? -1 : 1); ++ if (MPFR_UNLIKELY (e >= __gmpfr_emax)) ++ return mpfr_overflow (x, rnd_mode, i < 0 ? -1 : 1); ++ + /* FIXME: support int limbs (e.g. 16-bit limbs on 16-bit proc) */ + ai = SAFE_ABS (unsigned long, i); + MPFR_ASSERTN (SAFE_ABS (unsigned long, i) == ai); +diff -Naurd mpfr-4.0.2-a/src/set_ui_2exp.c mpfr-4.0.2-b/src/set_ui_2exp.c +--- mpfr-4.0.2-a/src/set_ui_2exp.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/set_ui_2exp.c 2020-03-30 13:05:16.248989881 +0000 +@@ -41,6 +41,15 @@ + mp_limb_t *xp; + int inex = 0; + ++ /* Early underflow/overflow checking is necessary to avoid ++ integer overflow or errors due to special exponent values. */ ++ if (MPFR_UNLIKELY (e < __gmpfr_emin - (mpfr_exp_t) ++ (sizeof (unsigned long) * CHAR_BIT + 1))) ++ return mpfr_underflow (x, rnd_mode == MPFR_RNDN ? ++ MPFR_RNDZ : rnd_mode, i < 0 ? -1 : 1); ++ if (MPFR_UNLIKELY (e >= __gmpfr_emax)) ++ return mpfr_overflow (x, rnd_mode, i < 0 ? -1 : 1); ++ + /* FIXME: support int limbs (e.g. 16-bit limbs on 16-bit proc) */ + MPFR_ASSERTD (i == (mp_limb_t) i); + +diff -Naurd mpfr-4.0.2-a/src/set_uj.c mpfr-4.0.2-b/src/set_uj.c +--- mpfr-4.0.2-a/src/set_uj.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/set_uj.c 2020-03-30 13:05:16.248989881 +0000 +@@ -41,7 +41,7 @@ + int + mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd) + { +- int cnt; ++ int cnt, inex; + mp_size_t i, k; + mp_limb_t limb; + mp_limb_t yp[uintmaxpml]; +@@ -57,6 +57,10 @@ + MPFR_RET(0); + } + ++ /* early overflow detection to avoid a possible integer overflow below */ ++ if (MPFR_UNLIKELY(e >= __gmpfr_emax)) ++ return mpfr_overflow (x, rnd, MPFR_SIGN_POS); ++ + MPFR_ASSERTN (sizeof(uintmax_t) % sizeof(mp_limb_t) == 0); + + /* Create an auxiliary var */ +@@ -107,7 +111,9 @@ + e += k * GMP_NUMB_BITS - cnt; /* Update Expo */ + MPFR_ASSERTD (MPFR_LIMB_MSB(yp[numberof (yp) - 1]) != 0); + +- /* Check expo underflow / overflow (can't use mpfr_check_range) */ ++ MPFR_RNDRAW (inex, x, yp, uintmax_bit_size, rnd, MPFR_SIGN_POS, e++); ++ ++ /* Check expo underflow / overflow */ + if (MPFR_UNLIKELY(e < __gmpfr_emin)) + { + /* The following test is necessary because in the rounding to the +@@ -116,16 +122,18 @@ + * _ |x| < 2^(emin-2), or + * _ |x| = 2^(emin-2) and the absolute value of the exact + * result is <= 2^(emin-2). */ +- if (rnd == MPFR_RNDN && (e+1 < __gmpfr_emin || mpfr_powerof2_raw(y))) ++ if (rnd == MPFR_RNDN && ++ (e + 1 < __gmpfr_emin || ++ (mpfr_powerof2_raw (x) && inex >= 0))) + rnd = MPFR_RNDZ; + return mpfr_underflow (x, rnd, MPFR_SIGN_POS); + } + if (MPFR_UNLIKELY(e > __gmpfr_emax)) + return mpfr_overflow (x, rnd, MPFR_SIGN_POS); +- MPFR_SET_EXP (y, e); + +- /* Final: set x to y (rounding if necessary) */ +- return mpfr_set (x, y, rnd); ++ MPFR_SET_SIGN (x, MPFR_SIGN_POS); ++ MPFR_SET_EXP (x, e); ++ MPFR_RET (inex); + } + + #endif +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-03-30 13:02:08.143248189 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-03-30 13:05:16.264989689 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p2"; ++ return "4.0.2-p3"; + } +diff -Naurd mpfr-4.0.2-a/tests/tset_si.c mpfr-4.0.2-b/tests/tset_si.c +--- mpfr-4.0.2-a/tests/tset_si.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tset_si.c 2020-03-30 13:05:16.248989881 +0000 +@@ -90,6 +90,135 @@ + mpfr_clear (x); + } + ++#define REXP 1024 ++ ++static void ++test_2exp_extreme_aux (void) ++{ ++ mpfr_t x1, x2, y; ++ mpfr_exp_t e, ep[1 + 8 * 5], eb[] = ++ { MPFR_EMIN_MIN, -REXP, REXP, MPFR_EMAX_MAX, MPFR_EXP_MAX }; ++ mpfr_flags_t flags1, flags2; ++ int i, j, rnd, inex1, inex2; ++ char s; ++ ++ ep[0] = MPFR_EXP_MIN; ++ for (i = 0; i < numberof(eb); i++) ++ for (j = 0; j < 8; j++) ++ ep[1 + 8 * i + j] = eb[i] - j; ++ ++ mpfr_inits2 (3, x1, x2, (mpfr_ptr) 0); ++ mpfr_init2 (y, 32); ++ ++ for (i = 0; i < numberof(ep); i++) ++ for (j = -31; j <= 31; j++) ++ RND_LOOP_NO_RNDF (rnd) ++ { ++ int sign = j < 0 ? -1 : 1; ++ ++ /* Compute the expected value, inex and flags */ ++ inex1 = mpfr_set_si (y, j, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ inex1 = mpfr_set (x1, y, (mpfr_rnd_t) rnd); ++ /* x1 is the rounded value and inex1 the ternary value, ++ assuming that the exponent argument is 0 (this is the ++ rounded significand of the final result, assuming an ++ unbounded exponent range). The multiplication by a ++ power of 2 is exact, unless underflow/overflow occurs. ++ The tests on the exponent below avoid integer overflows ++ (ep[i] may take extreme values). */ ++ e = mpfr_get_exp (x1); ++ mpfr_clear_flags (); ++ if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ ++ { ++ mpfr_rnd_t r = ++ (rnd == MPFR_RNDN && ++ (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || ++ IS_POW2 (sign * j))) ? ++ MPFR_RNDZ : (mpfr_rnd_t) rnd; ++ inex1 = mpfr_underflow (x1, r, sign); ++ flags1 = __gmpfr_flags; ++ } ++ else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ ++ { ++ inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); ++ flags1 = __gmpfr_flags; ++ } ++ else ++ { ++ if (j != 0) ++ mpfr_set_exp (x1, ep[i] + e); ++ flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; ++ } ++ ++ /* Test mpfr_set_si_2exp */ ++ mpfr_clear_flags (); ++ inex2 = mpfr_set_si_2exp (x2, j, ep[i], (mpfr_rnd_t) rnd); ++ flags2 = __gmpfr_flags; ++ ++ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && ++ mpfr_equal_p (x1, x2))) ++ { ++ s = 's'; ++ goto err_extreme; ++ } ++ ++ if (j < 0) ++ continue; ++ ++ /* Test mpfr_set_ui_2exp */ ++ mpfr_clear_flags (); ++ inex2 = mpfr_set_ui_2exp (x2, j, ep[i], (mpfr_rnd_t) rnd); ++ flags2 = __gmpfr_flags; ++ ++ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && ++ mpfr_equal_p (x1, x2))) ++ { ++ s = 'u'; ++ err_extreme: ++ printf ("Error in extreme mpfr_set_%ci_2exp for i=%d j=%d %s\n", ++ s, i, j, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); ++ printf ("emin=%" MPFR_EXP_FSPEC "d " ++ "emax=%" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) __gmpfr_emin, ++ (mpfr_eexp_t) __gmpfr_emax); ++ printf ("ep[%d] = %" MPFR_EXP_FSPEC "d\n", ++ i, (mpfr_eexp_t) ep[i]); ++ printf ("Expected "); ++ mpfr_dump (x1); ++ printf ("with inex = %d and flags =", inex1); ++ flags_out (flags1); ++ printf ("Got "); ++ mpfr_dump (x2); ++ printf ("with inex = %d and flags =", inex2); ++ flags_out (flags2); ++ exit (1); ++ } ++ } ++ ++ mpfr_clears (x1, x2, y, (mpfr_ptr) 0); ++} ++ ++static void ++test_2exp_extreme (void) ++{ ++ mpfr_exp_t emin, emax; ++ ++ emin = mpfr_get_emin (); ++ emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ test_2exp_extreme_aux (); ++ ++ set_emin (-REXP); ++ set_emax (REXP); ++ test_2exp_extreme_aux (); ++ ++ set_emin (emin); ++ set_emax (emax); ++} ++ + static void + test_macros (void) + { +@@ -639,6 +768,7 @@ + mpfr_clear (x); + + test_2exp (); ++ test_2exp_extreme (); + test_macros (); + test_macros_keyword (); + test_get_ui_smallneg (); +diff -Naurd mpfr-4.0.2-a/tests/tset_sj.c mpfr-4.0.2-b/tests/tset_sj.c +--- mpfr-4.0.2-a/tests/tset_sj.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tset_sj.c 2020-03-30 13:05:16.248989881 +0000 +@@ -176,6 +176,154 @@ + mpfr_clear (x); + } + ++#define REXP 1024 ++ ++static void ++test_2exp_extreme_aux (void) ++{ ++ mpfr_t x1, x2, y; ++ mpfr_exp_t e, ep[1 + 8 * 5], eb[] = ++ { MPFR_EMIN_MIN, -REXP, REXP, MPFR_EMAX_MAX, MPFR_EXP_MAX }; ++ mpfr_flags_t flags1, flags2; ++ int i, j, rnd, inex1, inex2; ++ char s; ++ ++ ep[0] = MPFR_EXP_MIN; ++ for (i = 0; i < numberof(eb); i++) ++ for (j = 0; j < 8; j++) ++ ep[1 + 8 * i + j] = eb[i] - j; ++ ++ mpfr_inits2 (3, x1, x2, (mpfr_ptr) 0); ++ mpfr_init2 (y, 32); ++ ++ /* The cast to int is needed if numberof(ep) is of unsigned type, in ++ which case the condition without the cast would be always false. */ ++ for (i = -2; i < (int) numberof(ep); i++) ++ for (j = -31; j <= 31; j++) ++ RND_LOOP_NO_RNDF (rnd) ++ { ++ int sign = j < 0 ? -1 : 1; ++ intmax_t em; ++ ++ if (i < 0) ++ { ++ em = i == -2 ? INTMAX_MIN : INTMAX_MAX; ++ mpfr_clear_flags (); ++ inex1 = j == 0 ? ++ (mpfr_set_zero (x1, +1), 0) : i == -2 ? ++ mpfr_underflow (x1, rnd == MPFR_RNDN ? ++ MPFR_RNDZ : (mpfr_rnd_t) rnd, sign) : ++ mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); ++ flags1 = __gmpfr_flags; ++ } ++ else ++ { ++ em = ep[i]; ++ /* Compute the expected value, inex and flags */ ++ inex1 = mpfr_set_si (y, j, MPFR_RNDN); ++ MPFR_ASSERTN (inex1 == 0); ++ inex1 = mpfr_set (x1, y, (mpfr_rnd_t) rnd); ++ /* x1 is the rounded value and inex1 the ternary value, ++ assuming that the exponent argument is 0 (this is the ++ rounded significand of the final result, assuming an ++ unbounded exponent range). The multiplication by a ++ power of 2 is exact, unless underflow/overflow occurs. ++ The tests on the exponent below avoid integer overflows ++ (ep[i] may take extreme values). */ ++ e = mpfr_get_exp (x1); ++ mpfr_clear_flags (); ++ if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ ++ { ++ mpfr_rnd_t r = ++ (rnd == MPFR_RNDN && ++ (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || ++ IS_POW2 (sign * j))) ? ++ MPFR_RNDZ : (mpfr_rnd_t) rnd; ++ inex1 = mpfr_underflow (x1, r, sign); ++ flags1 = __gmpfr_flags; ++ } ++ else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ ++ { ++ inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); ++ flags1 = __gmpfr_flags; ++ } ++ else ++ { ++ if (j != 0) ++ mpfr_set_exp (x1, ep[i] + e); ++ flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; ++ } ++ } ++ ++ /* Test mpfr_set_sj_2exp */ ++ mpfr_clear_flags (); ++ inex2 = mpfr_set_sj_2exp (x2, j, em, (mpfr_rnd_t) rnd); ++ flags2 = __gmpfr_flags; ++ ++ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && ++ mpfr_equal_p (x1, x2))) ++ { ++ s = 's'; ++ goto err_extreme; ++ } ++ ++ if (j < 0) ++ continue; ++ ++ /* Test mpfr_set_uj_2exp */ ++ mpfr_clear_flags (); ++ inex2 = mpfr_set_uj_2exp (x2, j, em, (mpfr_rnd_t) rnd); ++ flags2 = __gmpfr_flags; ++ ++ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && ++ mpfr_equal_p (x1, x2))) ++ { ++ s = 'u'; ++ err_extreme: ++ printf ("Error in extreme mpfr_set_%cj_2exp for i=%d j=%d %s\n", ++ s, i, j, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); ++ printf ("emin=%" MPFR_EXP_FSPEC "d " ++ "emax=%" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) __gmpfr_emin, ++ (mpfr_eexp_t) __gmpfr_emax); ++#ifdef MPFR_PRINTF_MAXLM ++ printf ("e = %" MPFR_PRINTF_MAXLM "d\n", em); ++#endif ++ printf ("Expected "); ++ mpfr_dump (x1); ++ printf ("with inex = %d and flags =", inex1); ++ flags_out (flags1); ++ printf ("Got "); ++ mpfr_dump (x2); ++ printf ("with inex = %d and flags =", inex2); ++ flags_out (flags2); ++ exit (1); ++ } ++ } ++ ++ mpfr_clears (x1, x2, y, (mpfr_ptr) 0); ++} ++ ++static void ++test_2exp_extreme (void) ++{ ++ mpfr_exp_t emin, emax; ++ ++ emin = mpfr_get_emin (); ++ emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ test_2exp_extreme_aux (); ++ ++ set_emin (-REXP); ++ set_emax (REXP); ++ test_2exp_extreme_aux (); ++ ++ set_emin (emin); ++ set_emax (emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -185,6 +333,7 @@ + check_set_uj_2exp (); + check_set_sj (); + check_set_sj_2exp (); ++ test_2exp_extreme (); + + tests_end_mpfr (); + return 0; diff --git a/mpfr-sub1-ubf.patch b/mpfr-sub1-ubf.patch new file mode 100644 index 0000000..b4d31f4 --- /dev/null +++ b/mpfr-sub1-ubf.patch @@ -0,0 +1,722 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-03-30 13:09:17.466071979 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-03-30 13:09:17.502071540 +0000 +@@ -0,0 +1 @@ ++sub1-ubf +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-03-30 13:05:16.264989689 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-03-30 13:09:17.502071540 +0000 +@@ -1 +1 @@ +-4.0.2-p3 ++4.0.2-p4 +diff -Naurd mpfr-4.0.2-a/src/add1.c mpfr-4.0.2-b/src/add1.c +--- mpfr-4.0.2-a/src/add1.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/add1.c 2020-03-30 13:09:17.490071686 +0000 +@@ -41,7 +41,7 @@ + + if (MPFR_UNLIKELY (MPFR_IS_UBF (b))) + { +- exp = mpfr_ubf_zexp2exp (MPFR_ZEXP (b)); ++ exp = MPFR_UBF_GET_EXP (b); + if (exp > __gmpfr_emax) + return mpfr_overflow (a, rnd_mode, MPFR_SIGN (b));; + } +diff -Naurd mpfr-4.0.2-a/src/mpfr-impl.h mpfr-4.0.2-b/src/mpfr-impl.h +--- mpfr-4.0.2-a/src/mpfr-impl.h 2019-06-02 17:05:36.145226719 +0000 ++++ mpfr-4.0.2-b/src/mpfr-impl.h 2020-03-30 13:09:17.490071686 +0000 +@@ -2406,11 +2406,28 @@ + } + #endif + +-#define MPFR_ZEXP(x) \ +- ((void) (x)->_mpfr_exp /* to check that x has a correct type */, \ ++/* Get the _mpfr_zexp field (pointer to a mpz_t) of a UBF object. ++ For practical reasons, the type of the argument x can be either ++ mpfr_ubf_ptr or mpfr_ptr, since the latter is used in functions ++ that accept both MPFR numbers and UBF's; this is checked by the ++ code "(x)->_mpfr_exp" (the "sizeof" prevents an access, which ++ could be invalid when MPFR_ZEXP(x) is used for an assignment, ++ and also avoids breaking the aliasing rules if they are dealt ++ with in the future). ++ This macro can be used when building a UBF. So we do not check ++ that the _mpfr_exp field has the value MPFR_EXP_UBF. */ ++#define MPFR_ZEXP(x) \ ++ ((void) sizeof ((x)->_mpfr_exp), \ + ((mpfr_ubf_ptr) (x))->_mpfr_zexp) + ++/* If x is a UBF, clear its mpz_t exponent. */ + #define MPFR_UBF_CLEAR_EXP(x) \ + ((void) (MPFR_IS_UBF (x) && (mpz_clear (MPFR_ZEXP (x)), 0))) + ++/* Like MPFR_GET_EXP, but accepts UBF (with exponent saturated to ++ the interval [MPFR_EXP_MIN,MPFR_EXP_MAX]). */ ++#define MPFR_UBF_GET_EXP(x) \ ++ (MPFR_IS_UBF (x) ? mpfr_ubf_zexp2exp (MPFR_ZEXP (x)) : \ ++ MPFR_GET_EXP ((mpfr_ptr) (x))) ++ + #endif /* __MPFR_IMPL_H__ */ +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 13:05:16.260989737 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 13:09:17.498071589 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p3" ++#define MPFR_VERSION_STRING "4.0.2-p4" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/sub1.c mpfr-4.0.2-b/src/sub1.c +--- mpfr-4.0.2-a/src/sub1.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/sub1.c 2020-03-30 13:09:17.490071686 +0000 +@@ -91,9 +91,20 @@ + + if (MPFR_UNLIKELY (MPFR_IS_UBF (b) || MPFR_IS_UBF (c))) + { +- exp_b = MPFR_IS_UBF (b) ? +- mpfr_ubf_zexp2exp (MPFR_ZEXP (b)) : MPFR_GET_EXP (b); ++ exp_b = MPFR_UBF_GET_EXP (b); ++ /* Early underflow detection. Rare, but a test is needed anyway ++ since in the "MAX (aq, bq) + 2 <= diff_exp" branch, the exponent ++ may decrease and MPFR_EXP_MIN would yield an integer overflow. */ ++ if (MPFR_UNLIKELY (exp_b < __gmpfr_emin - 1)) ++ { ++ if (rnd_mode == MPFR_RNDN) ++ rnd_mode = MPFR_RNDZ; ++ return mpfr_underflow (a, rnd_mode, MPFR_SIGN(a)); ++ } + diff_exp = mpfr_ubf_diff_exp (b, c); ++ /* mpfr_set4 below used with MPFR_RNDF does not support UBF. */ ++ if (rnd_mode == MPFR_RNDF) ++ rnd_mode = MPFR_RNDN; + } + else + { +@@ -123,11 +134,11 @@ + if (rnd_mode == MPFR_RNDF) + return mpfr_set4 (a, b, MPFR_RNDZ, MPFR_SIGN (a)); + +- MPFR_EXP (a) = exp_b; /* may be up to MPFR_EXP_MAX */ ++ exp_a = exp_b; /* may be any out-of-range value due to UBF */ + MPFR_RNDRAW_EVEN (inexact, a, MPFR_MANT (b), bq, + rnd_mode, MPFR_SIGN (a), +- if (MPFR_EXP (a) != MPFR_EXP_MAX) +- ++ MPFR_EXP (a)); ++ if (exp_a != MPFR_EXP_MAX) ++ exp_a ++); + MPFR_LOG_MSG (("inexact=%d\n", inexact)); + if (inexact == 0) + { +@@ -139,7 +150,7 @@ + if (! MPFR_IS_LIKE_RNDZ (rnd_mode, MPFR_IS_NEG (a))) + { + inexact = MPFR_INT_SIGN (a); +- goto check_overflow; ++ goto end_of_c_small; + } + } + else /* inexact != 0 */ +@@ -164,7 +175,7 @@ + which means we get a wrong rounded result if x == 1, + i.e. inexact == MPFR_EVEN_INEX (for positive numbers). */ + if (MPFR_LIKELY (inexact != MPFR_EVEN_INEX * MPFR_INT_SIGN (a))) +- goto check_overflow; ++ goto end_of_c_small; + } + /* We need to take the value preceding |a|. We can't use + mpfr_nexttozero due to a possible out-of-range exponent. +@@ -174,16 +185,26 @@ + mpn_sub_1 (ap, ap, an, MPFR_LIMB_ONE << sh); + if (MPFR_UNLIKELY (MPFR_LIMB_MSB (ap[an-1]) == 0)) + { +- MPFR_EXP (a) --; ++ exp_a --; + /* The following is valid whether an = 1 or an > 1. */ + ap[an-1] |= MPFR_LIMB_HIGHBIT; + } + inexact = - MPFR_INT_SIGN (a); +- check_overflow: +- if (MPFR_UNLIKELY (MPFR_EXP (a) > __gmpfr_emax)) ++ end_of_c_small: ++ /* The underflow case is possible only with UBF. The overflow case ++ is also possible with normal FP due to rounding. */ ++ if (MPFR_UNLIKELY (exp_a > __gmpfr_emax)) + return mpfr_overflow (a, rnd_mode, MPFR_SIGN (a)); +- else +- MPFR_RET (inexact); ++ if (MPFR_UNLIKELY (exp_a < __gmpfr_emin)) ++ { ++ if (rnd_mode == MPFR_RNDN && ++ (exp_a < __gmpfr_emin - 1 || ++ (inexact * MPFR_INT_SIGN (a) >= 0 && mpfr_powerof2_raw (a)))) ++ rnd_mode = MPFR_RNDZ; ++ return mpfr_underflow (a, rnd_mode, MPFR_SIGN(a)); ++ } ++ MPFR_SET_EXP (a, exp_a); ++ MPFR_RET (inexact); + } + + /* reserve a space to store b aligned with the result, i.e. shifted by +@@ -656,6 +677,15 @@ + if (MPFR_LIKELY(cancel)) + { + cancel -= add_exp; /* OK: add_exp is an int equal to 0 or 1 */ ++ MPFR_ASSERTD (cancel >= 0); ++ /* Detect an underflow case to avoid a possible integer overflow ++ with UBF in the computation of exp_a. */ ++ if (MPFR_UNLIKELY (exp_b < __gmpfr_emin - 1)) ++ { ++ if (rnd_mode == MPFR_RNDN) ++ rnd_mode = MPFR_RNDZ; ++ return mpfr_underflow (a, rnd_mode, MPFR_SIGN(a)); ++ } + exp_a = exp_b - cancel; + /* The following assertion corresponds to a limitation of the MPFR + implementation. It may fail with a 32-bit ABI and huge precisions, +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-03-30 13:05:16.264989689 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-03-30 13:09:17.502071540 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p3"; ++ return "4.0.2-p4"; + } +diff -Naurd mpfr-4.0.2-a/tests/tfma.c mpfr-4.0.2-b/tests/tfma.c +--- mpfr-4.0.2-a/tests/tfma.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tfma.c 2020-03-30 13:09:17.490071686 +0000 +@@ -47,7 +47,7 @@ + mpfr_add (r1, r1, c, (mpfr_rnd_t) rnd)) + { + if (rnd == MPFR_RNDF) +- break; ++ continue; + printf ("test_exact internal error for (%d,%d,%d,%d,%s)\n", + i, j, k, rnd, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); + exit (1); +@@ -664,7 +664,7 @@ + Note: The purpose of the s * 2^(emin-7) term is to yield + double rounding when scaling for k = 4, s != 0, MPFR_RNDN. */ + +- RND_LOOP (rnd) ++ RND_LOOP_NO_RNDF (rnd) + { + mpfr_clear_flags (); + inex1 = mpfr_set_si_2exp (t1, sign * (8*k+s-64), e-6, +diff -Naurd mpfr-4.0.2-a/tests/tfmma.c mpfr-4.0.2-b/tests/tfmma.c +--- mpfr-4.0.2-a/tests/tfmma.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tfmma.c 2020-03-30 13:09:17.490071686 +0000 +@@ -480,6 +480,123 @@ + mpfr_clears (x, y, z, (mpfr_ptr) 0); + } + ++static void ++underflow_tests (void) ++{ ++ mpfr_t x, y, z; ++ mpfr_prec_t p; ++ mpfr_exp_t emin; ++ ++ emin = mpfr_get_emin (); ++ mpfr_set_emin (-17); ++ for (p = MPFR_PREC_MIN; p <= 1024; p++) ++ { ++ mpfr_inits2 (p, x, y, (mpfr_ptr) 0); ++ mpfr_init2 (z, p + 1); ++ mpfr_set_str_binary (x, "1e-10"); ++ mpfr_set_str_binary (y, "1e-11"); ++ mpfr_clear_underflow (); ++ mpfr_fmms (z, x, x, y, y, MPFR_RNDN); ++ /* the exact result is 2^-20-2^-22, and should underflow */ ++ MPFR_ASSERTN(mpfr_underflow_p ()); ++ MPFR_ASSERTN(mpfr_zero_p (z)); ++ MPFR_ASSERTN(mpfr_signbit (z) == 0); ++ mpfr_clears (x, y, z, (mpfr_ptr) 0); ++ } ++ mpfr_set_emin (emin); ++} ++ ++static void ++bug20180604 (void) ++{ ++ mpfr_t x, y, yneg, z; ++ mpfr_exp_t emin; ++ int ret; ++ ++ emin = mpfr_get_emin (); ++ mpfr_set_emin (-1073741821); ++ mpfr_inits2 (564, x, y, yneg, (mpfr_ptr) 0); ++ mpfr_init2 (z, 2256); ++ mpfr_set_str_binary (x, "1.10010000111100110011001101111111101000111001011000110100110010000101000100010001000000111100010000101001011011111001111000110101111100101111001100001100011101100100011110000000011000010110111100111000100101010001011111010111011001110010001011101111001011001110110000010000011100010001010001011100100110111110101001001111001011101111110011101110101010110100010010111011111100010101111100011110111001011111101110101101101110100101111010000101011110100000000110111101000001100001000100010110100111010011011010110011100111010000101110010101111001011100110101100001100E-737194993"); ++ mpfr_set_str_binary (y, "-1.00101000100001001101011110100010110011101010011011010111100110101011111100000100101000111010111101100100110010001110011011100100110110000001011001000111101111101111110101100110111000000011000001101001010100010010001110001000011010000100111001001100101111111100010101110101001101101101111010100011011110001000010000010100011000011000010110101100000111111110111001100100100001101011111011100101110111000100101010110100010011101010110010100110100111000000100111101101101000000011110000100110100100011000010011110010001010000110100011111101101101110001110001101101010E-737194903"); ++ ++ mpfr_clear_underflow (); ++ ret = mpfr_fmms (z, x, x, y, y, MPFR_RNDN); ++ MPFR_ASSERTN(mpfr_underflow_p ()); ++ MPFR_ASSERTN(mpfr_zero_p (z)); ++ MPFR_ASSERTN(mpfr_signbit (z) == 1); ++ MPFR_ASSERTN(ret > 0); ++ ++ mpfr_clear_underflow (); ++ ret = mpfr_fmms (z, y, y, x, x, MPFR_RNDN); ++ MPFR_ASSERTN(mpfr_underflow_p ()); ++ MPFR_ASSERTN(mpfr_zero_p (z)); ++ MPFR_ASSERTN(mpfr_signbit (z) == 0); ++ MPFR_ASSERTN(ret < 0); ++ ++ mpfr_neg (yneg, y, MPFR_RNDN); ++ mpfr_clear_underflow (); ++ ret = mpfr_fmms (z, x, x, y, yneg, MPFR_RNDN); ++ MPFR_ASSERTN(mpfr_underflow_p ()); ++ MPFR_ASSERTN(mpfr_zero_p (z)); ++ MPFR_ASSERTN(mpfr_signbit (z) == 0); ++ MPFR_ASSERTN(ret < 0); ++ ++ mpfr_clear_underflow (); ++ ret = mpfr_fmms (z, y, yneg, x, x, MPFR_RNDN); ++ MPFR_ASSERTN(mpfr_underflow_p ()); ++ MPFR_ASSERTN(mpfr_zero_p (z)); ++ MPFR_ASSERTN(mpfr_signbit (z) == 1); ++ MPFR_ASSERTN(ret > 0); ++ ++ mpfr_clears (x, y, yneg, z, (mpfr_ptr) 0); ++ mpfr_set_emin (emin); ++} ++ ++/* this bug was discovered from mpc_mul */ ++static void ++bug20200206 (void) ++{ ++ mpfr_exp_t emin = mpfr_get_emin (); ++ mpfr_t xre, xim, yre, yim, zre; ++ ++ mpfr_set_emin (-1073); ++ mpfr_inits2 (53, xre, xim, yre, yim, zre, (mpfr_ptr) 0); ++ mpfr_set_str (xre, "-0x8.294611b331c8p-904", 16, MPFR_RNDN); ++ mpfr_set_str (xim, "-0x1.859278c2992fap-676", 16, MPFR_RNDN); ++ mpfr_set_str (yre, "0x9.ac54802a95f8p-820", 16, MPFR_RNDN); ++ mpfr_set_str (yim, "0x3.17e59e7612aap-412", 16, MPFR_RNDN); ++ mpfr_fmms (zre, xre, yre, xim, yim, MPFR_RNDN); ++ if (mpfr_regular_p (zre) && mpfr_get_exp (zre) < -1073) ++ { ++ printf ("Error, mpfr_fmms returns an out-of-range exponent:\n"); ++ mpfr_dump (zre); ++ exit (1); ++ } ++ mpfr_clears (xre, xim, yre, yim, zre, (mpfr_ptr) 0); ++ mpfr_set_emin (emin); ++} ++ ++/* check for integer overflow (see bug fixed in r13798) */ ++static void ++extreme_underflow (void) ++{ ++ mpfr_t x, y, z; ++ mpfr_exp_t emin = mpfr_get_emin (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ mpfr_inits2 (64, x, y, z, (mpfr_ptr) 0); ++ mpfr_set_ui_2exp (x, 1, MPFR_EMIN_MIN - 1, MPFR_RNDN); ++ mpfr_set (y, x, MPFR_RNDN); ++ mpfr_nextabove (x); ++ mpfr_clear_flags (); ++ mpfr_fmms (z, x, x, y, y, MPFR_RNDN); ++ MPFR_ASSERTN (__gmpfr_flags == (MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT)); ++ MPFR_ASSERTN (MPFR_IS_ZERO (z) && MPFR_IS_POS (z)); ++ mpfr_clears (x, y, z, (mpfr_ptr) 0); ++ set_emin (emin); ++} ++ + /* Test double-rounding cases in mpfr_set_1_2, which is called when + all the precisions are the same. With set.c before r13347, this + triggers errors for neg=0. */ +@@ -548,6 +665,9 @@ + { + tests_start_mpfr (); + ++ bug20200206 (); ++ bug20180604 (); ++ underflow_tests (); + random_tests (); + zero_tests (); + max_tests (); +@@ -555,6 +675,7 @@ + half_plus_half (); + bug20170405 (); + double_rounding (); ++ extreme_underflow (); + + tests_end_mpfr (); + return 0; +diff -Naurd mpfr-4.0.2-a/tests/tsub.c mpfr-4.0.2-b/tests/tsub.c +--- mpfr-4.0.2-a/tests/tsub.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tsub.c 2020-03-30 13:09:17.490071686 +0000 +@@ -1159,6 +1159,358 @@ + } + } + ++/* Tests on UBF. ++ * ++ * Note: mpfr_sub1sp will never be used as it does not support UBF. ++ * Thus there is no need to generate tests for both mpfr_sub1 and ++ * mpfr_sub1sp. ++ * ++ * Note that mpfr_sub1 has a special branch "c small", where the second ++ * argument c is sufficiently smaller than the ulp of the first argument ++ * and the ulp of the result: MAX (aq, bq) + 2 <= diff_exp. ++ * Tests should be done for both the main branch and this special branch ++ * when this makes sense. ++ */ ++#define REXP 1024 ++ ++static void test_ubf_aux (void) ++{ ++ mpfr_ubf_t x[11]; ++ mpfr_ptr p[11]; ++ int ex[11]; ++ mpfr_t ee, y, z, w; ++ int i, j, k, neg, inexact, rnd; ++ const int kn = 2; ++ mpfr_exp_t e[] = ++ { MPFR_EXP_MIN, MPFR_EMIN_MIN, -REXP, 0, ++ REXP, MPFR_EMAX_MAX, MPFR_EXP_MAX }; ++ ++ mpfr_init2 (ee, sizeof (mpfr_exp_t) * CHAR_BIT); ++ mpfr_inits2 (64, y, z, (mpfr_ptr) 0); ++ mpfr_init2 (w, 2); ++ ++ for (i = 0; i < 11; i++) ++ p[i] = (mpfr_ptr) x[i]; ++ ++ /* exact zero result, with small and large exponents */ ++ for (i = 0; i < 2; i++) ++ { ++ mpfr_init2 (p[i], 5 + (randlimb () % 128)); ++ mpfr_set_ui (p[i], 17, MPFR_RNDN); ++ mpz_init (MPFR_ZEXP (p[i])); ++ MPFR_SET_UBF (p[i]); ++ } ++ for (j = 0; j < numberof (e); j++) ++ { ++ inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ mpz_sub_ui (MPFR_ZEXP (p[0]), MPFR_ZEXP (p[0]), kn); ++ ++ for (k = -kn; k <= kn; k++) ++ { ++ /* exponent: e[j] + k, with |k| <= kn */ ++ mpz_set (MPFR_ZEXP (p[1]), MPFR_ZEXP (p[0])); ++ ++ for (neg = 0; neg <= 1; neg++) ++ { ++ RND_LOOP (rnd) ++ { ++ /* Note: x[0] and x[1] are equal MPFR numbers, but do not ++ test mpfr_sub with arg2 == arg3 as pointers in order to ++ skip potentially optimized mpfr_sub code. */ ++ inexact = mpfr_sub (z, p[0], p[1], (mpfr_rnd_t) rnd); ++ if (inexact != 0 || MPFR_NOTZERO (z) || ++ (rnd != MPFR_RNDD ? MPFR_IS_NEG (z) : MPFR_IS_POS (z))) ++ { ++ printf ("Error 1 in test_ubf for exact zero result: " ++ "j=%d k=%d neg=%d, rnd=%s\nGot ", j, k, neg, ++ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); ++ mpfr_dump (z); ++ printf ("inexact = %d\n", inexact); ++ exit (1); ++ } ++ } ++ ++ for (i = 0; i < 2; i++) ++ MPFR_CHANGE_SIGN (p[i]); ++ } ++ ++ mpz_add_ui (MPFR_ZEXP (p[0]), MPFR_ZEXP (p[0]), 1); ++ } ++ } ++ for (i = 0; i < 2; i++) ++ { ++ MPFR_UBF_CLEAR_EXP (p[i]); ++ mpfr_clear (p[i]); ++ } ++ ++ /* Up to a given exponent (for the result) and sign, test: ++ * (t + .11010) - (t + .00001) = .11001 ++ * (t + 8) - (t + 111.00111) = .11001 ++ * where t = 0 or a power of 2, e.g. 2^200. Test various exponents ++ * (including those near the underflow/overflow boundaries) so that ++ * the subtraction yields a normal number, an overflow or an underflow. ++ * In MPFR_RNDA, also test with a 2-bit precision target, as this ++ * yields an exponent change. ++ * ++ * Also test the "MAX (aq, bq) + 2 <= diff_exp" branch of sub1.c with ++ * .1 - epsilon (possible decrease of the exponent) and .111 - epsilon ++ * in precision 2 (possible increase of the exponent). The first test ++ * triggers a possible decrease of the exponent (see bug fixed in r13806). ++ * The second test triggers a possible increase of the exponent (see the ++ * "exp_a != MPFR_EXP_MAX" test to avoid an integer overflow). ++ */ ++ for (i = 0; i < 8; i++) ++ { ++ static int v[4] = { 26, 1, 256, 231 }; ++ ++ mpfr_init2 (p[i], i < 4 ? 5 + (randlimb () % 128) : 256); ++ if (i < 4) ++ mpfr_set_si_2exp (p[i], v[i], -5, MPFR_RNDN); ++ else ++ { ++ mpfr_set_si_2exp (p[i], 1, 200, MPFR_RNDN); ++ mpfr_add (p[i], p[i], p[i-4], MPFR_RNDN); ++ } ++ ex[i] = mpfr_get_exp (p[i]) + 5; ++ MPFR_ASSERTD (ex[i] >= 0); ++ } ++ mpfr_inits2 (3, p[8], p[9], p[10], (mpfr_ptr) 0); ++ mpfr_set_si_2exp (p[8], 1, 0, MPFR_RNDN); ++ ex[8] = 5; ++ mpfr_set_si_2exp (p[9], 1, 0, MPFR_RNDN); /* will be epsilon */ ++ ex[9] = 0; ++ mpfr_set_si_2exp (p[10], 7, 0, MPFR_RNDN); ++ ex[10] = 5; ++ ++ for (i = 0; i < 11; i++) ++ { ++ mpz_init (MPFR_ZEXP (p[i])); ++ MPFR_SET_UBF (p[i]); ++ } ++ ++ for (j = 0; j < numberof (e); j++) ++ { ++ inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ for (i = 1; i < 11; i++) ++ mpz_set (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[0])); ++ for (i = 0; i < 11; i++) ++ { ++ mpz_add_ui (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[i]), ex[i]); ++ mpz_sub_ui (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[i]), 5 + kn); ++ } ++ mpz_sub_ui (MPFR_ZEXP (p[9]), MPFR_ZEXP (p[9]), 256); ++ for (k = -kn; k <= kn; k++) ++ { ++ for (neg = 0; neg <= 1; neg++) ++ { ++ int sign = neg ? -1 : 1; ++ ++ RND_LOOP (rnd) ++ for (i = 0; i <= 10; i += 2) ++ { ++ mpfr_exp_t e0; ++ mpfr_flags_t flags, flags_y; ++ int inex_y; ++ ++ if (i >= 8) ++ { ++ int d; ++ ++ e0 = MPFR_UBF_GET_EXP (p[i]); ++ if (e0 < MPFR_EXP_MIN + 3) ++ e0 += 3; ++ ++ if (rnd == MPFR_RNDN) ++ d = i == 8 ? (e0 == __gmpfr_emin - 1 ? 3 : 4) : 6; ++ else if (MPFR_IS_LIKE_RNDZ (rnd, neg)) ++ d = i == 8 ? 3 : 6; ++ else ++ d = i == 8 ? 4 : 8; ++ ++ mpfr_clear_flags (); ++ inex_y = mpfr_set_si_2exp (w, sign * d, e0 - 3, ++ (mpfr_rnd_t) rnd); ++ flags_y = __gmpfr_flags | MPFR_FLAGS_INEXACT; ++ if (inex_y == 0) ++ inex_y = rnd == MPFR_RNDN ? ++ sign * (i == 8 ? 1 : -1) : ++ MPFR_IS_LIKE_RNDD ((mpfr_rnd_t) rnd, sign) ? ++ -1 : 1; ++ mpfr_set (y, w, MPFR_RNDN); ++ ++ mpfr_clear_flags (); ++ inexact = mpfr_sub (w, p[i], p[9], (mpfr_rnd_t) rnd); ++ flags = __gmpfr_flags; ++ ++ /* For MPFR_RNDF, only do a basic test. */ ++ MPFR_ASSERTN (mpfr_check (w)); ++ if (rnd == MPFR_RNDF) ++ continue; ++ ++ goto testw; ++ } ++ ++ mpfr_clear_flags (); ++ inexact = mpfr_sub (z, p[i], p[i+1], (mpfr_rnd_t) rnd); ++ flags = __gmpfr_flags; ++ ++ /* For MPFR_RNDF, only do a basic test. */ ++ MPFR_ASSERTN (mpfr_check (z)); ++ if (rnd == MPFR_RNDF) ++ continue; ++ ++ e0 = MPFR_UBF_GET_EXP (p[0]); ++ ++ if (e0 < __gmpfr_emin) ++ { ++ mpfr_rnd_t r = ++ rnd == MPFR_RNDN && e0 < __gmpfr_emin - 1 ? ++ MPFR_RNDZ : (mpfr_rnd_t) rnd; ++ flags_y = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; ++ inex_y = mpfr_underflow (y, r, sign); ++ } ++ else if (e0 > __gmpfr_emax) ++ { ++ flags_y = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT; ++ inex_y = mpfr_overflow (y, (mpfr_rnd_t) rnd, sign); ++ } ++ else ++ { ++ mpfr_set_si_2exp (y, sign * 25, e0 - 5, MPFR_RNDN); ++ flags_y = 0; ++ inex_y = 0; ++ } ++ ++ if (flags != flags_y || ++ ! SAME_SIGN (inexact, inex_y) || ++ ! mpfr_equal_p (y, z)) ++ { ++ printf ("Error 2 in test_ubf with " ++ "j=%d k=%d neg=%d i=%d rnd=%s\n", ++ j, k, neg, i, ++ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); ++ printf ("emin=%" MPFR_EXP_FSPEC "d " ++ "emax=%" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) __gmpfr_emin, ++ (mpfr_eexp_t) __gmpfr_emax); ++ printf ("b = "); ++ mpfr_dump (p[i]); ++ printf ("c = "); ++ mpfr_dump (p[i+1]); ++ printf ("Expected "); ++ mpfr_dump (y); ++ printf ("with inex = %d and flags =", inex_y); ++ flags_out (flags_y); ++ printf ("Got "); ++ mpfr_dump (z); ++ printf ("with inex = %d and flags =", inexact); ++ flags_out (flags); ++ exit (1); ++ } ++ ++ /* Do the following 2-bit precision test only in RNDA. */ ++ if (rnd != MPFR_RNDA) ++ continue; ++ ++ mpfr_clear_flags (); ++ inexact = mpfr_sub (w, p[i], p[i+1], MPFR_RNDA); ++ flags = __gmpfr_flags; ++ if (e0 < MPFR_EXP_MAX) ++ e0++; ++ ++ if (e0 < __gmpfr_emin) ++ { ++ flags_y = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; ++ inex_y = mpfr_underflow (y, MPFR_RNDA, sign); ++ } ++ else if (e0 > __gmpfr_emax) ++ { ++ flags_y = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT; ++ inex_y = mpfr_overflow (y, MPFR_RNDA, sign); ++ } ++ else ++ { ++ mpfr_set_si_2exp (y, sign, e0 - 1, MPFR_RNDN); ++ flags_y = MPFR_FLAGS_INEXACT; ++ inex_y = sign; ++ } ++ ++ testw: ++ if (flags != flags_y || ++ ! SAME_SIGN (inexact, inex_y) || ++ ! mpfr_equal_p (y, w)) ++ { ++ printf ("Error 3 in test_ubf with " ++ "j=%d k=%d neg=%d i=%d rnd=%s\n", ++ j, k, neg, i, ++ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); ++ printf ("emin=%" MPFR_EXP_FSPEC "d " ++ "emax=%" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) __gmpfr_emin, ++ (mpfr_eexp_t) __gmpfr_emax); ++ printf ("b = "); ++ mpfr_dump (p[i]); ++ printf ("c = "); ++ mpfr_dump (p[i <= 8 ? i+1 : 9]); ++ printf ("Expected "); ++ /* Set y to a 2-bit precision just for the output. ++ Since we exit, this will have no other effect. */ ++ mpfr_prec_round (y, 2, MPFR_RNDA); ++ mpfr_dump (y); ++ printf ("with inex = %d and flags =", inex_y); ++ flags_out (flags_y); ++ printf ("Got "); ++ mpfr_dump (w); ++ printf ("with inex = %d and flags =", inexact); ++ flags_out (flags); ++ exit (1); ++ } ++ } ++ ++ for (i = 0; i < 11; i++) ++ MPFR_CHANGE_SIGN (p[i]); ++ } ++ ++ for (i = 0; i < 11; i++) ++ mpz_add_ui (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[i]), 1); ++ } ++ } ++ for (i = 0; i < 11; i++) ++ { ++ MPFR_UBF_CLEAR_EXP (p[i]); ++ mpfr_clear (p[i]); ++ } ++ ++ mpfr_clears (ee, y, z, w, (mpfr_ptr) 0); ++} ++ ++/* Run the tests on UBF with the maximum exponent range and with a ++ reduced exponent range. */ ++static void test_ubf (void) ++{ ++ mpfr_exp_t emin, emax; ++ ++ emin = mpfr_get_emin (); ++ emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ test_ubf_aux (); ++ ++ set_emin (-REXP); ++ set_emax (REXP); ++ test_ubf_aux (); ++ ++ set_emin (emin); ++ set_emax (emax); ++} ++ + #define TEST_FUNCTION test_sub + #define TWO_ARGS + #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS) +@@ -1188,6 +1540,7 @@ + for (i=0; i<50; i++) + check_two_sum (p); + test_generic (MPFR_PREC_MIN, 800, 100); ++ test_ubf (); + + tests_end_mpfr (); + return 0; diff --git a/mpfr-sub1-ubftest.patch b/mpfr-sub1-ubftest.patch new file mode 100644 index 0000000..b4f53fb --- /dev/null +++ b/mpfr-sub1-ubftest.patch @@ -0,0 +1,100 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-04-03 13:54:03.807946879 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-04-03 13:54:03.891945830 +0000 +@@ -0,0 +1 @@ ++sub1-ubftest +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-03-30 16:50:17.096230810 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-04-03 13:54:03.891945830 +0000 +@@ -1 +1 @@ +-4.0.2-p6 ++4.0.2-p7 +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 16:50:17.096230810 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-04-03 13:54:03.891945830 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p6" ++#define MPFR_VERSION_STRING "4.0.2-p7" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-03-30 16:50:17.096230810 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-04-03 13:54:03.891945830 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p6"; ++ return "4.0.2-p7"; + } +diff -Naurd mpfr-4.0.2-a/tests/tsub.c mpfr-4.0.2-b/tests/tsub.c +--- mpfr-4.0.2-a/tests/tsub.c 2020-03-30 13:09:17.490071686 +0000 ++++ mpfr-4.0.2-b/tests/tsub.c 2020-04-03 13:54:03.827946629 +0000 +@@ -1203,9 +1203,9 @@ + for (j = 0; j < numberof (e); j++) + { + inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); +- MPFR_ASSERTD (inexact == 0); ++ MPFR_ASSERTN (inexact == 0); + inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); +- MPFR_ASSERTD (inexact == 0); ++ MPFR_ASSERTN (inexact == 0); + mpz_sub_ui (MPFR_ZEXP (p[0]), MPFR_ZEXP (p[0]), kn); + + for (k = -kn; k <= kn; k++) +@@ -1266,23 +1266,31 @@ + { + static int v[4] = { 26, 1, 256, 231 }; + +- mpfr_init2 (p[i], i < 4 ? 5 + (randlimb () % 128) : 256); ++ mpfr_init2 (p[i], i < 4 ? 8 + (randlimb () % 128) : 256); + if (i < 4) +- mpfr_set_si_2exp (p[i], v[i], -5, MPFR_RNDN); ++ { ++ inexact = mpfr_set_si_2exp (p[i], v[i], -5, MPFR_RNDN); ++ MPFR_ASSERTN (inexact == 0); ++ } + else + { +- mpfr_set_si_2exp (p[i], 1, 200, MPFR_RNDN); +- mpfr_add (p[i], p[i], p[i-4], MPFR_RNDN); ++ inexact = mpfr_set_si_2exp (p[i], 1, 200, MPFR_RNDN); ++ MPFR_ASSERTN (inexact == 0); ++ inexact = mpfr_add (p[i], p[i], p[i-4], MPFR_RNDN); ++ MPFR_ASSERTN (inexact == 0); + } + ex[i] = mpfr_get_exp (p[i]) + 5; +- MPFR_ASSERTD (ex[i] >= 0); ++ MPFR_ASSERTN (ex[i] >= 0); + } + mpfr_inits2 (3, p[8], p[9], p[10], (mpfr_ptr) 0); +- mpfr_set_si_2exp (p[8], 1, 0, MPFR_RNDN); ++ inexact = mpfr_set_si_2exp (p[8], 1, 0, MPFR_RNDN); ++ MPFR_ASSERTN (inexact == 0); + ex[8] = 5; +- mpfr_set_si_2exp (p[9], 1, 0, MPFR_RNDN); /* will be epsilon */ ++ inexact = mpfr_set_si_2exp (p[9], 1, 0, MPFR_RNDN); /* will be epsilon */ ++ MPFR_ASSERTN (inexact == 0); + ex[9] = 0; +- mpfr_set_si_2exp (p[10], 7, 0, MPFR_RNDN); ++ inexact = mpfr_set_si_2exp (p[10], 7, 0, MPFR_RNDN); ++ MPFR_ASSERTN (inexact == 0); + ex[10] = 5; + + for (i = 0; i < 11; i++) +@@ -1294,9 +1302,9 @@ + for (j = 0; j < numberof (e); j++) + { + inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); +- MPFR_ASSERTD (inexact == 0); ++ MPFR_ASSERTN (inexact == 0); + inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); +- MPFR_ASSERTD (inexact == 0); ++ MPFR_ASSERTN (inexact == 0); + for (i = 1; i < 11; i++) + mpz_set (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[0])); + for (i = 0; i < 11; i++) diff --git a/mpfr.spec b/mpfr.spec index 641ea47..24e87fa 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 4.0.2 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ @@ -11,9 +11,37 @@ Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13499&view=revision # https://www.mpfr.org/mpfr-4.0.2/patch01 -Patch0: rev13499.patch +Patch0: %{name}-include-float.patch -# This can be removed before the next build +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13828&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch02 +Patch1: %{name}-int-overflow.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13836&view=revision +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13838&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch03 +Patch2: %{name}-set-int.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13697&view=revision +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13837&view=revision +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13841&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch04 +Patch3: %{name}-sub1-ubf.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13516&view=revision +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13520&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch05 +Patch4: %{name}-const.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13518&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch06 +Patch5: %{name}-array-length.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13869&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch07 +Patch6: %{name}-sub1-ubftest.patch + +# This can be removed when F32 reaches EOL Obsoletes: mpfr3 < 4.0.0 Provides: mpfr3 = %{version}-%{release} @@ -99,6 +127,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Apr 16 2020 Jerry James - 4.0.2-4 +- Add upstream patches 2 through 7 + * Wed Jan 29 2020 Fedora Release Engineering - 4.0.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 9637b73146e7dbdb99c7b12e27da6937248aca1f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 29 Jun 2020 14:29:35 -0600 Subject: [PATCH 13/43] Add upstream patches 8 and 9. --- mpfr-bernoulli-ziv.patch | 143 ++++++++++++++++++++++++++++++++++++++ mpfr-fpif-dead-code.patch | 49 +++++++++++++ mpfr.spec | 15 +++- 3 files changed, 205 insertions(+), 2 deletions(-) create mode 100644 mpfr-bernoulli-ziv.patch create mode 100644 mpfr-fpif-dead-code.patch diff --git a/mpfr-bernoulli-ziv.patch b/mpfr-bernoulli-ziv.patch new file mode 100644 index 0000000..d2c8403 --- /dev/null +++ b/mpfr-bernoulli-ziv.patch @@ -0,0 +1,143 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-06-02 11:26:59.031114881 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-06-02 11:26:59.175114040 +0000 +@@ -0,0 +1 @@ ++bernoulli-ziv +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-04-03 13:54:03.891945830 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-06-02 11:26:59.175114040 +0000 +@@ -1 +1 @@ +-4.0.2-p7 ++4.0.2-p8 +diff -Naurd mpfr-4.0.2-a/doc/README.dev mpfr-4.0.2-b/doc/README.dev +--- mpfr-4.0.2-a/doc/README.dev 2019-01-07 14:06:05.000000000 +0000 ++++ mpfr-4.0.2-b/doc/README.dev 2020-06-02 11:26:59.055114741 +0000 +@@ -540,7 +540,9 @@ + By default, a fixed seed is used. Only developers + and testers should change the seed. + +-+ MPFR_CHECK_LARGEMEM: Define to enable expensive tests. +++ MPFR_CHECK_LARGEMEM: Define to enable tests that take a lot of memory. ++ +++ MPFR_CHECK_EXPENSIVE: Define to enable tests that take a lot of time. + + + MPFR_CHECK_LIBC_PRINTF: + Define to enable comparisons with the printf +diff -Naurd mpfr-4.0.2-a/src/bernoulli.c mpfr-4.0.2-b/src/bernoulli.c +--- mpfr-4.0.2-a/src/bernoulli.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/bernoulli.c 2020-06-02 11:26:59.055114741 +0000 +@@ -39,7 +39,7 @@ + using Von Staudt–Clausen theorem, which says that the denominator of B[n] + divides the product of all primes p such that p-1 divides n. + Since B[n] = zeta(n) * 2*n!/(2pi)^n, we compute an approximation of +- d * zeta(n) * 2*n!/(2pi)^n and round it to the nearest integer. */ ++ (2n+1)! * zeta(n) * 2*n!/(2pi)^n and round it to the nearest integer. */ + static void + mpfr_bernoulli_internal (mpz_t *b, unsigned long n) + { +@@ -86,8 +86,9 @@ + mpfr_mul_ui (z, z, n, MPFR_RNDU); + p = mpfr_get_ui (z, MPFR_RNDU); /* (n/e/2/pi)^n <= 2^p */ + mpfr_clear (z); +- /* the +14 term ensures no rounding failure up to n=10000 */ +- prec += p + mpz_sizeinbase (den, 2) + 14; ++ prec += p + mpz_sizeinbase (den, 2); ++ /* the +2 term ensures no rounding failure up to n=10000 */ ++ prec += __gmpfr_ceil_log2 (prec) + 2; + } + + try_again: +@@ -184,7 +185,6 @@ + mpz_mul_ui (t, t, n + 1); + mpz_divexact (t, t, den); /* t was still n! */ + mpz_mul (num, num, t); +- mpz_set_ui (den, 1); + + mpfr_clear (y); + mpfr_clear (z); +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-04-03 13:54:03.891945830 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-06-02 11:26:59.175114040 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p7" ++#define MPFR_VERSION_STRING "4.0.2-p8" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-04-03 13:54:03.891945830 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-06-02 11:26:59.175114040 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p7"; ++ return "4.0.2-p8"; + } +diff -Naurd mpfr-4.0.2-a/tests/tgamma.c mpfr-4.0.2-b/tests/tgamma.c +--- mpfr-4.0.2-a/tests/tgamma.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/tests/tgamma.c 2020-06-02 11:26:59.055114741 +0000 +@@ -1055,6 +1055,48 @@ + set_emax (emax); + } + ++/* Bug reported by Frithjof Blomquist on May 19, 2020. ++ For the record, this bug was present since r8981 ++ (in mpfr_bernoulli_internal, den was wrongly reset to 1 in case ++ of failure in Ziv's loop). The bug only occurred up from r8986 ++ where the initial precision was reduced, but was potentially ++ present in any case of failure of Ziv's loop. */ ++static void ++bug20200519 (void) ++{ ++ mpfr_prec_t prec = 25093; ++ mpfr_t x, y, z, d; ++ double dd; ++ size_t min_memory_limit, old_memory_limit; ++ ++ old_memory_limit = tests_memory_limit; ++ min_memory_limit = 24000000; ++ if (tests_memory_limit > 0 && tests_memory_limit < min_memory_limit) ++ tests_memory_limit = min_memory_limit; ++ ++ mpfr_init2 (x, prec); ++ mpfr_init2 (y, prec); ++ mpfr_init2 (z, prec + 100); ++ mpfr_init2 (d, 24); ++ mpfr_set_d (x, 2.5, MPFR_RNDN); ++ mpfr_gamma (y, x, MPFR_RNDN); ++ mpfr_gamma (z, x, MPFR_RNDN); ++ mpfr_sub (d, y, z, MPFR_RNDN); ++ mpfr_mul_2si (d, d, prec - mpfr_get_exp (y), MPFR_RNDN); ++ dd = mpfr_get_d (d, MPFR_RNDN); ++ if (dd < -0.5 || 0.5 < dd) ++ { ++ printf ("Error in bug20200519: dd=%f\n", dd); ++ exit (1); ++ } ++ mpfr_clear (x); ++ mpfr_clear (y); ++ mpfr_clear (z); ++ mpfr_clear (d); ++ ++ tests_memory_limit = old_memory_limit; ++} ++ + int + main (int argc, char *argv[]) + { +@@ -1086,6 +1128,11 @@ + + data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); + ++ /* this test takes about one minute */ ++ if (getenv ("MPFR_CHECK_EXPENSIVE") != NULL && ++ getenv ("MPFR_CHECK_LARGEMEM") != NULL) ++ bug20200519 (); ++ + tests_end_mpfr (); + return 0; + } diff --git a/mpfr-fpif-dead-code.patch b/mpfr-fpif-dead-code.patch new file mode 100644 index 0000000..398e78b --- /dev/null +++ b/mpfr-fpif-dead-code.patch @@ -0,0 +1,49 @@ +diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES +--- mpfr-4.0.2-a/PATCHES 2020-06-02 12:39:10.963722927 +0000 ++++ mpfr-4.0.2-b/PATCHES 2020-06-02 12:39:10.999722675 +0000 +@@ -0,0 +1 @@ ++fpif-dead-code +diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION +--- mpfr-4.0.2-a/VERSION 2020-06-02 11:26:59.175114040 +0000 ++++ mpfr-4.0.2-b/VERSION 2020-06-02 12:39:10.999722675 +0000 +@@ -1 +1 @@ +-4.0.2-p8 ++4.0.2-p9 +diff -Naurd mpfr-4.0.2-a/src/fpif.c mpfr-4.0.2-b/src/fpif.c +--- mpfr-4.0.2-a/src/fpif.c 2019-01-07 13:53:20.000000000 +0000 ++++ mpfr-4.0.2-b/src/fpif.c 2020-06-02 12:39:10.987722759 +0000 +@@ -90,11 +90,7 @@ + { \ + (buffer) = (unsigned char *) mpfr_reallocate_func \ + ((buffer), *(buffer_size), (wanted_size)); \ +- if ((buffer) == NULL) \ +- { \ +- *(buffer_size) = 0; \ +- return NULL; \ +- } \ ++ MPFR_ASSERTN((buffer) != 0); \ + } \ + *(buffer_size) = (wanted_size); \ + } \ +diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h +--- mpfr-4.0.2-a/src/mpfr.h 2020-06-02 11:26:59.175114040 +0000 ++++ mpfr-4.0.2-b/src/mpfr.h 2020-06-02 12:39:10.995722702 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 0 + #define MPFR_VERSION_PATCHLEVEL 2 +-#define MPFR_VERSION_STRING "4.0.2-p8" ++#define MPFR_VERSION_STRING "4.0.2-p9" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c +--- mpfr-4.0.2-a/src/version.c 2020-06-02 11:26:59.175114040 +0000 ++++ mpfr-4.0.2-b/src/version.c 2020-06-02 12:39:10.999722675 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.0.2-p8"; ++ return "4.0.2-p9"; + } diff --git a/mpfr.spec b/mpfr.spec index 24e87fa..b60a67b 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 4.0.2 -Release: 4%{?dist} +Release: 5%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ @@ -41,6 +41,14 @@ Patch5: %{name}-array-length.patch # https://www.mpfr.org/mpfr-4.0.2/patch07 Patch6: %{name}-sub1-ubftest.patch +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13924&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch08 +Patch7: %{name}-bernoulli-ziv.patch + +# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13900&view=revision +# https://www.mpfr.org/mpfr-4.0.2/patch09 +Patch8: %{name}-fpif-dead-code.patch + # This can be removed when F32 reaches EOL Obsoletes: mpfr3 < 4.0.0 Provides: mpfr3 = %{version}-%{release} @@ -57,7 +65,7 @@ Summary: Development files for the MPFR library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} -# This can be removed before the next build +# This can be removed when F32 reaches EOL Obsoletes: mpfr3-devel < 4.0.0 Provides: mpfr3-devel = %{version}-%{release} @@ -127,6 +135,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Mon Jun 29 2020 Jerry James - 4.0.2-5 +- Add upstream patches 8 and 9 + * Thu Apr 16 2020 Jerry James - 4.0.2-4 - Add upstream patches 2 through 7 From 40d31d279863d3b5f17cdb5774ede49ece79cb31 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sun, 12 Jul 2020 14:55:02 -0600 Subject: [PATCH 14/43] Update to MPFR version 4.1.0. Drop all patches. --- mpfr-array-length.patch | 58 --- mpfr-bernoulli-ziv.patch | 143 -------- mpfr-const.patch | 184 ---------- mpfr-fpif-dead-code.patch | 49 --- mpfr-include-float.patch | 44 --- mpfr-int-overflow.patch | 97 ----- mpfr-set-int.patch | 441 ----------------------- mpfr-sub1-ubf.patch | 722 -------------------------------------- mpfr-sub1-ubftest.patch | 100 ------ mpfr.spec | 48 +-- sources | 2 +- 11 files changed, 7 insertions(+), 1881 deletions(-) delete mode 100644 mpfr-array-length.patch delete mode 100644 mpfr-bernoulli-ziv.patch delete mode 100644 mpfr-const.patch delete mode 100644 mpfr-fpif-dead-code.patch delete mode 100644 mpfr-include-float.patch delete mode 100644 mpfr-int-overflow.patch delete mode 100644 mpfr-set-int.patch delete mode 100644 mpfr-sub1-ubf.patch delete mode 100644 mpfr-sub1-ubftest.patch diff --git a/mpfr-array-length.patch b/mpfr-array-length.patch deleted file mode 100644 index fce5fe1..0000000 --- a/mpfr-array-length.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-03-30 16:50:17.064231191 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-03-30 16:50:17.096230810 +0000 -@@ -0,0 +1 @@ -+array-length -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-03-30 15:17:31.535330224 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-03-30 16:50:17.096230810 +0000 -@@ -1 +1 @@ --4.0.2-p5 -+4.0.2-p6 -diff -Naurd mpfr-4.0.2-a/src/mpfr-impl.h mpfr-4.0.2-b/src/mpfr-impl.h ---- mpfr-4.0.2-a/src/mpfr-impl.h 2020-03-30 13:09:17.490071686 +0000 -+++ mpfr-4.0.2-b/src/mpfr-impl.h 2020-03-30 16:50:17.084230953 +0000 -@@ -2026,7 +2026,21 @@ - struct mpfr_group_t { - size_t alloc; - mp_limb_t *mant; -+#if MPFR_GROUP_STATIC_SIZE != 0 - mp_limb_t tab[MPFR_GROUP_STATIC_SIZE]; -+#else -+ /* In order to detect memory leaks when testing, MPFR_GROUP_STATIC_SIZE -+ can be set to 0, in which case tab will not be used. ISO C does not -+ support zero-length arrays[*], thus let's use a flexible array member -+ (which will be equivalent here). Note: this is new in C99, but this -+ is just used for testing. -+ [*] Zero-length arrays are a GNU extension: -+ https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html -+ and as such an extension is forbidden in ISO C, it triggers an -+ error with -Werror=pedantic. -+ */ -+ mp_limb_t tab[]; -+#endif - }; - - #define MPFR_GROUP_DECL(g) struct mpfr_group_t g -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 15:17:31.535330224 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 16:50:17.096230810 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p5" -+#define MPFR_VERSION_STRING "4.0.2-p6" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-03-30 15:17:31.535330224 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-03-30 16:50:17.096230810 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p5"; -+ return "4.0.2-p6"; - } diff --git a/mpfr-bernoulli-ziv.patch b/mpfr-bernoulli-ziv.patch deleted file mode 100644 index d2c8403..0000000 --- a/mpfr-bernoulli-ziv.patch +++ /dev/null @@ -1,143 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-06-02 11:26:59.031114881 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-06-02 11:26:59.175114040 +0000 -@@ -0,0 +1 @@ -+bernoulli-ziv -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-04-03 13:54:03.891945830 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-06-02 11:26:59.175114040 +0000 -@@ -1 +1 @@ --4.0.2-p7 -+4.0.2-p8 -diff -Naurd mpfr-4.0.2-a/doc/README.dev mpfr-4.0.2-b/doc/README.dev ---- mpfr-4.0.2-a/doc/README.dev 2019-01-07 14:06:05.000000000 +0000 -+++ mpfr-4.0.2-b/doc/README.dev 2020-06-02 11:26:59.055114741 +0000 -@@ -540,7 +540,9 @@ - By default, a fixed seed is used. Only developers - and testers should change the seed. - --+ MPFR_CHECK_LARGEMEM: Define to enable expensive tests. -++ MPFR_CHECK_LARGEMEM: Define to enable tests that take a lot of memory. -+ -++ MPFR_CHECK_EXPENSIVE: Define to enable tests that take a lot of time. - - + MPFR_CHECK_LIBC_PRINTF: - Define to enable comparisons with the printf -diff -Naurd mpfr-4.0.2-a/src/bernoulli.c mpfr-4.0.2-b/src/bernoulli.c ---- mpfr-4.0.2-a/src/bernoulli.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/bernoulli.c 2020-06-02 11:26:59.055114741 +0000 -@@ -39,7 +39,7 @@ - using Von Staudt–Clausen theorem, which says that the denominator of B[n] - divides the product of all primes p such that p-1 divides n. - Since B[n] = zeta(n) * 2*n!/(2pi)^n, we compute an approximation of -- d * zeta(n) * 2*n!/(2pi)^n and round it to the nearest integer. */ -+ (2n+1)! * zeta(n) * 2*n!/(2pi)^n and round it to the nearest integer. */ - static void - mpfr_bernoulli_internal (mpz_t *b, unsigned long n) - { -@@ -86,8 +86,9 @@ - mpfr_mul_ui (z, z, n, MPFR_RNDU); - p = mpfr_get_ui (z, MPFR_RNDU); /* (n/e/2/pi)^n <= 2^p */ - mpfr_clear (z); -- /* the +14 term ensures no rounding failure up to n=10000 */ -- prec += p + mpz_sizeinbase (den, 2) + 14; -+ prec += p + mpz_sizeinbase (den, 2); -+ /* the +2 term ensures no rounding failure up to n=10000 */ -+ prec += __gmpfr_ceil_log2 (prec) + 2; - } - - try_again: -@@ -184,7 +185,6 @@ - mpz_mul_ui (t, t, n + 1); - mpz_divexact (t, t, den); /* t was still n! */ - mpz_mul (num, num, t); -- mpz_set_ui (den, 1); - - mpfr_clear (y); - mpfr_clear (z); -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-04-03 13:54:03.891945830 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-06-02 11:26:59.175114040 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p7" -+#define MPFR_VERSION_STRING "4.0.2-p8" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-04-03 13:54:03.891945830 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-06-02 11:26:59.175114040 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p7"; -+ return "4.0.2-p8"; - } -diff -Naurd mpfr-4.0.2-a/tests/tgamma.c mpfr-4.0.2-b/tests/tgamma.c ---- mpfr-4.0.2-a/tests/tgamma.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tgamma.c 2020-06-02 11:26:59.055114741 +0000 -@@ -1055,6 +1055,48 @@ - set_emax (emax); - } - -+/* Bug reported by Frithjof Blomquist on May 19, 2020. -+ For the record, this bug was present since r8981 -+ (in mpfr_bernoulli_internal, den was wrongly reset to 1 in case -+ of failure in Ziv's loop). The bug only occurred up from r8986 -+ where the initial precision was reduced, but was potentially -+ present in any case of failure of Ziv's loop. */ -+static void -+bug20200519 (void) -+{ -+ mpfr_prec_t prec = 25093; -+ mpfr_t x, y, z, d; -+ double dd; -+ size_t min_memory_limit, old_memory_limit; -+ -+ old_memory_limit = tests_memory_limit; -+ min_memory_limit = 24000000; -+ if (tests_memory_limit > 0 && tests_memory_limit < min_memory_limit) -+ tests_memory_limit = min_memory_limit; -+ -+ mpfr_init2 (x, prec); -+ mpfr_init2 (y, prec); -+ mpfr_init2 (z, prec + 100); -+ mpfr_init2 (d, 24); -+ mpfr_set_d (x, 2.5, MPFR_RNDN); -+ mpfr_gamma (y, x, MPFR_RNDN); -+ mpfr_gamma (z, x, MPFR_RNDN); -+ mpfr_sub (d, y, z, MPFR_RNDN); -+ mpfr_mul_2si (d, d, prec - mpfr_get_exp (y), MPFR_RNDN); -+ dd = mpfr_get_d (d, MPFR_RNDN); -+ if (dd < -0.5 || 0.5 < dd) -+ { -+ printf ("Error in bug20200519: dd=%f\n", dd); -+ exit (1); -+ } -+ mpfr_clear (x); -+ mpfr_clear (y); -+ mpfr_clear (z); -+ mpfr_clear (d); -+ -+ tests_memory_limit = old_memory_limit; -+} -+ - int - main (int argc, char *argv[]) - { -@@ -1086,6 +1128,11 @@ - - data_check ("data/gamma", mpfr_gamma, "mpfr_gamma"); - -+ /* this test takes about one minute */ -+ if (getenv ("MPFR_CHECK_EXPENSIVE") != NULL && -+ getenv ("MPFR_CHECK_LARGEMEM") != NULL) -+ bug20200519 (); -+ - tests_end_mpfr (); - return 0; - } diff --git a/mpfr-const.patch b/mpfr-const.patch deleted file mode 100644 index 4e20d15..0000000 --- a/mpfr-const.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-03-30 16:31:45.813415121 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-03-30 16:33:54.623893528 +0000 -@@ -0,0 +1 @@ -+const -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-03-30 13:09:17.502071540 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-03-30 15:17:31.535330224 +0000 -@@ -1,1 +1,1 @@ --4.0.2-p4 -+4.0.2-p5 -diff -Naurd mpfr-4.0.2-a/configure mpfr-4.0.2-b/configure ---- mpfr-4.0.2-a/configure 2019-01-31 20:43:19.000000000 +0000 -+++ mpfr-4.0.2-b/configure 2020-03-30 16:33:29.340190160 +0000 -@@ -15868,9 +15868,9 @@ - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --char *number = "0123456789"; --char *lower = "abcdefghijklmnopqrstuvwxyz"; --char *upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; -+const char *number = "0123456789"; -+const char *lower = "abcdefghijklmnopqrstuvwxyz"; -+const char *upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - - int - main (void) -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 13:09:17.498071589 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 15:17:31.535330224 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p4" -+#define MPFR_VERSION_STRING "4.0.2-p5" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-03-30 13:09:17.502071540 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-03-30 15:17:31.535330224 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p4"; -+ return "4.0.2-p5"; - } -diff -Naurd mpfr-4.0.2-a/tests/tdiv.c mpfr-4.0.2-b/tests/tdiv.c ---- mpfr-4.0.2-a/tests/tdiv.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tdiv.c 2020-03-30 15:17:31.523330366 +0000 -@@ -23,7 +23,7 @@ - #include "mpfr-test.h" - - static void --check_equal (mpfr_srcptr a, mpfr_srcptr a2, char *s, -+check_equal (mpfr_srcptr a, mpfr_srcptr a2, const char *s, - mpfr_srcptr b, mpfr_srcptr c, mpfr_rnd_t r) - { - if (SAME_VAL (a, a2)) -diff -Naurd mpfr-4.0.2-a/tests/tfpif.c mpfr-4.0.2-b/tests/tfpif.c ---- mpfr-4.0.2-a/tests/tfpif.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tfpif.c 2020-03-30 15:17:31.523330366 +0000 -@@ -30,8 +30,8 @@ - static void - doit (int argc, char *argv[], mpfr_prec_t p1, mpfr_prec_t p2) - { -- char *filenameCompressed = FILE_NAME_RW; -- char *data = FILE_NAME_R; -+ const char *filenameCompressed = FILE_NAME_RW; -+ const char *data = FILE_NAME_R; - int status; - FILE *fh; - mpfr_t x[9]; -@@ -198,7 +198,7 @@ - static void - check_bad (void) - { -- char *filenameCompressed = FILE_NAME_RW; -+ const char *filenameCompressed = FILE_NAME_RW; - int status; - FILE *fh; - mpfr_t x; -@@ -340,7 +340,7 @@ - static void - extra (void) - { -- char *data = FILE_NAME_R2; -+ const char *data = FILE_NAME_R2; - mpfr_t x; - FILE *fp; - int ret; -diff -Naurd mpfr-4.0.2-a/tests/tmul_2exp.c mpfr-4.0.2-b/tests/tmul_2exp.c ---- mpfr-4.0.2-a/tests/tmul_2exp.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tmul_2exp.c 2020-03-30 15:17:31.523330366 +0000 -@@ -258,7 +258,7 @@ - mpfr_exp_t old_emax; - mpfr_t x, y1, y2; - int neg, r, op; -- static char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; -+ static const char *sop[4] = { "mul_2ui", "mul_2si", "div_2ui", "div_2si" }; - - old_emax = mpfr_get_emax (); - set_emax (emax); -diff -Naurd mpfr-4.0.2-a/tests/trandom.c mpfr-4.0.2-b/tests/trandom.c ---- mpfr-4.0.2-a/tests/trandom.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/trandom.c 2020-03-30 15:17:31.523330366 +0000 -@@ -185,7 +185,7 @@ - { - gmp_randstate_t s; - mpfr_t x; -- char *str = "0.1010111100000000000000000000000000000000E-32"; -+ const char *str = "0.1010111100000000000000000000000000000000E-32"; - int k; - - gmp_randinit_default (s); -diff -Naurd mpfr-4.0.2-a/tests/trint.c mpfr-4.0.2-b/tests/trint.c ---- mpfr-4.0.2-a/tests/trint.c 2019-01-25 02:00:06.000000000 +0000 -+++ mpfr-4.0.2-b/tests/trint.c 2020-03-30 15:17:31.523330366 +0000 -@@ -308,7 +308,7 @@ - #if __MPFR_STDC (199901L) - - static void --test_fct (double (*f)(double), int (*g)(), char *s, mpfr_rnd_t r) -+test_fct (double (*f)(double), int (*g)(), const char *s, mpfr_rnd_t r) - { - double d, y; - mpfr_t dd, yy; -diff -Naurd mpfr-4.0.2-a/tests/tsum.c mpfr-4.0.2-b/tests/tsum.c ---- mpfr-4.0.2-a/tests/tsum.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tsum.c 2020-03-30 15:17:31.523330366 +0000 -@@ -285,7 +285,7 @@ - static void - check_more_special (void) - { -- char *str[NC] = { "NaN", "+Inf", "-Inf", "+0", "-0", "+1", "-1" }; -+ const char *str[NC] = { "NaN", "+Inf", "-Inf", "+0", "-0", "+1", "-1" }; - int i, r, k[NS]; - mpfr_t c[NC], s[NS], sum; - mpfr_ptr p[NS]; -@@ -724,7 +724,7 @@ - { - mpfr_t sum, t[4]; - mpfr_ptr p[4]; -- char *s[4] = { -+ const char *s[4] = { - "0x1p1000", - "-0x0.fffffffffffff80000000000000001p1000", - "-0x1p947", -@@ -771,7 +771,11 @@ - { - mpfr_t sum1, sum2, t[3]; - mpfr_ptr p[3]; -- char *s[3] = { "0.10000111110101000010101011100001", "1E-100", "0.1E95" }; -+ const char *s[3] = { -+ "0.10000111110101000010101011100001", -+ "1E-100", -+ "0.1E95" -+ }; - int i, r; - - mpfr_inits2 (58, sum1, sum2, (mpfr_ptr) 0); -@@ -1268,7 +1272,7 @@ - { - mpfr_t r, t[4]; - mpfr_ptr p[4]; -- char *s[4] = { "0.10E20", "0", "0.11E382", "0.10E826" }; -+ const char *s[4] = { "0.10E20", "0", "0.11E382", "0.10E826" }; - int i; - - mpfr_init2 (r, 2); -diff -Naurd mpfr-4.0.2-a/tests/turandom.c mpfr-4.0.2-b/tests/turandom.c ---- mpfr-4.0.2-a/tests/turandom.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/turandom.c 2020-03-30 15:17:31.523330366 +0000 -@@ -526,7 +526,7 @@ - #define N 6 - /* Run this program with the MPFR_REPROD_ABI_OUTPUT environment variable - set to get the array of strings. */ -- char *t[5 * N] = { -+ const char *t[5 * N] = { - "1.0@-1", - "3.0@-1", - "7.0@-1", diff --git a/mpfr-fpif-dead-code.patch b/mpfr-fpif-dead-code.patch deleted file mode 100644 index 398e78b..0000000 --- a/mpfr-fpif-dead-code.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-06-02 12:39:10.963722927 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-06-02 12:39:10.999722675 +0000 -@@ -0,0 +1 @@ -+fpif-dead-code -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-06-02 11:26:59.175114040 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-06-02 12:39:10.999722675 +0000 -@@ -1 +1 @@ --4.0.2-p8 -+4.0.2-p9 -diff -Naurd mpfr-4.0.2-a/src/fpif.c mpfr-4.0.2-b/src/fpif.c ---- mpfr-4.0.2-a/src/fpif.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/fpif.c 2020-06-02 12:39:10.987722759 +0000 -@@ -90,11 +90,7 @@ - { \ - (buffer) = (unsigned char *) mpfr_reallocate_func \ - ((buffer), *(buffer_size), (wanted_size)); \ -- if ((buffer) == NULL) \ -- { \ -- *(buffer_size) = 0; \ -- return NULL; \ -- } \ -+ MPFR_ASSERTN((buffer) != 0); \ - } \ - *(buffer_size) = (wanted_size); \ - } \ -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-06-02 11:26:59.175114040 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-06-02 12:39:10.995722702 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p8" -+#define MPFR_VERSION_STRING "4.0.2-p9" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-06-02 11:26:59.175114040 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-06-02 12:39:10.999722675 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p8"; -+ return "4.0.2-p9"; - } diff --git a/mpfr-include-float.patch b/mpfr-include-float.patch deleted file mode 100644 index ea51e29..0000000 --- a/mpfr-include-float.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2019-06-02 17:05:36.121226916 +0000 -+++ mpfr-4.0.2-b/PATCHES 2019-06-02 17:05:36.157226621 +0000 -@@ -0,0 +1 @@ -+include-float -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2019-01-31 20:29:48.000000000 +0000 -+++ mpfr-4.0.2-b/VERSION 2019-06-02 17:05:36.157226621 +0000 -@@ -1 +1 @@ --4.0.2 -+4.0.2-p1 -diff -Naurd mpfr-4.0.2-a/src/mpfr-impl.h mpfr-4.0.2-b/src/mpfr-impl.h ---- mpfr-4.0.2-a/src/mpfr-impl.h 2019-01-27 18:30:16.000000000 +0000 -+++ mpfr-4.0.2-b/src/mpfr-impl.h 2019-06-02 17:05:36.145226719 +0000 -@@ -57,6 +57,7 @@ - - #include - #include -+#include /* for FLT_RADIX, etc., tested below */ - - - /****************************************************** -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2019-01-31 20:29:48.000000000 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2019-06-02 17:05:36.153226653 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2" -+#define MPFR_VERSION_STRING "4.0.2-p1" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2019-01-31 20:29:48.000000000 +0000 -+++ mpfr-4.0.2-b/src/version.c 2019-06-02 17:05:36.153226653 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2"; -+ return "4.0.2-p1"; - } diff --git a/mpfr-int-overflow.patch b/mpfr-int-overflow.patch deleted file mode 100644 index de5ff06..0000000 --- a/mpfr-int-overflow.patch +++ /dev/null @@ -1,97 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-03-30 13:02:08.103248669 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-03-30 13:02:08.143248189 +0000 -@@ -0,0 +1 @@ -+int-overflow -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2019-06-02 17:05:36.157226621 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-03-30 13:02:08.143248189 +0000 -@@ -1 +1 @@ --4.0.2-p1 -+4.0.2-p2 -diff -Naurd mpfr-4.0.2-a/src/agm.c mpfr-4.0.2-b/src/agm.c ---- mpfr-4.0.2-a/src/agm.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/agm.c 2020-03-30 13:02:08.131248333 +0000 -@@ -220,7 +220,7 @@ - mpfr_add (vf, u, v, MPFR_RNDN); /* No overflow? */ - mpfr_div_2ui (vf, vf, 1, MPFR_RNDN); - /* See proof in algorithms.tex */ -- if (4*eq > p) -+ if (eq > p / 4) - { - mpfr_t w; - MPFR_BLOCK_DECL (flags3); -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2019-06-02 17:05:36.153226653 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 13:02:08.143248189 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p1" -+#define MPFR_VERSION_STRING "4.0.2-p2" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/pow.c mpfr-4.0.2-b/src/pow.c ---- mpfr-4.0.2-a/src/pow.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/pow.c 2020-03-30 13:02:08.131248333 +0000 -@@ -34,8 +34,7 @@ - mpfr_rnd_t rnd_mode, int *inexact) - { - mpz_t a, c; -- mpfr_exp_t d, b; -- unsigned long i; -+ mpfr_exp_t d, b, i; - int res; - - MPFR_ASSERTD (!MPFR_IS_SINGULAR (y)); -@@ -48,7 +47,9 @@ - if (MPFR_IS_NEG (y)) - return 0; /* x is not a power of two => x^-y is not exact */ - -- /* compute d such that y = c*2^d with c odd integer */ -+ /* Compute d such that y = c*2^d with c odd integer. -+ Since c comes from a regular MPFR number, due to the constraints on the -+ exponent and the precision, there can be no integer overflow below. */ - mpz_init (c); - d = mpfr_get_z_2exp (c, y); - i = mpz_scan1 (c, 0); -@@ -58,7 +59,9 @@ - /* Since y is not an integer, d is necessarily < 0 */ - MPFR_ASSERTD (d < 0); - -- /* Compute a,b such that x=a*2^b */ -+ /* Compute a,b such that x=a*2^b. -+ Since a comes from a regular MPFR number, due to the constrainst on the -+ exponent and the precision, there can be no integer overflow below. */ - mpz_init (a); - b = mpfr_get_z_2exp (a, x); - i = mpz_scan1 (a, 0); -diff -Naurd mpfr-4.0.2-a/src/rem1.c mpfr-4.0.2-b/src/rem1.c ---- mpfr-4.0.2-a/src/rem1.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/rem1.c 2020-03-30 13:02:08.131248333 +0000 -@@ -100,9 +100,11 @@ - mpz_abs (my, my); - q_is_odd = 0; - -- /* divide my by 2^k if possible to make operations mod my easier */ -+ /* Divide my by 2^k if possible to make operations mod my easier. -+ Since my comes from a regular MPFR number, due to the constraints on the -+ exponent and the precision, there can be no integer overflow below. */ - { -- unsigned long k = mpz_scan1 (my, 0); -+ mpfr_exp_t k = mpz_scan1 (my, 0); - ey += k; - mpz_fdiv_q_2exp (my, my, k); - } -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2019-06-02 17:05:36.153226653 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-03-30 13:02:08.143248189 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p1"; -+ return "4.0.2-p2"; - } diff --git a/mpfr-set-int.patch b/mpfr-set-int.patch deleted file mode 100644 index 7194b31..0000000 --- a/mpfr-set-int.patch +++ /dev/null @@ -1,441 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-03-30 13:05:16.224990169 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-03-30 13:05:16.264989689 +0000 -@@ -0,0 +1 @@ -+set-int -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-03-30 13:02:08.143248189 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-03-30 13:05:16.264989689 +0000 -@@ -1 +1 @@ --4.0.2-p2 -+4.0.2-p3 -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 13:02:08.143248189 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 13:05:16.260989737 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p2" -+#define MPFR_VERSION_STRING "4.0.2-p3" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/set_si_2exp.c mpfr-4.0.2-b/src/set_si_2exp.c ---- mpfr-4.0.2-a/src/set_si_2exp.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/set_si_2exp.c 2020-03-30 13:05:16.248989881 +0000 -@@ -40,6 +40,15 @@ - mp_limb_t ai, *xp; - int inex = 0; - -+ /* Early underflow/overflow checking is necessary to avoid -+ integer overflow or errors due to special exponent values. */ -+ if (MPFR_UNLIKELY (e < __gmpfr_emin - (mpfr_exp_t) -+ (sizeof (unsigned long) * CHAR_BIT + 1))) -+ return mpfr_underflow (x, rnd_mode == MPFR_RNDN ? -+ MPFR_RNDZ : rnd_mode, i < 0 ? -1 : 1); -+ if (MPFR_UNLIKELY (e >= __gmpfr_emax)) -+ return mpfr_overflow (x, rnd_mode, i < 0 ? -1 : 1); -+ - /* FIXME: support int limbs (e.g. 16-bit limbs on 16-bit proc) */ - ai = SAFE_ABS (unsigned long, i); - MPFR_ASSERTN (SAFE_ABS (unsigned long, i) == ai); -diff -Naurd mpfr-4.0.2-a/src/set_ui_2exp.c mpfr-4.0.2-b/src/set_ui_2exp.c ---- mpfr-4.0.2-a/src/set_ui_2exp.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/set_ui_2exp.c 2020-03-30 13:05:16.248989881 +0000 -@@ -41,6 +41,15 @@ - mp_limb_t *xp; - int inex = 0; - -+ /* Early underflow/overflow checking is necessary to avoid -+ integer overflow or errors due to special exponent values. */ -+ if (MPFR_UNLIKELY (e < __gmpfr_emin - (mpfr_exp_t) -+ (sizeof (unsigned long) * CHAR_BIT + 1))) -+ return mpfr_underflow (x, rnd_mode == MPFR_RNDN ? -+ MPFR_RNDZ : rnd_mode, i < 0 ? -1 : 1); -+ if (MPFR_UNLIKELY (e >= __gmpfr_emax)) -+ return mpfr_overflow (x, rnd_mode, i < 0 ? -1 : 1); -+ - /* FIXME: support int limbs (e.g. 16-bit limbs on 16-bit proc) */ - MPFR_ASSERTD (i == (mp_limb_t) i); - -diff -Naurd mpfr-4.0.2-a/src/set_uj.c mpfr-4.0.2-b/src/set_uj.c ---- mpfr-4.0.2-a/src/set_uj.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/set_uj.c 2020-03-30 13:05:16.248989881 +0000 -@@ -41,7 +41,7 @@ - int - mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd) - { -- int cnt; -+ int cnt, inex; - mp_size_t i, k; - mp_limb_t limb; - mp_limb_t yp[uintmaxpml]; -@@ -57,6 +57,10 @@ - MPFR_RET(0); - } - -+ /* early overflow detection to avoid a possible integer overflow below */ -+ if (MPFR_UNLIKELY(e >= __gmpfr_emax)) -+ return mpfr_overflow (x, rnd, MPFR_SIGN_POS); -+ - MPFR_ASSERTN (sizeof(uintmax_t) % sizeof(mp_limb_t) == 0); - - /* Create an auxiliary var */ -@@ -107,7 +111,9 @@ - e += k * GMP_NUMB_BITS - cnt; /* Update Expo */ - MPFR_ASSERTD (MPFR_LIMB_MSB(yp[numberof (yp) - 1]) != 0); - -- /* Check expo underflow / overflow (can't use mpfr_check_range) */ -+ MPFR_RNDRAW (inex, x, yp, uintmax_bit_size, rnd, MPFR_SIGN_POS, e++); -+ -+ /* Check expo underflow / overflow */ - if (MPFR_UNLIKELY(e < __gmpfr_emin)) - { - /* The following test is necessary because in the rounding to the -@@ -116,16 +122,18 @@ - * _ |x| < 2^(emin-2), or - * _ |x| = 2^(emin-2) and the absolute value of the exact - * result is <= 2^(emin-2). */ -- if (rnd == MPFR_RNDN && (e+1 < __gmpfr_emin || mpfr_powerof2_raw(y))) -+ if (rnd == MPFR_RNDN && -+ (e + 1 < __gmpfr_emin || -+ (mpfr_powerof2_raw (x) && inex >= 0))) - rnd = MPFR_RNDZ; - return mpfr_underflow (x, rnd, MPFR_SIGN_POS); - } - if (MPFR_UNLIKELY(e > __gmpfr_emax)) - return mpfr_overflow (x, rnd, MPFR_SIGN_POS); -- MPFR_SET_EXP (y, e); - -- /* Final: set x to y (rounding if necessary) */ -- return mpfr_set (x, y, rnd); -+ MPFR_SET_SIGN (x, MPFR_SIGN_POS); -+ MPFR_SET_EXP (x, e); -+ MPFR_RET (inex); - } - - #endif -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-03-30 13:02:08.143248189 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-03-30 13:05:16.264989689 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p2"; -+ return "4.0.2-p3"; - } -diff -Naurd mpfr-4.0.2-a/tests/tset_si.c mpfr-4.0.2-b/tests/tset_si.c ---- mpfr-4.0.2-a/tests/tset_si.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tset_si.c 2020-03-30 13:05:16.248989881 +0000 -@@ -90,6 +90,135 @@ - mpfr_clear (x); - } - -+#define REXP 1024 -+ -+static void -+test_2exp_extreme_aux (void) -+{ -+ mpfr_t x1, x2, y; -+ mpfr_exp_t e, ep[1 + 8 * 5], eb[] = -+ { MPFR_EMIN_MIN, -REXP, REXP, MPFR_EMAX_MAX, MPFR_EXP_MAX }; -+ mpfr_flags_t flags1, flags2; -+ int i, j, rnd, inex1, inex2; -+ char s; -+ -+ ep[0] = MPFR_EXP_MIN; -+ for (i = 0; i < numberof(eb); i++) -+ for (j = 0; j < 8; j++) -+ ep[1 + 8 * i + j] = eb[i] - j; -+ -+ mpfr_inits2 (3, x1, x2, (mpfr_ptr) 0); -+ mpfr_init2 (y, 32); -+ -+ for (i = 0; i < numberof(ep); i++) -+ for (j = -31; j <= 31; j++) -+ RND_LOOP_NO_RNDF (rnd) -+ { -+ int sign = j < 0 ? -1 : 1; -+ -+ /* Compute the expected value, inex and flags */ -+ inex1 = mpfr_set_si (y, j, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ inex1 = mpfr_set (x1, y, (mpfr_rnd_t) rnd); -+ /* x1 is the rounded value and inex1 the ternary value, -+ assuming that the exponent argument is 0 (this is the -+ rounded significand of the final result, assuming an -+ unbounded exponent range). The multiplication by a -+ power of 2 is exact, unless underflow/overflow occurs. -+ The tests on the exponent below avoid integer overflows -+ (ep[i] may take extreme values). */ -+ e = mpfr_get_exp (x1); -+ mpfr_clear_flags (); -+ if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ -+ { -+ mpfr_rnd_t r = -+ (rnd == MPFR_RNDN && -+ (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || -+ IS_POW2 (sign * j))) ? -+ MPFR_RNDZ : (mpfr_rnd_t) rnd; -+ inex1 = mpfr_underflow (x1, r, sign); -+ flags1 = __gmpfr_flags; -+ } -+ else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ -+ { -+ inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); -+ flags1 = __gmpfr_flags; -+ } -+ else -+ { -+ if (j != 0) -+ mpfr_set_exp (x1, ep[i] + e); -+ flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; -+ } -+ -+ /* Test mpfr_set_si_2exp */ -+ mpfr_clear_flags (); -+ inex2 = mpfr_set_si_2exp (x2, j, ep[i], (mpfr_rnd_t) rnd); -+ flags2 = __gmpfr_flags; -+ -+ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -+ mpfr_equal_p (x1, x2))) -+ { -+ s = 's'; -+ goto err_extreme; -+ } -+ -+ if (j < 0) -+ continue; -+ -+ /* Test mpfr_set_ui_2exp */ -+ mpfr_clear_flags (); -+ inex2 = mpfr_set_ui_2exp (x2, j, ep[i], (mpfr_rnd_t) rnd); -+ flags2 = __gmpfr_flags; -+ -+ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -+ mpfr_equal_p (x1, x2))) -+ { -+ s = 'u'; -+ err_extreme: -+ printf ("Error in extreme mpfr_set_%ci_2exp for i=%d j=%d %s\n", -+ s, i, j, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -+ printf ("emin=%" MPFR_EXP_FSPEC "d " -+ "emax=%" MPFR_EXP_FSPEC "d\n", -+ (mpfr_eexp_t) __gmpfr_emin, -+ (mpfr_eexp_t) __gmpfr_emax); -+ printf ("ep[%d] = %" MPFR_EXP_FSPEC "d\n", -+ i, (mpfr_eexp_t) ep[i]); -+ printf ("Expected "); -+ mpfr_dump (x1); -+ printf ("with inex = %d and flags =", inex1); -+ flags_out (flags1); -+ printf ("Got "); -+ mpfr_dump (x2); -+ printf ("with inex = %d and flags =", inex2); -+ flags_out (flags2); -+ exit (1); -+ } -+ } -+ -+ mpfr_clears (x1, x2, y, (mpfr_ptr) 0); -+} -+ -+static void -+test_2exp_extreme (void) -+{ -+ mpfr_exp_t emin, emax; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ test_2exp_extreme_aux (); -+ -+ set_emin (-REXP); -+ set_emax (REXP); -+ test_2exp_extreme_aux (); -+ -+ set_emin (emin); -+ set_emax (emax); -+} -+ - static void - test_macros (void) - { -@@ -639,6 +768,7 @@ - mpfr_clear (x); - - test_2exp (); -+ test_2exp_extreme (); - test_macros (); - test_macros_keyword (); - test_get_ui_smallneg (); -diff -Naurd mpfr-4.0.2-a/tests/tset_sj.c mpfr-4.0.2-b/tests/tset_sj.c ---- mpfr-4.0.2-a/tests/tset_sj.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tset_sj.c 2020-03-30 13:05:16.248989881 +0000 -@@ -176,6 +176,154 @@ - mpfr_clear (x); - } - -+#define REXP 1024 -+ -+static void -+test_2exp_extreme_aux (void) -+{ -+ mpfr_t x1, x2, y; -+ mpfr_exp_t e, ep[1 + 8 * 5], eb[] = -+ { MPFR_EMIN_MIN, -REXP, REXP, MPFR_EMAX_MAX, MPFR_EXP_MAX }; -+ mpfr_flags_t flags1, flags2; -+ int i, j, rnd, inex1, inex2; -+ char s; -+ -+ ep[0] = MPFR_EXP_MIN; -+ for (i = 0; i < numberof(eb); i++) -+ for (j = 0; j < 8; j++) -+ ep[1 + 8 * i + j] = eb[i] - j; -+ -+ mpfr_inits2 (3, x1, x2, (mpfr_ptr) 0); -+ mpfr_init2 (y, 32); -+ -+ /* The cast to int is needed if numberof(ep) is of unsigned type, in -+ which case the condition without the cast would be always false. */ -+ for (i = -2; i < (int) numberof(ep); i++) -+ for (j = -31; j <= 31; j++) -+ RND_LOOP_NO_RNDF (rnd) -+ { -+ int sign = j < 0 ? -1 : 1; -+ intmax_t em; -+ -+ if (i < 0) -+ { -+ em = i == -2 ? INTMAX_MIN : INTMAX_MAX; -+ mpfr_clear_flags (); -+ inex1 = j == 0 ? -+ (mpfr_set_zero (x1, +1), 0) : i == -2 ? -+ mpfr_underflow (x1, rnd == MPFR_RNDN ? -+ MPFR_RNDZ : (mpfr_rnd_t) rnd, sign) : -+ mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); -+ flags1 = __gmpfr_flags; -+ } -+ else -+ { -+ em = ep[i]; -+ /* Compute the expected value, inex and flags */ -+ inex1 = mpfr_set_si (y, j, MPFR_RNDN); -+ MPFR_ASSERTN (inex1 == 0); -+ inex1 = mpfr_set (x1, y, (mpfr_rnd_t) rnd); -+ /* x1 is the rounded value and inex1 the ternary value, -+ assuming that the exponent argument is 0 (this is the -+ rounded significand of the final result, assuming an -+ unbounded exponent range). The multiplication by a -+ power of 2 is exact, unless underflow/overflow occurs. -+ The tests on the exponent below avoid integer overflows -+ (ep[i] may take extreme values). */ -+ e = mpfr_get_exp (x1); -+ mpfr_clear_flags (); -+ if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ -+ { -+ mpfr_rnd_t r = -+ (rnd == MPFR_RNDN && -+ (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || -+ IS_POW2 (sign * j))) ? -+ MPFR_RNDZ : (mpfr_rnd_t) rnd; -+ inex1 = mpfr_underflow (x1, r, sign); -+ flags1 = __gmpfr_flags; -+ } -+ else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ -+ { -+ inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); -+ flags1 = __gmpfr_flags; -+ } -+ else -+ { -+ if (j != 0) -+ mpfr_set_exp (x1, ep[i] + e); -+ flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; -+ } -+ } -+ -+ /* Test mpfr_set_sj_2exp */ -+ mpfr_clear_flags (); -+ inex2 = mpfr_set_sj_2exp (x2, j, em, (mpfr_rnd_t) rnd); -+ flags2 = __gmpfr_flags; -+ -+ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -+ mpfr_equal_p (x1, x2))) -+ { -+ s = 's'; -+ goto err_extreme; -+ } -+ -+ if (j < 0) -+ continue; -+ -+ /* Test mpfr_set_uj_2exp */ -+ mpfr_clear_flags (); -+ inex2 = mpfr_set_uj_2exp (x2, j, em, (mpfr_rnd_t) rnd); -+ flags2 = __gmpfr_flags; -+ -+ if (! (flags1 == flags2 && SAME_SIGN (inex1, inex2) && -+ mpfr_equal_p (x1, x2))) -+ { -+ s = 'u'; -+ err_extreme: -+ printf ("Error in extreme mpfr_set_%cj_2exp for i=%d j=%d %s\n", -+ s, i, j, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -+ printf ("emin=%" MPFR_EXP_FSPEC "d " -+ "emax=%" MPFR_EXP_FSPEC "d\n", -+ (mpfr_eexp_t) __gmpfr_emin, -+ (mpfr_eexp_t) __gmpfr_emax); -+#ifdef MPFR_PRINTF_MAXLM -+ printf ("e = %" MPFR_PRINTF_MAXLM "d\n", em); -+#endif -+ printf ("Expected "); -+ mpfr_dump (x1); -+ printf ("with inex = %d and flags =", inex1); -+ flags_out (flags1); -+ printf ("Got "); -+ mpfr_dump (x2); -+ printf ("with inex = %d and flags =", inex2); -+ flags_out (flags2); -+ exit (1); -+ } -+ } -+ -+ mpfr_clears (x1, x2, y, (mpfr_ptr) 0); -+} -+ -+static void -+test_2exp_extreme (void) -+{ -+ mpfr_exp_t emin, emax; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ test_2exp_extreme_aux (); -+ -+ set_emin (-REXP); -+ set_emax (REXP); -+ test_2exp_extreme_aux (); -+ -+ set_emin (emin); -+ set_emax (emax); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -185,6 +333,7 @@ - check_set_uj_2exp (); - check_set_sj (); - check_set_sj_2exp (); -+ test_2exp_extreme (); - - tests_end_mpfr (); - return 0; diff --git a/mpfr-sub1-ubf.patch b/mpfr-sub1-ubf.patch deleted file mode 100644 index b4d31f4..0000000 --- a/mpfr-sub1-ubf.patch +++ /dev/null @@ -1,722 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-03-30 13:09:17.466071979 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-03-30 13:09:17.502071540 +0000 -@@ -0,0 +1 @@ -+sub1-ubf -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-03-30 13:05:16.264989689 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-03-30 13:09:17.502071540 +0000 -@@ -1 +1 @@ --4.0.2-p3 -+4.0.2-p4 -diff -Naurd mpfr-4.0.2-a/src/add1.c mpfr-4.0.2-b/src/add1.c ---- mpfr-4.0.2-a/src/add1.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/add1.c 2020-03-30 13:09:17.490071686 +0000 -@@ -41,7 +41,7 @@ - - if (MPFR_UNLIKELY (MPFR_IS_UBF (b))) - { -- exp = mpfr_ubf_zexp2exp (MPFR_ZEXP (b)); -+ exp = MPFR_UBF_GET_EXP (b); - if (exp > __gmpfr_emax) - return mpfr_overflow (a, rnd_mode, MPFR_SIGN (b));; - } -diff -Naurd mpfr-4.0.2-a/src/mpfr-impl.h mpfr-4.0.2-b/src/mpfr-impl.h ---- mpfr-4.0.2-a/src/mpfr-impl.h 2019-06-02 17:05:36.145226719 +0000 -+++ mpfr-4.0.2-b/src/mpfr-impl.h 2020-03-30 13:09:17.490071686 +0000 -@@ -2406,11 +2406,28 @@ - } - #endif - --#define MPFR_ZEXP(x) \ -- ((void) (x)->_mpfr_exp /* to check that x has a correct type */, \ -+/* Get the _mpfr_zexp field (pointer to a mpz_t) of a UBF object. -+ For practical reasons, the type of the argument x can be either -+ mpfr_ubf_ptr or mpfr_ptr, since the latter is used in functions -+ that accept both MPFR numbers and UBF's; this is checked by the -+ code "(x)->_mpfr_exp" (the "sizeof" prevents an access, which -+ could be invalid when MPFR_ZEXP(x) is used for an assignment, -+ and also avoids breaking the aliasing rules if they are dealt -+ with in the future). -+ This macro can be used when building a UBF. So we do not check -+ that the _mpfr_exp field has the value MPFR_EXP_UBF. */ -+#define MPFR_ZEXP(x) \ -+ ((void) sizeof ((x)->_mpfr_exp), \ - ((mpfr_ubf_ptr) (x))->_mpfr_zexp) - -+/* If x is a UBF, clear its mpz_t exponent. */ - #define MPFR_UBF_CLEAR_EXP(x) \ - ((void) (MPFR_IS_UBF (x) && (mpz_clear (MPFR_ZEXP (x)), 0))) - -+/* Like MPFR_GET_EXP, but accepts UBF (with exponent saturated to -+ the interval [MPFR_EXP_MIN,MPFR_EXP_MAX]). */ -+#define MPFR_UBF_GET_EXP(x) \ -+ (MPFR_IS_UBF (x) ? mpfr_ubf_zexp2exp (MPFR_ZEXP (x)) : \ -+ MPFR_GET_EXP ((mpfr_ptr) (x))) -+ - #endif /* __MPFR_IMPL_H__ */ -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 13:05:16.260989737 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-03-30 13:09:17.498071589 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p3" -+#define MPFR_VERSION_STRING "4.0.2-p4" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/sub1.c mpfr-4.0.2-b/src/sub1.c ---- mpfr-4.0.2-a/src/sub1.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/src/sub1.c 2020-03-30 13:09:17.490071686 +0000 -@@ -91,9 +91,20 @@ - - if (MPFR_UNLIKELY (MPFR_IS_UBF (b) || MPFR_IS_UBF (c))) - { -- exp_b = MPFR_IS_UBF (b) ? -- mpfr_ubf_zexp2exp (MPFR_ZEXP (b)) : MPFR_GET_EXP (b); -+ exp_b = MPFR_UBF_GET_EXP (b); -+ /* Early underflow detection. Rare, but a test is needed anyway -+ since in the "MAX (aq, bq) + 2 <= diff_exp" branch, the exponent -+ may decrease and MPFR_EXP_MIN would yield an integer overflow. */ -+ if (MPFR_UNLIKELY (exp_b < __gmpfr_emin - 1)) -+ { -+ if (rnd_mode == MPFR_RNDN) -+ rnd_mode = MPFR_RNDZ; -+ return mpfr_underflow (a, rnd_mode, MPFR_SIGN(a)); -+ } - diff_exp = mpfr_ubf_diff_exp (b, c); -+ /* mpfr_set4 below used with MPFR_RNDF does not support UBF. */ -+ if (rnd_mode == MPFR_RNDF) -+ rnd_mode = MPFR_RNDN; - } - else - { -@@ -123,11 +134,11 @@ - if (rnd_mode == MPFR_RNDF) - return mpfr_set4 (a, b, MPFR_RNDZ, MPFR_SIGN (a)); - -- MPFR_EXP (a) = exp_b; /* may be up to MPFR_EXP_MAX */ -+ exp_a = exp_b; /* may be any out-of-range value due to UBF */ - MPFR_RNDRAW_EVEN (inexact, a, MPFR_MANT (b), bq, - rnd_mode, MPFR_SIGN (a), -- if (MPFR_EXP (a) != MPFR_EXP_MAX) -- ++ MPFR_EXP (a)); -+ if (exp_a != MPFR_EXP_MAX) -+ exp_a ++); - MPFR_LOG_MSG (("inexact=%d\n", inexact)); - if (inexact == 0) - { -@@ -139,7 +150,7 @@ - if (! MPFR_IS_LIKE_RNDZ (rnd_mode, MPFR_IS_NEG (a))) - { - inexact = MPFR_INT_SIGN (a); -- goto check_overflow; -+ goto end_of_c_small; - } - } - else /* inexact != 0 */ -@@ -164,7 +175,7 @@ - which means we get a wrong rounded result if x == 1, - i.e. inexact == MPFR_EVEN_INEX (for positive numbers). */ - if (MPFR_LIKELY (inexact != MPFR_EVEN_INEX * MPFR_INT_SIGN (a))) -- goto check_overflow; -+ goto end_of_c_small; - } - /* We need to take the value preceding |a|. We can't use - mpfr_nexttozero due to a possible out-of-range exponent. -@@ -174,16 +185,26 @@ - mpn_sub_1 (ap, ap, an, MPFR_LIMB_ONE << sh); - if (MPFR_UNLIKELY (MPFR_LIMB_MSB (ap[an-1]) == 0)) - { -- MPFR_EXP (a) --; -+ exp_a --; - /* The following is valid whether an = 1 or an > 1. */ - ap[an-1] |= MPFR_LIMB_HIGHBIT; - } - inexact = - MPFR_INT_SIGN (a); -- check_overflow: -- if (MPFR_UNLIKELY (MPFR_EXP (a) > __gmpfr_emax)) -+ end_of_c_small: -+ /* The underflow case is possible only with UBF. The overflow case -+ is also possible with normal FP due to rounding. */ -+ if (MPFR_UNLIKELY (exp_a > __gmpfr_emax)) - return mpfr_overflow (a, rnd_mode, MPFR_SIGN (a)); -- else -- MPFR_RET (inexact); -+ if (MPFR_UNLIKELY (exp_a < __gmpfr_emin)) -+ { -+ if (rnd_mode == MPFR_RNDN && -+ (exp_a < __gmpfr_emin - 1 || -+ (inexact * MPFR_INT_SIGN (a) >= 0 && mpfr_powerof2_raw (a)))) -+ rnd_mode = MPFR_RNDZ; -+ return mpfr_underflow (a, rnd_mode, MPFR_SIGN(a)); -+ } -+ MPFR_SET_EXP (a, exp_a); -+ MPFR_RET (inexact); - } - - /* reserve a space to store b aligned with the result, i.e. shifted by -@@ -656,6 +677,15 @@ - if (MPFR_LIKELY(cancel)) - { - cancel -= add_exp; /* OK: add_exp is an int equal to 0 or 1 */ -+ MPFR_ASSERTD (cancel >= 0); -+ /* Detect an underflow case to avoid a possible integer overflow -+ with UBF in the computation of exp_a. */ -+ if (MPFR_UNLIKELY (exp_b < __gmpfr_emin - 1)) -+ { -+ if (rnd_mode == MPFR_RNDN) -+ rnd_mode = MPFR_RNDZ; -+ return mpfr_underflow (a, rnd_mode, MPFR_SIGN(a)); -+ } - exp_a = exp_b - cancel; - /* The following assertion corresponds to a limitation of the MPFR - implementation. It may fail with a 32-bit ABI and huge precisions, -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-03-30 13:05:16.264989689 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-03-30 13:09:17.502071540 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p3"; -+ return "4.0.2-p4"; - } -diff -Naurd mpfr-4.0.2-a/tests/tfma.c mpfr-4.0.2-b/tests/tfma.c ---- mpfr-4.0.2-a/tests/tfma.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tfma.c 2020-03-30 13:09:17.490071686 +0000 -@@ -47,7 +47,7 @@ - mpfr_add (r1, r1, c, (mpfr_rnd_t) rnd)) - { - if (rnd == MPFR_RNDF) -- break; -+ continue; - printf ("test_exact internal error for (%d,%d,%d,%d,%s)\n", - i, j, k, rnd, mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); - exit (1); -@@ -664,7 +664,7 @@ - Note: The purpose of the s * 2^(emin-7) term is to yield - double rounding when scaling for k = 4, s != 0, MPFR_RNDN. */ - -- RND_LOOP (rnd) -+ RND_LOOP_NO_RNDF (rnd) - { - mpfr_clear_flags (); - inex1 = mpfr_set_si_2exp (t1, sign * (8*k+s-64), e-6, -diff -Naurd mpfr-4.0.2-a/tests/tfmma.c mpfr-4.0.2-b/tests/tfmma.c ---- mpfr-4.0.2-a/tests/tfmma.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tfmma.c 2020-03-30 13:09:17.490071686 +0000 -@@ -480,6 +480,123 @@ - mpfr_clears (x, y, z, (mpfr_ptr) 0); - } - -+static void -+underflow_tests (void) -+{ -+ mpfr_t x, y, z; -+ mpfr_prec_t p; -+ mpfr_exp_t emin; -+ -+ emin = mpfr_get_emin (); -+ mpfr_set_emin (-17); -+ for (p = MPFR_PREC_MIN; p <= 1024; p++) -+ { -+ mpfr_inits2 (p, x, y, (mpfr_ptr) 0); -+ mpfr_init2 (z, p + 1); -+ mpfr_set_str_binary (x, "1e-10"); -+ mpfr_set_str_binary (y, "1e-11"); -+ mpfr_clear_underflow (); -+ mpfr_fmms (z, x, x, y, y, MPFR_RNDN); -+ /* the exact result is 2^-20-2^-22, and should underflow */ -+ MPFR_ASSERTN(mpfr_underflow_p ()); -+ MPFR_ASSERTN(mpfr_zero_p (z)); -+ MPFR_ASSERTN(mpfr_signbit (z) == 0); -+ mpfr_clears (x, y, z, (mpfr_ptr) 0); -+ } -+ mpfr_set_emin (emin); -+} -+ -+static void -+bug20180604 (void) -+{ -+ mpfr_t x, y, yneg, z; -+ mpfr_exp_t emin; -+ int ret; -+ -+ emin = mpfr_get_emin (); -+ mpfr_set_emin (-1073741821); -+ mpfr_inits2 (564, x, y, yneg, (mpfr_ptr) 0); -+ mpfr_init2 (z, 2256); -+ mpfr_set_str_binary (x, "1.10010000111100110011001101111111101000111001011000110100110010000101000100010001000000111100010000101001011011111001111000110101111100101111001100001100011101100100011110000000011000010110111100111000100101010001011111010111011001110010001011101111001011001110110000010000011100010001010001011100100110111110101001001111001011101111110011101110101010110100010010111011111100010101111100011110111001011111101110101101101110100101111010000101011110100000000110111101000001100001000100010110100111010011011010110011100111010000101110010101111001011100110101100001100E-737194993"); -+ mpfr_set_str_binary (y, "-1.00101000100001001101011110100010110011101010011011010111100110101011111100000100101000111010111101100100110010001110011011100100110110000001011001000111101111101111110101100110111000000011000001101001010100010010001110001000011010000100111001001100101111111100010101110101001101101101111010100011011110001000010000010100011000011000010110101100000111111110111001100100100001101011111011100101110111000100101010110100010011101010110010100110100111000000100111101101101000000011110000100110100100011000010011110010001010000110100011111101101101110001110001101101010E-737194903"); -+ -+ mpfr_clear_underflow (); -+ ret = mpfr_fmms (z, x, x, y, y, MPFR_RNDN); -+ MPFR_ASSERTN(mpfr_underflow_p ()); -+ MPFR_ASSERTN(mpfr_zero_p (z)); -+ MPFR_ASSERTN(mpfr_signbit (z) == 1); -+ MPFR_ASSERTN(ret > 0); -+ -+ mpfr_clear_underflow (); -+ ret = mpfr_fmms (z, y, y, x, x, MPFR_RNDN); -+ MPFR_ASSERTN(mpfr_underflow_p ()); -+ MPFR_ASSERTN(mpfr_zero_p (z)); -+ MPFR_ASSERTN(mpfr_signbit (z) == 0); -+ MPFR_ASSERTN(ret < 0); -+ -+ mpfr_neg (yneg, y, MPFR_RNDN); -+ mpfr_clear_underflow (); -+ ret = mpfr_fmms (z, x, x, y, yneg, MPFR_RNDN); -+ MPFR_ASSERTN(mpfr_underflow_p ()); -+ MPFR_ASSERTN(mpfr_zero_p (z)); -+ MPFR_ASSERTN(mpfr_signbit (z) == 0); -+ MPFR_ASSERTN(ret < 0); -+ -+ mpfr_clear_underflow (); -+ ret = mpfr_fmms (z, y, yneg, x, x, MPFR_RNDN); -+ MPFR_ASSERTN(mpfr_underflow_p ()); -+ MPFR_ASSERTN(mpfr_zero_p (z)); -+ MPFR_ASSERTN(mpfr_signbit (z) == 1); -+ MPFR_ASSERTN(ret > 0); -+ -+ mpfr_clears (x, y, yneg, z, (mpfr_ptr) 0); -+ mpfr_set_emin (emin); -+} -+ -+/* this bug was discovered from mpc_mul */ -+static void -+bug20200206 (void) -+{ -+ mpfr_exp_t emin = mpfr_get_emin (); -+ mpfr_t xre, xim, yre, yim, zre; -+ -+ mpfr_set_emin (-1073); -+ mpfr_inits2 (53, xre, xim, yre, yim, zre, (mpfr_ptr) 0); -+ mpfr_set_str (xre, "-0x8.294611b331c8p-904", 16, MPFR_RNDN); -+ mpfr_set_str (xim, "-0x1.859278c2992fap-676", 16, MPFR_RNDN); -+ mpfr_set_str (yre, "0x9.ac54802a95f8p-820", 16, MPFR_RNDN); -+ mpfr_set_str (yim, "0x3.17e59e7612aap-412", 16, MPFR_RNDN); -+ mpfr_fmms (zre, xre, yre, xim, yim, MPFR_RNDN); -+ if (mpfr_regular_p (zre) && mpfr_get_exp (zre) < -1073) -+ { -+ printf ("Error, mpfr_fmms returns an out-of-range exponent:\n"); -+ mpfr_dump (zre); -+ exit (1); -+ } -+ mpfr_clears (xre, xim, yre, yim, zre, (mpfr_ptr) 0); -+ mpfr_set_emin (emin); -+} -+ -+/* check for integer overflow (see bug fixed in r13798) */ -+static void -+extreme_underflow (void) -+{ -+ mpfr_t x, y, z; -+ mpfr_exp_t emin = mpfr_get_emin (); -+ -+ set_emin (MPFR_EMIN_MIN); -+ mpfr_inits2 (64, x, y, z, (mpfr_ptr) 0); -+ mpfr_set_ui_2exp (x, 1, MPFR_EMIN_MIN - 1, MPFR_RNDN); -+ mpfr_set (y, x, MPFR_RNDN); -+ mpfr_nextabove (x); -+ mpfr_clear_flags (); -+ mpfr_fmms (z, x, x, y, y, MPFR_RNDN); -+ MPFR_ASSERTN (__gmpfr_flags == (MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT)); -+ MPFR_ASSERTN (MPFR_IS_ZERO (z) && MPFR_IS_POS (z)); -+ mpfr_clears (x, y, z, (mpfr_ptr) 0); -+ set_emin (emin); -+} -+ - /* Test double-rounding cases in mpfr_set_1_2, which is called when - all the precisions are the same. With set.c before r13347, this - triggers errors for neg=0. */ -@@ -548,6 +665,9 @@ - { - tests_start_mpfr (); - -+ bug20200206 (); -+ bug20180604 (); -+ underflow_tests (); - random_tests (); - zero_tests (); - max_tests (); -@@ -555,6 +675,7 @@ - half_plus_half (); - bug20170405 (); - double_rounding (); -+ extreme_underflow (); - - tests_end_mpfr (); - return 0; -diff -Naurd mpfr-4.0.2-a/tests/tsub.c mpfr-4.0.2-b/tests/tsub.c ---- mpfr-4.0.2-a/tests/tsub.c 2019-01-07 13:53:20.000000000 +0000 -+++ mpfr-4.0.2-b/tests/tsub.c 2020-03-30 13:09:17.490071686 +0000 -@@ -1159,6 +1159,358 @@ - } - } - -+/* Tests on UBF. -+ * -+ * Note: mpfr_sub1sp will never be used as it does not support UBF. -+ * Thus there is no need to generate tests for both mpfr_sub1 and -+ * mpfr_sub1sp. -+ * -+ * Note that mpfr_sub1 has a special branch "c small", where the second -+ * argument c is sufficiently smaller than the ulp of the first argument -+ * and the ulp of the result: MAX (aq, bq) + 2 <= diff_exp. -+ * Tests should be done for both the main branch and this special branch -+ * when this makes sense. -+ */ -+#define REXP 1024 -+ -+static void test_ubf_aux (void) -+{ -+ mpfr_ubf_t x[11]; -+ mpfr_ptr p[11]; -+ int ex[11]; -+ mpfr_t ee, y, z, w; -+ int i, j, k, neg, inexact, rnd; -+ const int kn = 2; -+ mpfr_exp_t e[] = -+ { MPFR_EXP_MIN, MPFR_EMIN_MIN, -REXP, 0, -+ REXP, MPFR_EMAX_MAX, MPFR_EXP_MAX }; -+ -+ mpfr_init2 (ee, sizeof (mpfr_exp_t) * CHAR_BIT); -+ mpfr_inits2 (64, y, z, (mpfr_ptr) 0); -+ mpfr_init2 (w, 2); -+ -+ for (i = 0; i < 11; i++) -+ p[i] = (mpfr_ptr) x[i]; -+ -+ /* exact zero result, with small and large exponents */ -+ for (i = 0; i < 2; i++) -+ { -+ mpfr_init2 (p[i], 5 + (randlimb () % 128)); -+ mpfr_set_ui (p[i], 17, MPFR_RNDN); -+ mpz_init (MPFR_ZEXP (p[i])); -+ MPFR_SET_UBF (p[i]); -+ } -+ for (j = 0; j < numberof (e); j++) -+ { -+ inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); -+ MPFR_ASSERTD (inexact == 0); -+ inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); -+ MPFR_ASSERTD (inexact == 0); -+ mpz_sub_ui (MPFR_ZEXP (p[0]), MPFR_ZEXP (p[0]), kn); -+ -+ for (k = -kn; k <= kn; k++) -+ { -+ /* exponent: e[j] + k, with |k| <= kn */ -+ mpz_set (MPFR_ZEXP (p[1]), MPFR_ZEXP (p[0])); -+ -+ for (neg = 0; neg <= 1; neg++) -+ { -+ RND_LOOP (rnd) -+ { -+ /* Note: x[0] and x[1] are equal MPFR numbers, but do not -+ test mpfr_sub with arg2 == arg3 as pointers in order to -+ skip potentially optimized mpfr_sub code. */ -+ inexact = mpfr_sub (z, p[0], p[1], (mpfr_rnd_t) rnd); -+ if (inexact != 0 || MPFR_NOTZERO (z) || -+ (rnd != MPFR_RNDD ? MPFR_IS_NEG (z) : MPFR_IS_POS (z))) -+ { -+ printf ("Error 1 in test_ubf for exact zero result: " -+ "j=%d k=%d neg=%d, rnd=%s\nGot ", j, k, neg, -+ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -+ mpfr_dump (z); -+ printf ("inexact = %d\n", inexact); -+ exit (1); -+ } -+ } -+ -+ for (i = 0; i < 2; i++) -+ MPFR_CHANGE_SIGN (p[i]); -+ } -+ -+ mpz_add_ui (MPFR_ZEXP (p[0]), MPFR_ZEXP (p[0]), 1); -+ } -+ } -+ for (i = 0; i < 2; i++) -+ { -+ MPFR_UBF_CLEAR_EXP (p[i]); -+ mpfr_clear (p[i]); -+ } -+ -+ /* Up to a given exponent (for the result) and sign, test: -+ * (t + .11010) - (t + .00001) = .11001 -+ * (t + 8) - (t + 111.00111) = .11001 -+ * where t = 0 or a power of 2, e.g. 2^200. Test various exponents -+ * (including those near the underflow/overflow boundaries) so that -+ * the subtraction yields a normal number, an overflow or an underflow. -+ * In MPFR_RNDA, also test with a 2-bit precision target, as this -+ * yields an exponent change. -+ * -+ * Also test the "MAX (aq, bq) + 2 <= diff_exp" branch of sub1.c with -+ * .1 - epsilon (possible decrease of the exponent) and .111 - epsilon -+ * in precision 2 (possible increase of the exponent). The first test -+ * triggers a possible decrease of the exponent (see bug fixed in r13806). -+ * The second test triggers a possible increase of the exponent (see the -+ * "exp_a != MPFR_EXP_MAX" test to avoid an integer overflow). -+ */ -+ for (i = 0; i < 8; i++) -+ { -+ static int v[4] = { 26, 1, 256, 231 }; -+ -+ mpfr_init2 (p[i], i < 4 ? 5 + (randlimb () % 128) : 256); -+ if (i < 4) -+ mpfr_set_si_2exp (p[i], v[i], -5, MPFR_RNDN); -+ else -+ { -+ mpfr_set_si_2exp (p[i], 1, 200, MPFR_RNDN); -+ mpfr_add (p[i], p[i], p[i-4], MPFR_RNDN); -+ } -+ ex[i] = mpfr_get_exp (p[i]) + 5; -+ MPFR_ASSERTD (ex[i] >= 0); -+ } -+ mpfr_inits2 (3, p[8], p[9], p[10], (mpfr_ptr) 0); -+ mpfr_set_si_2exp (p[8], 1, 0, MPFR_RNDN); -+ ex[8] = 5; -+ mpfr_set_si_2exp (p[9], 1, 0, MPFR_RNDN); /* will be epsilon */ -+ ex[9] = 0; -+ mpfr_set_si_2exp (p[10], 7, 0, MPFR_RNDN); -+ ex[10] = 5; -+ -+ for (i = 0; i < 11; i++) -+ { -+ mpz_init (MPFR_ZEXP (p[i])); -+ MPFR_SET_UBF (p[i]); -+ } -+ -+ for (j = 0; j < numberof (e); j++) -+ { -+ inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); -+ MPFR_ASSERTD (inexact == 0); -+ inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); -+ MPFR_ASSERTD (inexact == 0); -+ for (i = 1; i < 11; i++) -+ mpz_set (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[0])); -+ for (i = 0; i < 11; i++) -+ { -+ mpz_add_ui (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[i]), ex[i]); -+ mpz_sub_ui (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[i]), 5 + kn); -+ } -+ mpz_sub_ui (MPFR_ZEXP (p[9]), MPFR_ZEXP (p[9]), 256); -+ for (k = -kn; k <= kn; k++) -+ { -+ for (neg = 0; neg <= 1; neg++) -+ { -+ int sign = neg ? -1 : 1; -+ -+ RND_LOOP (rnd) -+ for (i = 0; i <= 10; i += 2) -+ { -+ mpfr_exp_t e0; -+ mpfr_flags_t flags, flags_y; -+ int inex_y; -+ -+ if (i >= 8) -+ { -+ int d; -+ -+ e0 = MPFR_UBF_GET_EXP (p[i]); -+ if (e0 < MPFR_EXP_MIN + 3) -+ e0 += 3; -+ -+ if (rnd == MPFR_RNDN) -+ d = i == 8 ? (e0 == __gmpfr_emin - 1 ? 3 : 4) : 6; -+ else if (MPFR_IS_LIKE_RNDZ (rnd, neg)) -+ d = i == 8 ? 3 : 6; -+ else -+ d = i == 8 ? 4 : 8; -+ -+ mpfr_clear_flags (); -+ inex_y = mpfr_set_si_2exp (w, sign * d, e0 - 3, -+ (mpfr_rnd_t) rnd); -+ flags_y = __gmpfr_flags | MPFR_FLAGS_INEXACT; -+ if (inex_y == 0) -+ inex_y = rnd == MPFR_RNDN ? -+ sign * (i == 8 ? 1 : -1) : -+ MPFR_IS_LIKE_RNDD ((mpfr_rnd_t) rnd, sign) ? -+ -1 : 1; -+ mpfr_set (y, w, MPFR_RNDN); -+ -+ mpfr_clear_flags (); -+ inexact = mpfr_sub (w, p[i], p[9], (mpfr_rnd_t) rnd); -+ flags = __gmpfr_flags; -+ -+ /* For MPFR_RNDF, only do a basic test. */ -+ MPFR_ASSERTN (mpfr_check (w)); -+ if (rnd == MPFR_RNDF) -+ continue; -+ -+ goto testw; -+ } -+ -+ mpfr_clear_flags (); -+ inexact = mpfr_sub (z, p[i], p[i+1], (mpfr_rnd_t) rnd); -+ flags = __gmpfr_flags; -+ -+ /* For MPFR_RNDF, only do a basic test. */ -+ MPFR_ASSERTN (mpfr_check (z)); -+ if (rnd == MPFR_RNDF) -+ continue; -+ -+ e0 = MPFR_UBF_GET_EXP (p[0]); -+ -+ if (e0 < __gmpfr_emin) -+ { -+ mpfr_rnd_t r = -+ rnd == MPFR_RNDN && e0 < __gmpfr_emin - 1 ? -+ MPFR_RNDZ : (mpfr_rnd_t) rnd; -+ flags_y = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; -+ inex_y = mpfr_underflow (y, r, sign); -+ } -+ else if (e0 > __gmpfr_emax) -+ { -+ flags_y = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT; -+ inex_y = mpfr_overflow (y, (mpfr_rnd_t) rnd, sign); -+ } -+ else -+ { -+ mpfr_set_si_2exp (y, sign * 25, e0 - 5, MPFR_RNDN); -+ flags_y = 0; -+ inex_y = 0; -+ } -+ -+ if (flags != flags_y || -+ ! SAME_SIGN (inexact, inex_y) || -+ ! mpfr_equal_p (y, z)) -+ { -+ printf ("Error 2 in test_ubf with " -+ "j=%d k=%d neg=%d i=%d rnd=%s\n", -+ j, k, neg, i, -+ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -+ printf ("emin=%" MPFR_EXP_FSPEC "d " -+ "emax=%" MPFR_EXP_FSPEC "d\n", -+ (mpfr_eexp_t) __gmpfr_emin, -+ (mpfr_eexp_t) __gmpfr_emax); -+ printf ("b = "); -+ mpfr_dump (p[i]); -+ printf ("c = "); -+ mpfr_dump (p[i+1]); -+ printf ("Expected "); -+ mpfr_dump (y); -+ printf ("with inex = %d and flags =", inex_y); -+ flags_out (flags_y); -+ printf ("Got "); -+ mpfr_dump (z); -+ printf ("with inex = %d and flags =", inexact); -+ flags_out (flags); -+ exit (1); -+ } -+ -+ /* Do the following 2-bit precision test only in RNDA. */ -+ if (rnd != MPFR_RNDA) -+ continue; -+ -+ mpfr_clear_flags (); -+ inexact = mpfr_sub (w, p[i], p[i+1], MPFR_RNDA); -+ flags = __gmpfr_flags; -+ if (e0 < MPFR_EXP_MAX) -+ e0++; -+ -+ if (e0 < __gmpfr_emin) -+ { -+ flags_y = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; -+ inex_y = mpfr_underflow (y, MPFR_RNDA, sign); -+ } -+ else if (e0 > __gmpfr_emax) -+ { -+ flags_y = MPFR_FLAGS_OVERFLOW | MPFR_FLAGS_INEXACT; -+ inex_y = mpfr_overflow (y, MPFR_RNDA, sign); -+ } -+ else -+ { -+ mpfr_set_si_2exp (y, sign, e0 - 1, MPFR_RNDN); -+ flags_y = MPFR_FLAGS_INEXACT; -+ inex_y = sign; -+ } -+ -+ testw: -+ if (flags != flags_y || -+ ! SAME_SIGN (inexact, inex_y) || -+ ! mpfr_equal_p (y, w)) -+ { -+ printf ("Error 3 in test_ubf with " -+ "j=%d k=%d neg=%d i=%d rnd=%s\n", -+ j, k, neg, i, -+ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd)); -+ printf ("emin=%" MPFR_EXP_FSPEC "d " -+ "emax=%" MPFR_EXP_FSPEC "d\n", -+ (mpfr_eexp_t) __gmpfr_emin, -+ (mpfr_eexp_t) __gmpfr_emax); -+ printf ("b = "); -+ mpfr_dump (p[i]); -+ printf ("c = "); -+ mpfr_dump (p[i <= 8 ? i+1 : 9]); -+ printf ("Expected "); -+ /* Set y to a 2-bit precision just for the output. -+ Since we exit, this will have no other effect. */ -+ mpfr_prec_round (y, 2, MPFR_RNDA); -+ mpfr_dump (y); -+ printf ("with inex = %d and flags =", inex_y); -+ flags_out (flags_y); -+ printf ("Got "); -+ mpfr_dump (w); -+ printf ("with inex = %d and flags =", inexact); -+ flags_out (flags); -+ exit (1); -+ } -+ } -+ -+ for (i = 0; i < 11; i++) -+ MPFR_CHANGE_SIGN (p[i]); -+ } -+ -+ for (i = 0; i < 11; i++) -+ mpz_add_ui (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[i]), 1); -+ } -+ } -+ for (i = 0; i < 11; i++) -+ { -+ MPFR_UBF_CLEAR_EXP (p[i]); -+ mpfr_clear (p[i]); -+ } -+ -+ mpfr_clears (ee, y, z, w, (mpfr_ptr) 0); -+} -+ -+/* Run the tests on UBF with the maximum exponent range and with a -+ reduced exponent range. */ -+static void test_ubf (void) -+{ -+ mpfr_exp_t emin, emax; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ test_ubf_aux (); -+ -+ set_emin (-REXP); -+ set_emax (REXP); -+ test_ubf_aux (); -+ -+ set_emin (emin); -+ set_emax (emax); -+} -+ - #define TEST_FUNCTION test_sub - #define TWO_ARGS - #define RAND_FUNCTION(x) mpfr_random2(x, MPFR_LIMB_SIZE (x), randlimb () % 100, RANDS) -@@ -1188,6 +1540,7 @@ - for (i=0; i<50; i++) - check_two_sum (p); - test_generic (MPFR_PREC_MIN, 800, 100); -+ test_ubf (); - - tests_end_mpfr (); - return 0; diff --git a/mpfr-sub1-ubftest.patch b/mpfr-sub1-ubftest.patch deleted file mode 100644 index b4f53fb..0000000 --- a/mpfr-sub1-ubftest.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -Naurd mpfr-4.0.2-a/PATCHES mpfr-4.0.2-b/PATCHES ---- mpfr-4.0.2-a/PATCHES 2020-04-03 13:54:03.807946879 +0000 -+++ mpfr-4.0.2-b/PATCHES 2020-04-03 13:54:03.891945830 +0000 -@@ -0,0 +1 @@ -+sub1-ubftest -diff -Naurd mpfr-4.0.2-a/VERSION mpfr-4.0.2-b/VERSION ---- mpfr-4.0.2-a/VERSION 2020-03-30 16:50:17.096230810 +0000 -+++ mpfr-4.0.2-b/VERSION 2020-04-03 13:54:03.891945830 +0000 -@@ -1 +1 @@ --4.0.2-p6 -+4.0.2-p7 -diff -Naurd mpfr-4.0.2-a/src/mpfr.h mpfr-4.0.2-b/src/mpfr.h ---- mpfr-4.0.2-a/src/mpfr.h 2020-03-30 16:50:17.096230810 +0000 -+++ mpfr-4.0.2-b/src/mpfr.h 2020-04-03 13:54:03.891945830 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 0 - #define MPFR_VERSION_PATCHLEVEL 2 --#define MPFR_VERSION_STRING "4.0.2-p6" -+#define MPFR_VERSION_STRING "4.0.2-p7" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.0.2-a/src/version.c mpfr-4.0.2-b/src/version.c ---- mpfr-4.0.2-a/src/version.c 2020-03-30 16:50:17.096230810 +0000 -+++ mpfr-4.0.2-b/src/version.c 2020-04-03 13:54:03.891945830 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.0.2-p6"; -+ return "4.0.2-p7"; - } -diff -Naurd mpfr-4.0.2-a/tests/tsub.c mpfr-4.0.2-b/tests/tsub.c ---- mpfr-4.0.2-a/tests/tsub.c 2020-03-30 13:09:17.490071686 +0000 -+++ mpfr-4.0.2-b/tests/tsub.c 2020-04-03 13:54:03.827946629 +0000 -@@ -1203,9 +1203,9 @@ - for (j = 0; j < numberof (e); j++) - { - inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); -- MPFR_ASSERTD (inexact == 0); -+ MPFR_ASSERTN (inexact == 0); - inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); -- MPFR_ASSERTD (inexact == 0); -+ MPFR_ASSERTN (inexact == 0); - mpz_sub_ui (MPFR_ZEXP (p[0]), MPFR_ZEXP (p[0]), kn); - - for (k = -kn; k <= kn; k++) -@@ -1266,23 +1266,31 @@ - { - static int v[4] = { 26, 1, 256, 231 }; - -- mpfr_init2 (p[i], i < 4 ? 5 + (randlimb () % 128) : 256); -+ mpfr_init2 (p[i], i < 4 ? 8 + (randlimb () % 128) : 256); - if (i < 4) -- mpfr_set_si_2exp (p[i], v[i], -5, MPFR_RNDN); -+ { -+ inexact = mpfr_set_si_2exp (p[i], v[i], -5, MPFR_RNDN); -+ MPFR_ASSERTN (inexact == 0); -+ } - else - { -- mpfr_set_si_2exp (p[i], 1, 200, MPFR_RNDN); -- mpfr_add (p[i], p[i], p[i-4], MPFR_RNDN); -+ inexact = mpfr_set_si_2exp (p[i], 1, 200, MPFR_RNDN); -+ MPFR_ASSERTN (inexact == 0); -+ inexact = mpfr_add (p[i], p[i], p[i-4], MPFR_RNDN); -+ MPFR_ASSERTN (inexact == 0); - } - ex[i] = mpfr_get_exp (p[i]) + 5; -- MPFR_ASSERTD (ex[i] >= 0); -+ MPFR_ASSERTN (ex[i] >= 0); - } - mpfr_inits2 (3, p[8], p[9], p[10], (mpfr_ptr) 0); -- mpfr_set_si_2exp (p[8], 1, 0, MPFR_RNDN); -+ inexact = mpfr_set_si_2exp (p[8], 1, 0, MPFR_RNDN); -+ MPFR_ASSERTN (inexact == 0); - ex[8] = 5; -- mpfr_set_si_2exp (p[9], 1, 0, MPFR_RNDN); /* will be epsilon */ -+ inexact = mpfr_set_si_2exp (p[9], 1, 0, MPFR_RNDN); /* will be epsilon */ -+ MPFR_ASSERTN (inexact == 0); - ex[9] = 0; -- mpfr_set_si_2exp (p[10], 7, 0, MPFR_RNDN); -+ inexact = mpfr_set_si_2exp (p[10], 7, 0, MPFR_RNDN); -+ MPFR_ASSERTN (inexact == 0); - ex[10] = 5; - - for (i = 0; i < 11; i++) -@@ -1294,9 +1302,9 @@ - for (j = 0; j < numberof (e); j++) - { - inexact = mpfr_set_exp_t (ee, e[j], MPFR_RNDN); -- MPFR_ASSERTD (inexact == 0); -+ MPFR_ASSERTN (inexact == 0); - inexact = mpfr_get_z (MPFR_ZEXP (p[0]), ee, MPFR_RNDN); -- MPFR_ASSERTD (inexact == 0); -+ MPFR_ASSERTN (inexact == 0); - for (i = 1; i < 11; i++) - mpz_set (MPFR_ZEXP (p[i]), MPFR_ZEXP (p[0])); - for (i = 0; i < 11; i++) diff --git a/mpfr.spec b/mpfr.spec index b60a67b..7295edc 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr -Version: 4.0.2 -Release: 5%{?dist} +Version: 4.1.0 +Release: 1%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ @@ -9,46 +9,6 @@ BuildRequires: gmp-devel gcc Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13499&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch01 -Patch0: %{name}-include-float.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13828&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch02 -Patch1: %{name}-int-overflow.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13836&view=revision -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13838&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch03 -Patch2: %{name}-set-int.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13697&view=revision -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13837&view=revision -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13841&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch04 -Patch3: %{name}-sub1-ubf.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13516&view=revision -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13520&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch05 -Patch4: %{name}-const.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13518&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch06 -Patch5: %{name}-array-length.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13869&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch07 -Patch6: %{name}-sub1-ubftest.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13924&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch08 -Patch7: %{name}-bernoulli-ziv.patch - -# https://gforge.inria.fr/scm/viewvc.php/mpfr?revision=13900&view=revision -# https://www.mpfr.org/mpfr-4.0.2/patch09 -Patch8: %{name}-fpif-dead-code.patch - # This can be removed when F32 reaches EOL Obsoletes: mpfr3 < 4.0.0 Provides: mpfr3 = %{version}-%{release} @@ -135,6 +95,10 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Sat Jul 11 2020 Jerry James - 4.1.0-1 +- Update to MPFR version 4.1.0 +- Drop all patches + * Mon Jun 29 2020 Jerry James - 4.0.2-5 - Add upstream patches 8 and 9 diff --git a/sources b/sources index 2388682..111089f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpfr-4.0.2.tar.xz) = d583555d08863bf36c89b289ae26bae353d9a31f08ee3894520992d2c26e5683c4c9c193d7ad139632f71c0a476d85ea76182702a98bf08dde7b6f65a54f8b88 +SHA512 (mpfr-4.1.0.tar.xz) = 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 From 28c128f92757d261ce66120d7337f8ccd494d6ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:31:34 +0000 Subject: [PATCH 15/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 7295edc..3c4a960 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: A C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ @@ -95,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 4.1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Sat Jul 11 2020 Jerry James - 4.1.0-1 - Update to MPFR version 4.1.0 - Drop all patches From ab6fce68a6db19cfcc9eace50c9886d763b098c3 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 9 Nov 2020 16:28:27 -0700 Subject: [PATCH 16/43] Explicitly BR make. --- mpfr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 3c4a960..7414c9b 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -5,7 +5,7 @@ Release: 2%{?dist} URL: http://www.mpfr.org/ License: LGPLv3+ -BuildRequires: gmp-devel gcc +BuildRequires: gmp-devel gcc make Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz From cbfeb6f6636f7ad8259eb7ba1419708c54f82b86 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Wed, 13 Jan 2021 22:48:59 +0000 Subject: [PATCH 17/43] Switch to HTTPS URLs --- mpfr.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mpfr.spec b/mpfr.spec index 7414c9b..94bc372 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,13 +1,13 @@ -Summary: A C library for multiple-precision floating-point computations +Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 Release: 2%{?dist} -URL: http://www.mpfr.org/ +URL: https://www.mpfr.org/ License: LGPLv3+ BuildRequires: gmp-devel gcc make -Source0: http://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz +Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # This can be removed when F32 reaches EOL Obsoletes: mpfr3 < 4.0.0 From c0016c7cad694d5d3a5dede081aef36da8d14137 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:53:43 +0000 Subject: [PATCH 18/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 94bc372..2e20471 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -95,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 4.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 9acef3eea7c3e96b2c599280f1cd378c446f2bd9 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Feb 2021 10:27:09 -0700 Subject: [PATCH 19/43] Add upstream patches 1-7. --- allpatches | 1581 ++++++++++++++++++++++++++++++++++++++++++++++++++++ mpfr.spec | 15 +- 2 files changed, 1595 insertions(+), 1 deletion(-) create mode 100644 allpatches diff --git a/allpatches b/allpatches new file mode 100644 index 0000000..65c218b --- /dev/null +++ b/allpatches @@ -0,0 +1,1581 @@ +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:40:40.079363480 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:40:40.119363040 +0000 +@@ -0,0 +1 @@ ++decimal128-conv +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2020-07-10 11:52:33.000000000 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:40:40.119363040 +0000 +@@ -1 +1 @@ +-4.1.0 ++4.1.0-p1 +diff -Naurd mpfr-4.1.0-a/src/get_d128.c mpfr-4.1.0-b/src/get_d128.c +--- mpfr-4.1.0-a/src/get_d128.c 2020-04-08 22:39:35.000000000 +0000 ++++ mpfr-4.1.0-b/src/get_d128.c 2021-02-11 12:40:40.103363216 +0000 +@@ -40,22 +40,21 @@ + static _Decimal128 + get_decimal128_nan (void) + { +- return (_Decimal128) MPFR_DBL_NAN; ++ return 0.0dl / 0.0dl; + } + + /* construct the decimal128 Inf with given sign */ + static _Decimal128 + get_decimal128_inf (int negative) + { +- return (_Decimal128) (negative ? MPFR_DBL_INFM : MPFR_DBL_INFP); ++ return negative ? - 1.0dl / 0.0dl : 1.0dl / 0.0dl; + } + + /* construct the decimal128 zero with given sign */ + static _Decimal128 + get_decimal128_zero (int negative) + { +- _Decimal128 zero = 0; +- return (_Decimal128) (negative ? -zero : zero); ++ return negative ? - 0.0dl : 0.0dl; + } + + /* construct the decimal128 smallest non-zero with given sign: +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2020-07-10 11:52:33.000000000 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0" ++#define MPFR_VERSION_STRING "4.1.0-p1" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2020-07-10 11:52:33.000000000 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:40:40.119363040 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0"; ++ return "4.1.0-p1"; + } +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:43:51.761257868 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:43:51.801257430 +0000 +@@ -0,0 +1 @@ ++random_deviate +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:40:40.119363040 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:43:51.801257430 +0000 +@@ -1 +1 @@ +-4.1.0-p1 ++4.1.0-p2 +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p1" ++#define MPFR_VERSION_STRING "4.1.0-p2" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c +--- mpfr-4.1.0-a/src/random_deviate.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000 +@@ -289,6 +289,7 @@ + mpfr_random_size_t p = mpfr_get_prec (z); /* Number of bits in result */ + mpz_t t; + int inex; ++ mpfr_exp_t negxe; + + if (n == 0) + { +@@ -370,14 +371,22 @@ + mpz_setbit (t, 0); /* Set the trailing bit so result is always inexact */ + if (neg) + mpz_neg (t, t); +- /* Is -x->e representable as a mpfr_exp_t? */ +- MPFR_ASSERTN (x->e <= (mpfr_uexp_t)(-1) >> 1); ++ /* Portable version of the negation of x->e, with a check of overflow. */ ++ if (MPFR_UNLIKELY (x->e > MPFR_EXP_MAX)) ++ { ++ /* Overflow, except when x->e = MPFR_EXP_MAX + 1 = - MPFR_EXP_MIN. */ ++ MPFR_ASSERTN (MPFR_EXP_MIN + MPFR_EXP_MAX == -1 && ++ x->e == (mpfr_random_size_t) MPFR_EXP_MAX + 1); ++ negxe = MPFR_EXP_MIN; ++ } ++ else ++ negxe = - (mpfr_exp_t) x->e; + /* + * Let mpfr_set_z_2exp do all the work of rounding to the requested + * precision, setting overflow/underflow flags, and returning the right + * inexact value. + */ +- inex = mpfr_set_z_2exp (z, t, -x->e, rnd); ++ inex = mpfr_set_z_2exp (z, t, negxe, rnd); + mpz_clear (t); + return inex; + } +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:40:40.119363040 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:43:51.801257430 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p1"; ++ return "4.1.0-p2"; + } +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:46:49.075316772 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:46:49.115316335 +0000 +@@ -0,0 +1 @@ ++set_z_2exp-overflow +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:43:51.801257430 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:46:49.115316335 +0000 +@@ -1 +1 @@ +-4.1.0-p2 ++4.1.0-p3 +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p2" ++#define MPFR_VERSION_STRING "4.1.0-p3" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/set_z_exp.c mpfr-4.1.0-b/src/set_z_exp.c +--- mpfr-4.1.0-a/src/set_z_exp.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/set_z_exp.c 2021-02-11 12:46:49.103316466 +0000 +@@ -28,10 +28,11 @@ + int + mpfr_set_z_2exp (mpfr_ptr f, mpz_srcptr z, mpfr_exp_t e, mpfr_rnd_t rnd_mode) + { +- mp_size_t fn, zn, dif, en; ++ mp_size_t fn, zn, dif; + int k, sign_z, inex; + mp_limb_t *fp, *zp; +- mpfr_exp_t exp; ++ mpfr_exp_t exp, nmax; ++ mpfr_uexp_t uexp; + + sign_z = mpz_sgn (z); + if (MPFR_UNLIKELY (sign_z == 0)) /* ignore the exponent for 0 */ +@@ -43,10 +44,15 @@ + MPFR_ASSERTD (sign_z == MPFR_SIGN_POS || sign_z == MPFR_SIGN_NEG); + + zn = ABSIZ(z); /* limb size of z */ +- /* compute en = floor(e/GMP_NUMB_BITS) */ +- en = (e >= 0) ? e / GMP_NUMB_BITS : (e + 1) / GMP_NUMB_BITS - 1; + MPFR_ASSERTD (zn >= 1); +- if (MPFR_UNLIKELY (zn + en > MPFR_EMAX_MAX / GMP_NUMB_BITS + 1)) ++ nmax = MPFR_EMAX_MAX / GMP_NUMB_BITS + 1; ++ /* Detect early overflow with zn + en > nmax, ++ where en = floor(e / GMP_NUMB_BITS). ++ This is checked without an integer overflow (even assuming some ++ future version of GMP, where limitations may be removed). */ ++ if (MPFR_UNLIKELY (e >= 0 ? ++ zn > nmax - e / GMP_NUMB_BITS : ++ zn + (e + 1) / GMP_NUMB_BITS - 1 > nmax)) + return mpfr_overflow (f, rnd_mode, sign_z); + /* because zn + en >= MPFR_EMAX_MAX / GMP_NUMB_BITS + 2 + implies (zn + en) * GMP_NUMB_BITS >= MPFR_EMAX_MAX + GMP_NUMB_BITS + 1 +@@ -64,8 +70,21 @@ + and exp = zn * GMP_NUMB_BITS + e - k + <= (zn + en) * GMP_NUMB_BITS - k + GMP_NUMB_BITS - 1 + <= MPFR_EMAX_MAX + 2 * GMP_NUMB_BITS - 1 */ +- exp = (mpfr_prec_t) zn * GMP_NUMB_BITS + e - k; ++ /* We need to compute exp = zn * GMP_NUMB_BITS + e - k with well-defined ++ operations (no integer overflows / no implementation-defined results). ++ The mathematical result of zn * GMP_NUMB_BITS may be larger than ++ the largest value of mpfr_exp_t while exp could still be less than ++ __gmpfr_emax. Thanks to early overflow detection, we can compute the ++ result in modular arithmetic, using mpfr_uexp_t, and convert it to ++ mpfr_exp_t. */ ++ uexp = (mpfr_uexp_t) zn * GMP_NUMB_BITS + (mpfr_uexp_t) e - k; ++ ++ /* Convert to signed in a portable way (see doc/README.dev). ++ On most platforms, this can be optimized to identity (no-op). */ ++ exp = uexp > MPFR_EXP_MAX ? -1 - (mpfr_exp_t) ~uexp : (mpfr_exp_t) uexp; ++ + /* The exponent will be exp or exp + 1 (due to rounding) */ ++ + if (MPFR_UNLIKELY (exp > __gmpfr_emax)) + return mpfr_overflow (f, rnd_mode, sign_z); + if (MPFR_UNLIKELY (exp + 1 < __gmpfr_emin)) +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:43:51.801257430 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:46:49.115316335 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p2"; ++ return "4.1.0-p3"; + } +diff -Naurd mpfr-4.1.0-a/tests/tset_z_exp.c mpfr-4.1.0-b/tests/tset_z_exp.c +--- mpfr-4.1.0-a/tests/tset_z_exp.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tset_z_exp.c 2021-02-11 12:46:49.103316466 +0000 +@@ -97,49 +97,149 @@ + mpfr_get_si is a rather indirect test of a low level routine. */ + + static void +-check (long i, mpfr_rnd_t rnd) ++check (long i, mpfr_rnd_t rnd, int reduced) + { +- mpfr_t f; ++ mpfr_t f1, f2, f3; + mpz_t z; +- mpfr_exp_t e; ++ mpfr_exp_t e, old_emin, old_emax; + int inex; ++ mpfr_flags_t flags; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); + + /* using CHAR_BIT * sizeof(long) bits of precision ensures that + mpfr_set_z_2exp is exact below */ +- mpfr_init2 (f, CHAR_BIT * sizeof(long)); ++ mpfr_inits2 (CHAR_BIT * sizeof(long), f1, f2, f3, (mpfr_ptr) 0); + mpz_init (z); + mpz_set_ui (z, i); + /* the following loop ensures that no overflow occurs */ + do + e = randexp (); + while (e > mpfr_get_emax () - CHAR_BIT * sizeof(long)); +- inex = mpfr_set_z_2exp (f, z, e, rnd); +- if (inex != 0) ++ ++ mpfr_clear_flags (); ++ inex = mpfr_set_z_2exp (f1, z, e, rnd); ++ flags = __gmpfr_flags; ++ ++ if (inex != 0 || flags != 0 || ++ (mpfr_div_2si (f2, f1, e, rnd), mpfr_get_si (f2, MPFR_RNDZ) != i)) + { +- printf ("Error in mpfr_set_z_2exp for i=%ld, e=%ld," +- " wrong ternary value\n", i, (long) e); +- printf ("expected 0, got %d\n", inex); ++ printf ("Error in mpfr_set_z_2exp for i=%ld e=%" MPFR_EXP_FSPEC ++ "d rnd_mode=%d\n", i, (mpfr_eexp_t) e, rnd); ++ mpfr_set_si_2exp (f2, i, e, MPFR_RNDN); ++ printf ("expected "); mpfr_dump (f2); ++ printf ("with inex = %d and flags =", 0); ++ flags_out (0); ++ printf ("got "); mpfr_dump (f1); ++ printf ("with inex = %d and flags =", inex); ++ flags_out (flags); + exit (1); + } +- mpfr_div_2si (f, f, e, rnd); +- if (mpfr_get_si (f, MPFR_RNDZ) != i) ++ ++ if (reduced) + { +- printf ("Error in mpfr_set_z_2exp for i=%ld e=", i); +- if (e < LONG_MIN) +- printf ("( LONG_MAX) +- printf ("(>LONG_MAX)"); +- else +- printf ("%ld", (long) e); +- printf (" rnd_mode=%d\n", rnd); +- printf ("expected %ld\n", i); +- printf ("got "); mpfr_dump (f); +- exit (1); ++ mpfr_exp_t ef, emin, emax; ++ int inex2, inex3; ++ mpfr_flags_t flags2, flags3; ++ ++ ef = i == 0 ? 0 : mpfr_get_exp (f1); ++ for (emin = ef - 2; emin <= ef + 2; emin++) ++ for (emax = emin; emax <= ef + 2; emax++) ++ { ++ inex3 = mpfr_set (f3, f1, rnd); ++ MPFR_ASSERTN (inex3 == 0); ++ mpfr_set_emin (emin); ++ mpfr_set_emax (emax); ++ mpfr_clear_flags (); ++ inex2 = mpfr_set_z_2exp (f2, z, e, rnd); ++ flags2 = __gmpfr_flags; ++ mpfr_clear_flags (); ++ inex3 = mpfr_check_range (f3, 0, rnd); ++ flags3 = __gmpfr_flags; ++ if (!(mpfr_equal_p (f2, f3) && ++ SAME_SIGN (inex2, inex3) && ++ flags2 == flags3)) ++ { ++ printf ("Error in mpfr_set_z_2exp for i=%ld e=%" ++ MPFR_EXP_FSPEC "d rnd_mode=%d\nand emin=%" ++ MPFR_EXP_FSPEC "d emax=%" MPFR_EXP_FSPEC ++ "d\n", i, (mpfr_eexp_t) e, rnd, ++ (mpfr_eexp_t) emin, (mpfr_eexp_t) emax); ++ printf ("expected "); mpfr_dump (f3); ++ printf ("with inex = %d and flags =", inex3); ++ flags_out (flags3); ++ printf ("got "); mpfr_dump (f2); ++ printf ("with inex = %d and flags =", inex2); ++ flags_out (flags2); ++ exit (1); ++ } ++ } ++ mpfr_set_emin (old_emin); ++ mpfr_set_emax (old_emax); + } +- mpfr_clear (f); ++ ++ mpfr_clears (f1, f2, f3, (mpfr_ptr) 0); + mpz_clear (z); + } + ++static void ++check_huge (void) ++{ ++ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) ++ { ++ mpfr_t x; ++ mpz_t z; ++ long e; ++ ++ /* Increase tests_memory_limit to the maximum in order to avoid ++ an obvious failure due to insufficient memory. */ ++ tests_memory_limit = (size_t) -1; /* no memory limit */ ++ ++ mpfr_init2 (x, 32); ++ ++ /* In r14140, with a 32-bit ABI (GCC's -m32): ++ - With UBsan (-fsanitize=undefined -fno-sanitize-recover), ++ this fails with: ++ set_z_2exp.c:71:26: runtime error: signed integer overflow: ++ 67108864 * 32 cannot be represented in type 'long int' ++ - With -D_MPFR_EXP_FORMAT=4, this fails with: ++ Expected 0.10001000000000000000000000000000E5 ++ Got 0 ++ */ ++ mpz_init_set_ui (z, 17); ++ e = 0x7ffffff0; ++ mpz_mul_2exp (z, z, e); ++ mpz_add_ui (z, z, 1); ++ mpfr_set_z_2exp (x, z, -e, MPFR_RNDN); ++ if (mpfr_cmp_ui0 (x, 17) != 0) ++ { ++ printf ("Error 1 in check_huge\n"); ++ printf ("Expected 0.10001000000000000000000000000000E5\n"); ++ printf ("Got "); ++ mpfr_dump (x); ++ exit (1); ++ } ++ mpz_clear (z); ++ ++ mpz_init_set_ui (z, 17); ++ mpz_mul_2exp (z, z, 0xffffffb0); ++ mpz_add_ui (z, z, 1); ++ mpfr_set_z_2exp (x, z, -1, MPFR_RNDN); ++ if (! MPFR_IS_INF (x) || MPFR_IS_NEG (x)) ++ { ++ printf ("Error 2 in check_huge\n"); ++ printf ("Expected @Inf@\n"); ++ printf ("Got "); ++ mpfr_dump (x); ++ exit (1); ++ } ++ mpz_clear (z); ++ ++ mpfr_clear (x); ++ } ++} ++ + int + main (int argc, char *argv[]) + { +@@ -147,11 +247,13 @@ + + tests_start_mpfr (); + +- check (0, MPFR_RNDN); ++ check (0, MPFR_RNDN, 0); + for (j = 0; j < 200000; j++) +- check (randlimb () & LONG_MAX, RND_RAND ()); ++ check (randlimb () & LONG_MAX, RND_RAND (), j < 200); + check0 (); + ++ check_huge (); ++ + tests_end_mpfr (); + + return 0; +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:48:27.322243271 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:48:27.370242746 +0000 +@@ -0,0 +1 @@ ++prototypes +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:46:49.115316335 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:48:27.370242746 +0000 +@@ -1 +1 @@ +-4.1.0-p3 ++4.1.0-p4 +diff -Naurd mpfr-4.1.0-a/src/atan.c mpfr-4.1.0-b/src/atan.c +--- mpfr-4.1.0-a/src/atan.c 2020-04-22 15:27:07.000000000 +0000 ++++ mpfr-4.1.0-b/src/atan.c 2021-02-11 12:48:27.354242922 +0000 +@@ -56,7 +56,7 @@ + }; + + static void +-set_table (mpfr_t y, const mp_limb_t x[3]) ++set_table (mpfr_ptr y, const mp_limb_t x[3]) + { + mpfr_prec_t p = MPFR_PREC(y); + mp_size_t n = MPFR_PREC2LIMBS(p); +diff -Naurd mpfr-4.1.0-a/src/const_euler.c mpfr-4.1.0-b/src/const_euler.c +--- mpfr-4.1.0-a/src/const_euler.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/const_euler.c 2021-02-11 12:48:27.354242922 +0000 +@@ -181,7 +181,7 @@ + } + + int +-mpfr_const_euler_internal (mpfr_t x, mpfr_rnd_t rnd) ++mpfr_const_euler_internal (mpfr_ptr x, mpfr_rnd_t rnd) + { + mpfr_const_euler_bs_t sum; + mpz_t t, u, v; +diff -Naurd mpfr-4.1.0-a/src/eint.c mpfr-4.1.0-b/src/eint.c +--- mpfr-4.1.0-a/src/eint.c 2020-03-09 15:31:45.000000000 +0000 ++++ mpfr-4.1.0-b/src/eint.c 2021-02-11 12:48:27.354242922 +0000 +@@ -36,7 +36,7 @@ + Return PREC(y) when the truncated series does not converge. + */ + static mpfr_exp_t +-mpfr_eint_aux (mpfr_t y, mpfr_srcptr x) ++mpfr_eint_aux (mpfr_ptr y, mpfr_srcptr x) + { + mpfr_t eps; /* dynamic (absolute) error bound on t */ + mpfr_t erru, errs; +diff -Naurd mpfr-4.1.0-a/src/erandom.c mpfr-4.1.0-b/src/erandom.c +--- mpfr-4.1.0-a/src/erandom.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/erandom.c 2021-02-11 12:48:27.354242922 +0000 +@@ -80,7 +80,7 @@ + + /* return an exponential random deviate with mean 1 as a MPFR */ + int +-mpfr_erandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd) ++mpfr_erandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd) + { + mpfr_random_deviate_t x, p, q; + int inex; +diff -Naurd mpfr-4.1.0-a/src/fpif.c mpfr-4.1.0-b/src/fpif.c +--- mpfr-4.1.0-a/src/fpif.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/fpif.c 2021-02-11 12:48:27.354242922 +0000 +@@ -291,7 +291,8 @@ + * until one has integer types larger than 128 bits). + */ + static unsigned char* +-mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, mpfr_t x) ++mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, ++ mpfr_ptr x) + { + unsigned char *result; + mpfr_uexp_t uexp; +@@ -372,7 +373,7 @@ + * than 128 bits). + */ + static int +-mpfr_fpif_read_exponent_from_file (mpfr_t x, FILE * fh) ++mpfr_fpif_read_exponent_from_file (mpfr_ptr x, FILE * fh) + { + mpfr_exp_t exponent; + mpfr_uexp_t uexp; +@@ -456,7 +457,7 @@ + * format + */ + static unsigned char* +-mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_t x) ++mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_ptr x) + { + unsigned char *result; + mpfr_prec_t precision; +@@ -492,7 +493,7 @@ + * Assume buffer is not NULL. + */ + static void +-mpfr_fpif_read_limbs (mpfr_t x, unsigned char *buffer, size_t nb_byte) ++mpfr_fpif_read_limbs (mpfr_ptr x, unsigned char *buffer, size_t nb_byte) + { + size_t mp_bytes_per_limb; + size_t nb_partial_byte; +@@ -522,7 +523,7 @@ + * return 0 if successful + */ + int +-mpfr_fpif_export (FILE *fh, mpfr_t x) ++mpfr_fpif_export (FILE *fh, mpfr_ptr x) + { + int status; + unsigned char *buf; +@@ -582,7 +583,7 @@ + * Return 0 if the import was successful. + */ + int +-mpfr_fpif_import (mpfr_t x, FILE *fh) ++mpfr_fpif_import (mpfr_ptr x, FILE *fh) + { + int status; + mpfr_prec_t precision; +diff -Naurd mpfr-4.1.0-a/src/li2.c mpfr-4.1.0-b/src/li2.c +--- mpfr-4.1.0-a/src/li2.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/li2.c 2021-02-11 12:48:27.354242922 +0000 +@@ -31,7 +31,7 @@ + for determinating the relative error. + */ + static int +-li2_series (mpfr_t sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode) ++li2_series (mpfr_ptr sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode) + { + int i; + mpfr_t s, u, v, w; +diff -Naurd mpfr-4.1.0-a/src/lngamma.c mpfr-4.1.0-b/src/lngamma.c +--- mpfr-4.1.0-a/src/lngamma.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/lngamma.c 2021-02-11 12:48:27.354242922 +0000 +@@ -31,7 +31,7 @@ + precision should be >= 4. + */ + static void +-mpfr_gamma_alpha (mpfr_t s, mpfr_prec_t p) ++mpfr_gamma_alpha (mpfr_ptr s, mpfr_prec_t p) + { + MPFR_LOG_FUNC + (("p=%Pu", p), +diff -Naurd mpfr-4.1.0-a/src/mpfr-impl.h mpfr-4.1.0-b/src/mpfr-impl.h +--- mpfr-4.1.0-a/src/mpfr-impl.h 2020-06-10 21:50:12.000000000 +0000 ++++ mpfr-4.1.0-b/src/mpfr-impl.h 2021-02-11 12:48:27.354242922 +0000 +@@ -2474,7 +2474,8 @@ + __MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache (unsigned long); + __MPFR_DECLSPEC void mpfr_bernoulli_freecache (void); + +-__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_t, mpfr_t, mpfr_srcptr, mpfr_rnd_t); ++__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_ptr, mpfr_ptr, mpfr_srcptr, ++ mpfr_rnd_t); + + __MPFR_DECLSPEC double mpfr_scale2 (double, int); + +@@ -2485,7 +2486,7 @@ + mpfr_prec_t); + + __MPFR_DECLSPEC void mpfr_mpz_init (mpz_ptr); +-__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_t, mp_bitcnt_t); ++__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_ptr, mp_bitcnt_t); + __MPFR_DECLSPEC void mpfr_mpz_clear (mpz_ptr); + + __MPFR_DECLSPEC int mpfr_odd_p (mpfr_srcptr); +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p3" ++#define MPFR_VERSION_STRING "4.1.0-p4" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +@@ -781,8 +781,8 @@ + __MPFR_DECLSPEC int mpfr_strtofr (mpfr_ptr, const char *, char **, int, + mpfr_rnd_t); + +-__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_t); +-__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_t, int); ++__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_ptr); ++__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_ptr, int); + + __MPFR_DECLSPEC size_t mpfr_custom_get_size (mpfr_prec_t); + __MPFR_DECLSPEC void mpfr_custom_init (void *, mpfr_prec_t); +@@ -1080,10 +1080,12 @@ + #define mpfr_set_uj_2exp __gmpfr_set_uj_2exp + #define mpfr_get_sj __gmpfr_mpfr_get_sj + #define mpfr_get_uj __gmpfr_mpfr_get_uj +-__MPFR_DECLSPEC int mpfr_set_sj (mpfr_t, intmax_t, mpfr_rnd_t); +-__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_t, intmax_t, intmax_t, mpfr_rnd_t); +-__MPFR_DECLSPEC int mpfr_set_uj (mpfr_t, uintmax_t, mpfr_rnd_t); +-__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_t, uintmax_t, intmax_t, mpfr_rnd_t); ++__MPFR_DECLSPEC int mpfr_set_sj (mpfr_ptr, intmax_t, mpfr_rnd_t); ++__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_ptr, intmax_t, intmax_t, ++ mpfr_rnd_t); ++__MPFR_DECLSPEC int mpfr_set_uj (mpfr_ptr, uintmax_t, mpfr_rnd_t); ++__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_ptr, uintmax_t, intmax_t, ++ mpfr_rnd_t); + __MPFR_DECLSPEC intmax_t mpfr_get_sj (mpfr_srcptr, mpfr_rnd_t); + __MPFR_DECLSPEC uintmax_t mpfr_get_uj (mpfr_srcptr, mpfr_rnd_t); + +diff -Naurd mpfr-4.1.0-a/src/nrandom.c mpfr-4.1.0-b/src/nrandom.c +--- mpfr-4.1.0-a/src/nrandom.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/nrandom.c 2021-02-11 12:48:27.354242922 +0000 +@@ -155,7 +155,7 @@ + + /* return a normal random deviate with mean 0 and variance 1 as a MPFR */ + int +-mpfr_nrandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd) ++mpfr_nrandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd) + { + mpfr_random_deviate_t x, p, q; + int inex; +diff -Naurd mpfr-4.1.0-a/src/pool.c mpfr-4.1.0-b/src/pool.c +--- mpfr-4.1.0-a/src/pool.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/pool.c 2021-02-11 12:48:27.354242922 +0000 +@@ -35,7 +35,7 @@ + static MPFR_THREAD_ATTR __mpz_struct mpz_tab[MPFR_POOL_NENTRIES]; + + MPFR_HOT_FUNCTION_ATTR void +-mpfr_mpz_init (mpz_t z) ++mpfr_mpz_init (mpz_ptr z) + { + if (MPFR_LIKELY (n_alloc > 0)) + { +@@ -54,7 +54,7 @@ + } + + MPFR_HOT_FUNCTION_ATTR void +-mpfr_mpz_init2 (mpz_t z, mp_bitcnt_t n) ++mpfr_mpz_init2 (mpz_ptr z, mp_bitcnt_t n) + { + /* The condition on n is used below as the argument n will be ignored if + the mpz_t is obtained from the MPFR stack of previously used mpz_t. +@@ -82,7 +82,7 @@ + + + MPFR_HOT_FUNCTION_ATTR void +-mpfr_mpz_clear (mpz_t z) ++mpfr_mpz_clear (mpz_ptr z) + { + /* We only put objects with at most MPFR_POOL_MAX_SIZE in the mpz_t pool, + to avoid it takes too much memory (and anyway the speedup is mainly +diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c +--- mpfr-4.1.0-a/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000 ++++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:48:27.354242922 +0000 +@@ -64,7 +64,7 @@ + + /* allocate and set to (0,1) */ + void +-mpfr_random_deviate_init (mpfr_random_deviate_t x) ++mpfr_random_deviate_init (mpfr_random_deviate_ptr x) + { + mpz_init (x->f); + x->e = 0; +@@ -72,21 +72,22 @@ + + /* reset to (0,1) */ + void +-mpfr_random_deviate_reset (mpfr_random_deviate_t x) ++mpfr_random_deviate_reset (mpfr_random_deviate_ptr x) + { + x->e = 0; + } + + /* deallocate */ + void +-mpfr_random_deviate_clear (mpfr_random_deviate_t x) ++mpfr_random_deviate_clear (mpfr_random_deviate_ptr x) + { + mpz_clear (x->f); + } + + /* swap two random deviates */ + void +-mpfr_random_deviate_swap (mpfr_random_deviate_t x, mpfr_random_deviate_t y) ++mpfr_random_deviate_swap (mpfr_random_deviate_ptr x, ++ mpfr_random_deviate_ptr y) + { + mpfr_random_size_t s; + unsigned long t; +@@ -107,7 +108,7 @@ + + /* ensure x has at least k bits */ + static void +-random_deviate_generate (mpfr_random_deviate_t x, mpfr_random_size_t k, ++random_deviate_generate (mpfr_random_deviate_ptr x, mpfr_random_size_t k, + gmp_randstate_t r, mpz_t t) + { + /* Various compile time checks on mpfr_random_deviate_t */ +@@ -223,7 +224,7 @@ + + /* return position of leading bit, counting from 1 */ + static mpfr_random_size_t +-random_deviate_leading_bit (mpfr_random_deviate_t x, gmp_randstate_t r) ++random_deviate_leading_bit (mpfr_random_deviate_ptr x, gmp_randstate_t r) + { + mpfr_random_size_t l; + random_deviate_generate (x, W, r, 0); +@@ -243,7 +244,7 @@ + + /* return kth bit of fraction, representing 2^-k */ + int +-mpfr_random_deviate_tstbit (mpfr_random_deviate_t x, mpfr_random_size_t k, ++mpfr_random_deviate_tstbit (mpfr_random_deviate_ptr x, mpfr_random_size_t k, + gmp_randstate_t r) + { + if (k == 0) +@@ -256,7 +257,8 @@ + + /* compare two random deviates, x < y */ + int +-mpfr_random_deviate_less (mpfr_random_deviate_t x, mpfr_random_deviate_t y, ++mpfr_random_deviate_less (mpfr_random_deviate_ptr x, ++ mpfr_random_deviate_ptr y, + gmp_randstate_t r) + { + mpfr_random_size_t k = 1; +@@ -280,7 +282,7 @@ + /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */ + int + mpfr_random_deviate_value (int neg, unsigned long n, +- mpfr_random_deviate_t x, mpfr_t z, ++ mpfr_random_deviate_ptr x, mpfr_ptr z, + gmp_randstate_t r, mpfr_rnd_t rnd) + { + /* r is used to add as many bits as necessary to match the precision of z */ +diff -Naurd mpfr-4.1.0-a/src/random_deviate.h mpfr-4.1.0-b/src/random_deviate.h +--- mpfr-4.1.0-a/src/random_deviate.h 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/random_deviate.h 2021-02-11 12:48:27.354242922 +0000 +@@ -76,7 +76,7 @@ + /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */ + __MPFR_DECLSPEC int + mpfr_random_deviate_value (int, unsigned long, +- mpfr_random_deviate_ptr, mpfr_t, ++ mpfr_random_deviate_ptr, mpfr_ptr, + gmp_randstate_t, mpfr_rnd_t); + + #if defined(__cplusplus) +diff -Naurd mpfr-4.1.0-a/src/rndna.c mpfr-4.1.0-b/src/rndna.c +--- mpfr-4.1.0-a/src/rndna.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/rndna.c 2021-02-11 12:48:27.354242922 +0000 +@@ -61,7 +61,7 @@ + and prepares rop to give it one more bit of precision + and to save its old value within it. */ + void +-mpfr_round_nearest_away_begin (mpfr_t rop) ++mpfr_round_nearest_away_begin (mpfr_ptr rop) + { + mpfr_t tmp; + mp_size_t xsize; +@@ -129,7 +129,7 @@ + copying it back the result of the applied function + and performing additional roundings. */ + int +-mpfr_round_nearest_away_end (mpfr_t rop, int inex) ++mpfr_round_nearest_away_end (mpfr_ptr rop, int inex) + { + mpfr_t tmp; + mp_size_t xsize; +diff -Naurd mpfr-4.1.0-a/src/set_sj.c mpfr-4.1.0-b/src/set_sj.c +--- mpfr-4.1.0-a/src/set_sj.c 2020-06-01 10:39:52.000000000 +0000 ++++ mpfr-4.1.0-b/src/set_sj.c 2021-02-11 12:48:27.354242922 +0000 +@@ -26,13 +26,13 @@ + #ifdef _MPFR_H_HAVE_INTMAX_T + + int +-mpfr_set_sj (mpfr_t x, intmax_t j, mpfr_rnd_t rnd) ++mpfr_set_sj (mpfr_ptr x, intmax_t j, mpfr_rnd_t rnd) + { + return mpfr_set_sj_2exp (x, j, 0, rnd); + } + + int +-mpfr_set_sj_2exp (mpfr_t x, intmax_t j, intmax_t e, mpfr_rnd_t rnd) ++mpfr_set_sj_2exp (mpfr_ptr x, intmax_t j, intmax_t e, mpfr_rnd_t rnd) + { + if (j >= 0) + return mpfr_set_uj_2exp (x, j, e, rnd); +diff -Naurd mpfr-4.1.0-a/src/set_str.c mpfr-4.1.0-b/src/set_str.c +--- mpfr-4.1.0-a/src/set_str.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/set_str.c 2021-02-11 12:48:27.354242922 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-impl.h" + + int +-mpfr_set_str (mpfr_t x, const char *str, int base, mpfr_rnd_t rnd) ++mpfr_set_str (mpfr_ptr x, const char *str, int base, mpfr_rnd_t rnd) + { + char *p; + +diff -Naurd mpfr-4.1.0-a/src/set_uj.c mpfr-4.1.0-b/src/set_uj.c +--- mpfr-4.1.0-a/src/set_uj.c 2020-06-01 10:39:52.000000000 +0000 ++++ mpfr-4.1.0-b/src/set_uj.c 2021-02-11 12:48:27.354242922 +0000 +@@ -29,13 +29,13 @@ + #define uintmaxpml (sizeof(uintmax_t) / sizeof(mp_limb_t)) + + int +-mpfr_set_uj (mpfr_t x, uintmax_t j, mpfr_rnd_t rnd) ++mpfr_set_uj (mpfr_ptr x, uintmax_t j, mpfr_rnd_t rnd) + { + return mpfr_set_uj_2exp (x, j, 0, rnd); + } + + int +-mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd) ++mpfr_set_uj_2exp (mpfr_ptr x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd) + { + int cnt, inex; + mp_size_t i, k; +diff -Naurd mpfr-4.1.0-a/src/sin_cos.c mpfr-4.1.0-b/src/sin_cos.c +--- mpfr-4.1.0-a/src/sin_cos.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/sin_cos.c 2021-02-11 12:48:27.354242922 +0000 +@@ -463,7 +463,7 @@ + Return err such that the relative error is bounded by 2^err ulps. + */ + static int +-sincos_aux (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd_mode) ++sincos_aux (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd_mode) + { + mpfr_prec_t prec_s, sh; + mpz_t Q, S, C, Q2, S2, C2, y; +@@ -577,7 +577,7 @@ + Assumes s differs from c. + */ + int +-mpfr_sincos_fast (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd) ++mpfr_sincos_fast (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd) + { + int inexs, inexc; + mpfr_t x_red, ts, tc; +diff -Naurd mpfr-4.1.0-a/src/strtofr.c mpfr-4.1.0-b/src/strtofr.c +--- mpfr-4.1.0-a/src/strtofr.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/strtofr.c 2021-02-11 12:48:27.354242922 +0000 +@@ -226,7 +226,7 @@ + BUT if it returns 0 (NAN or INF), the ternary value is also '0' + (ie NAN and INF are exact) */ + static int +-parse_string (mpfr_t x, struct parsed_string *pstr, ++parse_string (mpfr_ptr x, struct parsed_string *pstr, + const char **string, int base) + { + const char *str = *string; +@@ -451,7 +451,7 @@ + and the precision of x. + Returns the ternary value. */ + static int +-parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd) ++parsed_string_to_mpfr (mpfr_ptr x, struct parsed_string *pstr, mpfr_rnd_t rnd) + { + mpfr_prec_t precx, prec, ysize_bits, pstr_size; + mpfr_exp_t exp; +@@ -934,7 +934,7 @@ + } + + int +-mpfr_strtofr (mpfr_t x, const char *string, char **end, int base, ++mpfr_strtofr (mpfr_ptr x, const char *string, char **end, int base, + mpfr_rnd_t rnd) + { + int res; +diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c +--- mpfr-4.1.0-a/src/vasprintf.c 2020-06-01 10:39:52.000000000 +0000 ++++ mpfr-4.1.0-b/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000 +@@ -963,7 +963,7 @@ + #define NDIGITS 8 + + MPFR_RETURNS_NONNULL static char * +-mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, const mpfr_t op, ++mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, mpfr_srcptr op, + const struct printf_spec spec) + { + size_t ndigits; +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:46:49.115316335 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:48:27.370242746 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p3"; ++ return "4.1.0-p4"; + } +diff -Naurd mpfr-4.1.0-a/src/zeta.c mpfr-4.1.0-b/src/zeta.c +--- mpfr-4.1.0-a/src/zeta.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/src/zeta.c 2021-02-11 12:48:27.354242922 +0000 +@@ -35,7 +35,7 @@ + sum(tc[i]*product((s+2j)*(s+2j-1)/n^2,j=1..i-1), i=1..p)*s*n^(-s-1) + */ + static void +-mpfr_zeta_part_b (mpfr_t b, mpfr_srcptr s, int n, int p, mpfr_t *tc) ++mpfr_zeta_part_b (mpfr_ptr b, mpfr_srcptr s, int n, int p, mpfr_t *tc) + { + mpfr_t s1, d, u; + unsigned long n2; +@@ -130,7 +130,7 @@ + n - an integer + Output: sum - a floating-point number approximating sum(1/i^s, i=1..n-1) */ + static void +-mpfr_zeta_part_a (mpfr_t sum, mpfr_srcptr s, int n) ++mpfr_zeta_part_a (mpfr_ptr sum, mpfr_srcptr s, int n) + { + mpfr_t u, s1; + int i; +@@ -158,7 +158,7 @@ + Output: z - Zeta(s) rounded to the precision of z with direction rnd_mode + */ + static int +-mpfr_zeta_pos (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) ++mpfr_zeta_pos (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) + { + mpfr_t b, c, z_pre, f, s1; + double beta, sd, dnep; +@@ -356,8 +356,8 @@ + At input, p is Pi rounded down. + The comments in the code are for rnd = RNDD. */ + static void +-mpfr_reflection_overflow (mpfr_t z, mpfr_t s1, const mpfr_t s, mpfr_t y, +- mpfr_t p, mpfr_rnd_t rnd) ++mpfr_reflection_overflow (mpfr_ptr z, mpfr_ptr s1, mpfr_srcptr s, mpfr_ptr y, ++ mpfr_ptr p, mpfr_rnd_t rnd) + { + mpz_t sint; + +@@ -432,7 +432,7 @@ + } + + int +-mpfr_zeta (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) ++mpfr_zeta (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) + { + mpfr_t z_pre, s1, y, p; + long add; +diff -Naurd mpfr-4.1.0-a/tests/tcmp2.c mpfr-4.1.0-b/tests/tcmp2.c +--- mpfr-4.1.0-a/tests/tcmp2.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tcmp2.c 2021-02-11 12:48:27.350242965 +0000 +@@ -24,7 +24,7 @@ + + /* set bit n of x to b, where bit 0 is the most significant one */ + static void +-set_bit (mpfr_t x, unsigned int n, int b) ++set_bit (mpfr_ptr x, unsigned int n, int b) + { + unsigned l; + mp_size_t xn; +diff -Naurd mpfr-4.1.0-a/tests/tdiv.c mpfr-4.1.0-b/tests/tdiv.c +--- mpfr-4.1.0-a/tests/tdiv.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tdiv.c 2021-02-11 12:48:27.350242965 +0000 +@@ -369,7 +369,7 @@ + /* given y = o(x/u), x, u, find the inexact flag by + multiplying y by u */ + static int +-get_inexact (mpfr_t y, mpfr_t x, mpfr_t u) ++get_inexact (mpfr_ptr y, mpfr_ptr x, mpfr_ptr u) + { + mpfr_t xx; + int inex; +diff -Naurd mpfr-4.1.0-a/tests/teq.c mpfr-4.1.0-b/tests/teq.c +--- mpfr-4.1.0-a/tests/teq.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/teq.c 2021-02-11 12:48:27.350242965 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-test.h" + + static void +-teq (mpfr_t x) ++teq (mpfr_ptr x) + { + mpfr_t y; + unsigned long k, px, mx; +diff -Naurd mpfr-4.1.0-a/tests/terandom_chisq.c mpfr-4.1.0-b/tests/terandom_chisq.c +--- mpfr-4.1.0-a/tests/terandom_chisq.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/terandom_chisq.c 2021-02-11 12:48:27.350242965 +0000 +@@ -26,7 +26,7 @@ + * exponential distribution. We only take differences of this function so the + * offset doesn't matter; here Phi(0) = 0. */ + static void +-exponential_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd) ++exponential_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd) + { + mpfr_neg (z, x, rnd); + mpfr_expm1 (z, z, rnd); +@@ -43,7 +43,7 @@ + * TAOCP, Vol 2, 3.3.1, Table 1. It more accurate than the similar formula, + * DLMF 8.11.10. */ + static void +-chisq_prob (mpfr_t q, long nu, mpfr_t chisqp) ++chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp) + { + mpfr_t t; + mpfr_rnd_t rnd; +@@ -170,7 +170,7 @@ + * this function. low precision means prec = 2, 3, or 4. High values of + * precision will result in integer overflow. */ + static long +-sequential (mpfr_t x) ++sequential (mpfr_ptr x) + { + long expt, prec; + +diff -Naurd mpfr-4.1.0-a/tests/tfmma.c mpfr-4.1.0-b/tests/tfmma.c +--- mpfr-4.1.0-a/tests/tfmma.c 2020-03-24 13:47:38.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tfmma.c 2021-02-11 12:48:27.350242965 +0000 +@@ -24,7 +24,7 @@ + + /* check both mpfr_fmma and mpfr_fmms */ + static void +-random_test (mpfr_t a, mpfr_t b, mpfr_t c, mpfr_t d, mpfr_rnd_t rnd) ++random_test (mpfr_ptr a, mpfr_ptr b, mpfr_ptr c, mpfr_ptr d, mpfr_rnd_t rnd) + { + mpfr_t ref, res, ab, cd; + int inex_ref, inex_res; +diff -Naurd mpfr-4.1.0-a/tests/tfmod.c mpfr-4.1.0-b/tests/tfmod.c +--- mpfr-4.1.0-a/tests/tfmod.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tfmod.c 2021-02-11 12:48:27.350242965 +0000 +@@ -62,8 +62,8 @@ + } + + static void +-test_failed (mpfr_t erem, mpfr_t grem, int eret, int gret, mpfr_t x, mpfr_t y, +- mpfr_rnd_t rnd) ++test_failed (mpfr_ptr erem, mpfr_ptr grem, int eret, int gret, ++ mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd) + { + printf ("error: mpfr_fmod (r, x, y, rnd)\n x = "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD); +@@ -83,7 +83,7 @@ + } + + static void +-check (mpfr_t r0, mpfr_t x, mpfr_t y, mpfr_rnd_t rnd) ++check (mpfr_ptr r0, mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd) + { + int inex0, inex1; + mpfr_t r1; +diff -Naurd mpfr-4.1.0-a/tests/tfprintf.c mpfr-4.1.0-b/tests/tfprintf.c +--- mpfr-4.1.0-a/tests/tfprintf.c 2020-06-01 10:39:52.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tfprintf.c 2021-02-11 12:48:27.350242965 +0000 +@@ -65,7 +65,7 @@ + const int prec_max_printf = 5000; + + static void +-check (FILE *fout, const char *fmt, mpfr_t x) ++check (FILE *fout, const char *fmt, mpfr_ptr x) + { + if (mpfr_fprintf (fout, fmt, x) == -1) + { +diff -Naurd mpfr-4.1.0-a/tests/tgamma.c mpfr-4.1.0-b/tests/tgamma.c +--- mpfr-4.1.0-a/tests/tgamma.c 2020-06-01 00:15:37.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tgamma.c 2021-02-11 12:48:27.350242965 +0000 +@@ -890,7 +890,7 @@ + computing with a working precision p2. Assume that x is not an + integer <= 2. */ + static void +-exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2) ++exp_lgamma (mpfr_ptr x, mpfr_prec_t p1, mpfr_prec_t p2) + { + mpfr_t yd, yu, zd, zu; + int inexd, inexu, sign; +diff -Naurd mpfr-4.1.0-a/tests/tnrandom_chisq.c mpfr-4.1.0-b/tests/tnrandom_chisq.c +--- mpfr-4.1.0-a/tests/tnrandom_chisq.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tnrandom_chisq.c 2021-02-11 12:48:27.350242965 +0000 +@@ -26,7 +26,7 @@ + * for the normal distribution. We only take differences of this function so + * the offset doesn't matter; here Phi(0) = 0. */ + static void +-normal_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd) ++normal_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd) + { + mpfr_sqrt_ui (z, 2, rnd); + mpfr_div (z, x, z, rnd); +@@ -44,7 +44,7 @@ + * TAOCP, Vol 2, 3.3.1, Table 1. It more accurate than the similar formula, + * DLMF 8.11.10. */ + static void +-chisq_prob (mpfr_t q, long nu, mpfr_t chisqp) ++chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp) + { + mpfr_t t; + mpfr_rnd_t rnd; +@@ -166,7 +166,7 @@ + * this function. low precision means prec = 2, 3, or 4. High values of + * precision will result in integer overflow. */ + static long +-sequential (mpfr_t x) ++sequential (mpfr_ptr x) + { + long expt, prec; + +diff -Naurd mpfr-4.1.0-a/tests/tprintf.c mpfr-4.1.0-b/tests/tprintf.c +--- mpfr-4.1.0-a/tests/tprintf.c 2020-06-01 10:39:52.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tprintf.c 2021-02-11 12:48:27.350242965 +0000 +@@ -74,7 +74,7 @@ + int stdout_redirect; + + static void +-check (const char *fmt, mpfr_t x) ++check (const char *fmt, mpfr_ptr x) + { + if (mpfr_printf (fmt, x) == -1) + { +diff -Naurd mpfr-4.1.0-a/tests/trint.c mpfr-4.1.0-b/tests/trint.c +--- mpfr-4.1.0-a/tests/trint.c 2020-02-12 13:04:50.000000000 +0000 ++++ mpfr-4.1.0-b/tests/trint.c 2021-02-11 12:48:27.350242965 +0000 +@@ -367,7 +367,7 @@ + #endif + + static void +-err (const char *str, mp_size_t s, mpfr_t x, mpfr_t y, mpfr_prec_t p, ++err (const char *str, mp_size_t s, mpfr_ptr x, mpfr_ptr y, mpfr_prec_t p, + mpfr_rnd_t r, int trint, int inexact) + { + printf ("Error: %s\ns = %u, p = %u, r = %s, trint = %d, inexact = %d\nx = ", +diff -Naurd mpfr-4.1.0-a/tests/tsinh_cosh.c mpfr-4.1.0-b/tests/tsinh_cosh.c +--- mpfr-4.1.0-a/tests/tsinh_cosh.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tsinh_cosh.c 2021-02-11 12:48:27.350242965 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-test.h" + + static void +-failed (mpfr_t x, mpfr_t esh, mpfr_t gsh, mpfr_t ech, mpfr_t gch) ++failed (mpfr_ptr x, mpfr_ptr esh, mpfr_ptr gsh, mpfr_ptr ech, mpfr_ptr gch) + { + printf ("error : mpfr_sinh_cosh (x) x = "); + mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD); +@@ -43,7 +43,7 @@ + + /* check against sinh, cosh */ + static void +-check (mpfr_t x, mpfr_rnd_t rnd) ++check (mpfr_ptr x, mpfr_rnd_t rnd) + { + mpfr_t s, c, sx, cx; + int isc, is, ic; +diff -Naurd mpfr-4.1.0-a/tests/tsqr.c mpfr-4.1.0-b/tests/tsqr.c +--- mpfr-4.1.0-a/tests/tsqr.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tsqr.c 2021-02-11 12:48:27.350242965 +0000 +@@ -33,7 +33,7 @@ + + static void + error1 (mpfr_rnd_t rnd, mpfr_prec_t prec, +- mpfr_t in, mpfr_t outmul, mpfr_t outsqr) ++ mpfr_t in, mpfr_ptr outmul, mpfr_ptr outsqr) + { + printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd), + (unsigned long) prec); +@@ -44,7 +44,7 @@ + } + + static void +-error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_t in, mpfr_t out, ++error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_ptr in, mpfr_ptr out, + int inexactmul, int inexactsqr) + { + printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd), +diff -Naurd mpfr-4.1.0-a/tests/tsum.c mpfr-4.1.0-b/tests/tsum.c +--- mpfr-4.1.0-a/tests/tsum.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tsum.c 2021-02-11 12:48:27.350242965 +0000 +@@ -59,7 +59,7 @@ + } + + static void +-get_exact_sum (mpfr_t sum, mpfr_t *tab, int n) ++get_exact_sum (mpfr_ptr sum, mpfr_t *tab, int n) + { + int i; + +@@ -1198,7 +1198,7 @@ + } + + static int +-mpfr_sum_naive (mpfr_t s, mpfr_t *x, int n, mpfr_rnd_t rnd) ++mpfr_sum_naive (mpfr_ptr s, mpfr_t *x, int n, mpfr_rnd_t rnd) + { + int ret, i; + switch (n) +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:50:22.384987438 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:50:22.424987002 +0000 +@@ -0,0 +1 @@ ++digamma-hugemem +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:48:27.370242746 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:50:22.424987002 +0000 +@@ -1 +1 @@ +-4.1.0-p4 ++4.1.0-p5 +diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c +--- mpfr-4.1.0-a/src/digamma.c 2020-06-18 17:17:18.000000000 +0000 ++++ mpfr-4.1.0-b/src/digamma.c 2021-02-11 12:50:22.412987133 +0000 +@@ -214,19 +214,27 @@ + (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode), + ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex)); + +- /* compute a precision q such that x+1 is exact */ +- if (MPFR_PREC(x) < MPFR_GET_EXP(x)) +- q = MPFR_EXP(x); +- else +- q = MPFR_PREC(x) + 1; +- +- /* for very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)) */ +- if (MPFR_PREC(y) + 10 < MPFR_EXP(x)) ++ /* For very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)). ++ However, for a fixed value of GUARD, MPFR_CAN_ROUND() might fail ++ with probability 1/2^GUARD, in which case the default code will ++ fail since it requires x+1 to be exact, thus a huge precision if ++ x is huge. There are two workarounds: ++ * either perform a Ziv's loop, by increasing GUARD at each step. ++ However, this might fail if x is moderately large, in which case ++ more terms of the asymptotic expansion would be needed. ++ * implement a full asymptotic expansion (with Ziv's loop). */ ++#define GUARD 30 ++ if (MPFR_PREC(y) + GUARD < MPFR_EXP(x)) + { + /* this ensures EXP(x) >= 3, thus x >= 4, thus log(x) > 1 */ +- mpfr_init2 (t, MPFR_PREC(y) + 10); +- mpfr_log (t, x, MPFR_RNDZ); +- if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + 10, MPFR_PREC(y), rnd_mode)) ++ mpfr_init2 (t, MPFR_PREC(y) + GUARD); ++ mpfr_log (t, x, MPFR_RNDN); ++ /* |t - digamma(x)| <= 1/2*ulp(t) + |digamma(x) - log(x)| ++ <= 1/2*ulp(t) + 2^(1-EXP(x)) ++ <= 1/2*ulp(t) + 2^(-PREC(y)-GUARD) ++ <= ulp(t) ++ since |t| >= 1 thus ulp(t) >= 2^(1-PREC(y)-GUARD) */ ++ if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + GUARD, MPFR_PREC(y), rnd_mode)) + { + inex = mpfr_set (y, t, rnd_mode); + mpfr_clear (t); +@@ -235,6 +243,21 @@ + mpfr_clear (t); + } + ++ /* compute a precision q such that x+1 is exact */ ++ if (MPFR_PREC(x) < MPFR_GET_EXP(x)) ++ { ++ /* The goal of the first assertion is to let the compiler ignore ++ the second one when MPFR_EMAX_MAX <= MPFR_PREC_MAX. */ ++ MPFR_ASSERTD (MPFR_EXP(x) <= MPFR_EMAX_MAX); ++ MPFR_ASSERTN (MPFR_EXP(x) <= MPFR_PREC_MAX); ++ q = MPFR_EXP(x); ++ } ++ else ++ q = MPFR_PREC(x) + 1; ++ ++ /* FIXME: q can be much too large, e.g. equal to the maximum exponent! */ ++ MPFR_LOG_MSG (("q=%Pu\n", q)); ++ + mpfr_init2 (x_plus_j, q); + + mpfr_init2 (t, p); +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:50:22.424987002 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p4" ++#define MPFR_VERSION_STRING "4.1.0-p5" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:48:27.370242746 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:50:22.424987002 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p4"; ++ return "4.1.0-p5"; + } +diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c +--- mpfr-4.1.0-a/tests/tdigamma.c 2020-06-18 17:17:18.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-11 12:50:22.412987133 +0000 +@@ -49,12 +49,54 @@ + mpfr_clear (y); + } + ++/* With some GMP_CHECK_RANDOMIZE values, test_generic triggers an error ++ tests_addsize(): too much memory (576460752303432776 bytes) ++ Each time on prec = 200, n = 3, xprec = 140. ++ The following test is a more general testcase. ++*/ ++static void ++bug20210206 (void) ++{ ++#define NPREC 4 ++ mpfr_t x, y[NPREC], z; ++ mpfr_exp_t emin, emax; ++ int i, precx, precy[NPREC] = { 200, 400, 520, 1416 }; ++ ++ emin = mpfr_get_emin (); ++ emax = mpfr_get_emax (); ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ ++ for (i = 0; i < NPREC; i++) ++ mpfr_init2 (y[i], precy[i]); ++ mpfr_init2 (z, precy[0]); ++ ++ for (precx = MPFR_PREC_MIN; precx < 150; precx++) ++ { ++ mpfr_init2 (x, precx); ++ mpfr_setmax (x, __gmpfr_emax); ++ for (i = 0; i < NPREC; i++) ++ mpfr_digamma (y[i], x, MPFR_RNDA); ++ mpfr_set (z, y[1], MPFR_RNDA); ++ MPFR_ASSERTN (mpfr_equal_p (y[0], z)); ++ mpfr_clear (x); ++ } ++ ++ for (i = 0; i < NPREC; i++) ++ mpfr_clear (y[i]); ++ mpfr_clear (z); ++ ++ set_emin (emin); ++ set_emax (emax); ++} ++ + int + main (int argc, char *argv[]) + { + tests_start_mpfr (); + + special (); ++ bug20210206 (); + + test_generic (MPFR_PREC_MIN, 200, 20); + +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:52:52.519350662 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:52:52.563350183 +0000 +@@ -0,0 +1 @@ ++digamma-interm-zero +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:50:22.424987002 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:52:52.563350183 +0000 +@@ -1 +1 @@ +-4.1.0-p5 ++4.1.0-p6 +diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c +--- mpfr-4.1.0-a/src/digamma.c 2021-02-11 12:50:22.412987133 +0000 ++++ mpfr-4.1.0-b/src/digamma.c 2021-02-11 12:52:52.547350357 +0000 +@@ -296,21 +296,26 @@ + errt = mpfr_digamma_approx (t, x_plus_j); + expt = MPFR_GET_EXP (t); + mpfr_sub (t, t, u, MPFR_RNDN); +- if (MPFR_GET_EXP (t) < expt) +- errt += expt - MPFR_EXP(t); +- /* Warning: if u is zero (which happens when x_plus_j >= min at the +- beginning of the while loop above), EXP(u) is not defined. +- In this case we have no error from u. */ +- if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u)) +- erru += MPFR_EXP(u) - MPFR_EXP(t); +- if (errt > erru) +- errt = errt + 1; +- else if (errt == erru) +- errt = errt + 2; +- else +- errt = erru + 1; +- if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode)) +- break; ++ /* Warning! t may be zero (more likely in small precision). Note ++ that in this case, this is an exact zero, not an underflow. */ ++ if (MPFR_NOTZERO(t)) ++ { ++ if (MPFR_GET_EXP (t) < expt) ++ errt += expt - MPFR_EXP(t); ++ /* Warning: if u is zero (which happens when x_plus_j >= min at the ++ beginning of the while loop above), EXP(u) is not defined. ++ In this case we have no error from u. */ ++ if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u)) ++ erru += MPFR_EXP(u) - MPFR_EXP(t); ++ if (errt > erru) ++ errt = errt + 1; ++ else if (errt == erru) ++ errt = errt + 2; ++ else ++ errt = erru + 1; ++ if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode)) ++ break; ++ } + MPFR_ZIV_NEXT (loop, p); + mpfr_set_prec (t, p); + mpfr_set_prec (u, p); +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:50:22.424987002 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:52:52.559350226 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p5" ++#define MPFR_VERSION_STRING "4.1.0-p6" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:50:22.424987002 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:52:52.559350226 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p5"; ++ return "4.1.0-p6"; + } +diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c +--- mpfr-4.1.0-a/tests/tdigamma.c 2021-02-11 12:50:22.412987133 +0000 ++++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-11 12:52:52.547350357 +0000 +@@ -90,6 +90,26 @@ + set_emax (emax); + } + ++/* another test that fails with GMP_CHECK_RANDOMIZE=1612741376857003 ++ on revision 14398 */ ++static void ++bug20210208 (void) ++{ ++ mpfr_t x, y; ++ int inex; ++ ++ mpfr_init2 (x, 73); ++ mpfr_init2 (y, 1); ++ mpfr_set_str (x, "1.4613470547060071827450", 10, MPFR_RNDN); ++ mpfr_clear_flags (); ++ inex = mpfr_digamma (y, x, MPFR_RNDU); ++ MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -12) == 0); ++ MPFR_ASSERTN (inex > 0); ++ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -97,6 +117,7 @@ + + special (); + bug20210206 (); ++ bug20210208 (); + + test_generic (MPFR_PREC_MIN, 200, 20); + +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-11 12:53:38.382850990 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:53:38.426850512 +0000 +@@ -0,0 +1 @@ ++jn-interm-zero +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:52:52.563350183 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-11 12:53:38.426850512 +0000 +@@ -1 +1 @@ +-4.1.0-p6 ++4.1.0-p7 +diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c +--- mpfr-4.1.0-a/src/jyn_asympt.c 2020-07-10 10:33:32.000000000 +0000 ++++ mpfr-4.1.0-b/src/jyn_asympt.c 2021-02-11 12:53:38.410850685 +0000 +@@ -69,6 +69,8 @@ + MPFR_ZIV_INIT (loop, w); + for (;;) + { ++ int ok = 1; ++ + mpfr_set_prec (c, w); + mpfr_init2 (s, w); + mpfr_init2 (P, w); +@@ -92,6 +94,13 @@ + /* now s approximates sin(z)+cos(z), and c approximates sin(z)-cos(z), + with total absolute error bounded by 2^(1-w). */ + ++ /* if s or c is zero, MPFR_GET_EXP will fail below */ ++ if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c)) ++ { ++ ok = 0; ++ goto clear; ++ } ++ + /* precompute 1/(8|z|) */ + mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN); /* err <= 1 */ + mpfr_div_2ui (iz, iz, 3, MPFR_RNDN); +@@ -257,6 +266,9 @@ + err = (err >= err2) ? err + 1 : err2 + 1; + /* the absolute error on c is bounded by 2^(err - w) */ + ++ err -= MPFR_GET_EXP (c); ++ ++ clear: + mpfr_clear (s); + mpfr_clear (P); + mpfr_clear (Q); +@@ -266,8 +278,7 @@ + mpfr_clear (err_s); + mpfr_clear (err_u); + +- err -= MPFR_GET_EXP (c); +- if (MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r))) ++ if (ok && MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r))) + break; + if (diverge != 0) + { +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:52:52.559350226 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:53:38.422850555 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p6" ++#define MPFR_VERSION_STRING "4.1.0-p7" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:52:52.559350226 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:53:38.426850512 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p6"; ++ return "4.1.0-p7"; + } +diff -Naurd mpfr-4.1.0-a/tests/tj0.c mpfr-4.1.0-b/tests/tj0.c +--- mpfr-4.1.0-a/tests/tj0.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tj0.c 2021-02-11 12:53:38.410850685 +0000 +@@ -27,6 +27,25 @@ + #define REDUCE_EMAX 262143 /* otherwise arg. reduction is too expensive */ + #include "tgeneric.c" + ++/* bug found in revision 14399 with GMP_CHECK_RANDOMIZE=1612721106588971 */ ++static void ++bug20210208 (void) ++{ ++ mpfr_t x, y; ++ int inex; ++ ++ mpfr_init2 (x, 79); ++ mpfr_init2 (y, 1); ++ mpfr_set_str (x, "2.552495117262005805960565e+02", 10, MPFR_RNDN); ++ mpfr_clear_flags (); ++ inex = mpfr_j0 (y, x, MPFR_RNDZ); ++ MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -5) == 0); ++ MPFR_ASSERTN (inex > 0); ++ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -35,6 +54,8 @@ + + tests_start_mpfr (); + ++ bug20210208 (); ++ + mpfr_init (x); + mpfr_init (y); + diff --git a/mpfr.spec b/mpfr.spec index 2e20471..1fac1b3 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -9,6 +9,16 @@ BuildRequires: gmp-devel gcc make Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz +# Upstream post-release patches. This currently contains: +# - decimal128-conv.patch +# - random_deviate.patch +# - set_z_2exp-overflow.patch +# - prototypes.patch +# - digamma-hugemem.patch +# - digamma-interm-zero.patch +# - jn-interm-zero.patch +Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches + # This can be removed when F32 reaches EOL Obsoletes: mpfr3 < 4.0.0 Provides: mpfr3 = %{version}-%{release} @@ -95,6 +105,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Wed Feb 17 2021 Jerry James - 4.1.0-4 +- Add upstream patches 1-7 + * Tue Jan 26 2021 Fedora Release Engineering - 4.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From d89286dc3e0ed5bc981f40a92d7c2d3d94021b8c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 9 Mar 2021 08:36:28 -0700 Subject: [PATCH 20/43] Add upstream patches 8-9. --- allpatches | 251 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mpfr.spec | 7 +- 2 files changed, 257 insertions(+), 1 deletion(-) diff --git a/allpatches b/allpatches index 65c218b..2f9fa04 100644 --- a/allpatches +++ b/allpatches @@ -1579,3 +1579,254 @@ diff -Naurd mpfr-4.1.0-a/tests/tj0.c mpfr-4.1.0-b/tests/tj0.c mpfr_init (x); mpfr_init (y); +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-17 17:22:34.594973310 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-17 17:22:34.702972090 +0000 +@@ -0,0 +1 @@ ++digamma-interm-zero2 +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-11 12:53:38.426850512 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-17 17:22:34.702972090 +0000 +@@ -1 +1 @@ +-4.1.0-p7 ++4.1.0-p8 +diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c +--- mpfr-4.1.0-a/src/digamma.c 2021-02-11 12:52:52.547350357 +0000 ++++ mpfr-4.1.0-b/src/digamma.c 2021-02-17 17:22:34.690972226 +0000 +@@ -173,16 +173,19 @@ + mpfr_digamma (v, u, MPFR_RNDN); /* error <= 1/2 ulp */ + expv = MPFR_GET_EXP (v); + mpfr_sub (v, v, t, MPFR_RNDN); +- if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t)) +- e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */ +- /* now take into account the 1/2 ulp error for v */ +- if (expv - MPFR_EXP(v) - 1 > e1) +- e1 = expv - MPFR_EXP(v) - 1; +- else +- e1 ++; +- e1 ++; /* rounding error for mpfr_sub */ +- if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode)) +- break; ++ if (MPFR_NOTZERO(v)) ++ { ++ if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t)) ++ e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */ ++ /* now take into account the 1/2 ulp error for v */ ++ if (expv - MPFR_EXP(v) - 1 > e1) ++ e1 = expv - MPFR_EXP(v) - 1; ++ else ++ e1 ++; ++ e1 ++; /* rounding error for mpfr_sub */ ++ if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode)) ++ break; ++ } + MPFR_ZIV_NEXT (loop, p); + mpfr_set_prec (t, p); + mpfr_set_prec (v, p); +@@ -416,10 +419,8 @@ + } + } + +- if (MPFR_IS_NEG(x)) +- inex = mpfr_digamma_reflection (y, x, rnd_mode); + /* if x < 1/2 we use the reflection formula */ +- else if (MPFR_EXP(x) < 0) ++ if (MPFR_IS_NEG(x) || MPFR_EXP(x) < 0) + inex = mpfr_digamma_reflection (y, x, rnd_mode); + else + inex = mpfr_digamma_positive (y, x, rnd_mode); +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:53:38.422850555 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-17 17:22:34.702972090 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p7" ++#define MPFR_VERSION_STRING "4.1.0-p8" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-11 12:53:38.426850512 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-17 17:22:34.702972090 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p7"; ++ return "4.1.0-p8"; + } +diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c +--- mpfr-4.1.0-a/tests/tdigamma.c 2021-02-11 12:52:52.547350357 +0000 ++++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-17 17:22:34.690972226 +0000 +@@ -110,6 +110,26 @@ + mpfr_clear (y); + } + ++/* another test that fails with GMP_CHECK_RANDOMIZE=1613197421465830 ++ on revision 14429 */ ++static void ++bug20210215 (void) ++{ ++ mpfr_t x, y; ++ int inex; ++ ++ mpfr_init2 (x, 510); ++ mpfr_init2 (y, 4); ++ mpfr_set_str (x, "-8.2923051438433494998166335341807999322052669984208422481227138906096000469898717007386115912802685588348601663465077353194268894939972221117314512518182580e+35", 10, MPFR_RNDN); ++ mpfr_clear_flags (); ++ inex = mpfr_digamma (y, x, MPFR_RNDU); ++ MPFR_ASSERTN (mpfr_cmp_ui0 (y, 88) == 0); ++ MPFR_ASSERTN (inex > 0); ++ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -118,6 +138,7 @@ + special (); + bug20210206 (); + bug20210208 (); ++ bug20210215 (); + + test_generic (MPFR_PREC_MIN, 200, 20); + +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-02-17 17:25:46.396981483 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-02-17 17:25:46.440981068 +0000 +@@ -0,0 +1 @@ ++jyn_asympt-interm-zero +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-17 17:22:34.702972090 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-02-17 17:25:46.440981068 +0000 +@@ -1 +1 @@ +-4.1.0-p8 ++4.1.0-p9 +diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c +--- mpfr-4.1.0-a/src/jyn_asympt.c 2021-02-11 12:53:38.410850685 +0000 ++++ mpfr-4.1.0-b/src/jyn_asympt.c 2021-02-17 17:25:46.424981219 +0000 +@@ -69,7 +69,7 @@ + MPFR_ZIV_INIT (loop, w); + for (;;) + { +- int ok = 1; ++ int ok = 0; + + mpfr_set_prec (c, w); + mpfr_init2 (s, w); +@@ -96,10 +96,7 @@ + + /* if s or c is zero, MPFR_GET_EXP will fail below */ + if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c)) +- { +- ok = 0; +- goto clear; +- } ++ goto clear; /* with ok=0 */ + + /* precompute 1/(8|z|) */ + mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN); /* err <= 1 */ +@@ -227,6 +224,9 @@ + mpfr_sub (s, c, s, MPFR_RNDN); + #endif + } ++ if (MPFR_IS_ZERO(s)) ++ goto clear; /* with ok=0 */ ++ ok = 1; + if ((n & 2) != 0) + mpfr_neg (s, s, MPFR_RNDN); + if (MPFR_GET_EXP (s) > err) +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-17 17:22:34.702972090 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-02-17 17:25:46.436981105 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p8" ++#define MPFR_VERSION_STRING "4.1.0-p9" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-17 17:22:34.702972090 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-02-17 17:25:46.440981068 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p8"; ++ return "4.1.0-p9"; + } +diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h +--- mpfr-4.1.0-a/tests/mpfr-test.h 2020-06-29 13:57:32.000000000 +0000 ++++ mpfr-4.1.0-b/tests/mpfr-test.h 2021-02-17 17:25:46.424981219 +0000 +@@ -191,6 +191,8 @@ + + #define mpfr_cmp0(x,y) (MPFR_ASSERTN (!MPFR_IS_NAN (x) && !MPFR_IS_NAN (y)), mpfr_cmp (x,y)) + #define mpfr_cmp_ui0(x,i) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), mpfr_cmp_ui (x,i)) ++#define mpfr_cmp_si_2exp0(x,i,e) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), \ ++ mpfr_cmp_si_2exp (x,i,e)) + + /* define CHECK_EXTERNAL if you want to check mpfr against another library + with correct rounding. You'll probably have to modify mpfr_print_raw() +diff -Naurd mpfr-4.1.0-a/tests/tj1.c mpfr-4.1.0-b/tests/tj1.c +--- mpfr-4.1.0-a/tests/tj1.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tj1.c 2021-02-17 17:25:46.424981219 +0000 +@@ -55,14 +55,14 @@ + /* since |x| is just above 2^e, |j1(x)| is just above 2^(e-1), + thus y should be 2^(e-1) and the inexact flag should be + of opposite sign of x */ +- MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e - 1) == 0); ++ MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e - 1) == 0); + MPFR_ASSERTN(VSIGN (inex) * sign < 0); + } + else + { + /* here |y| should be 0.5*2^emin and the inexact flag should + have the sign of x */ +- MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e) == 0); ++ MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e) == 0); + MPFR_ASSERTN(VSIGN (inex) * sign > 0); + } + } +@@ -72,6 +72,26 @@ + mpfr_clear (y); + } + ++/* a test that fails with GMP_CHECK_RANDOMIZE=1613146232984428 ++ on revision 14429 */ ++static void ++bug20210215 (void) ++{ ++ mpfr_t x, y; ++ int inex; ++ ++ mpfr_init2 (x, 221); ++ mpfr_init2 (y, 1); ++ mpfr_set_str (x, "1.6484611511696130037307738844228498447763863563070374544054791168614e+01", 10, MPFR_RNDN); ++ mpfr_clear_flags (); ++ inex = mpfr_j1 (y, x, MPFR_RNDZ); ++ MPFR_ASSERTN (mpfr_cmp_si_2exp0 (y, -1, -9) == 0); ++ MPFR_ASSERTN (inex > 0); ++ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); ++ mpfr_clear (x); ++ mpfr_clear (y); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -79,6 +99,8 @@ + + tests_start_mpfr (); + ++ bug20210215 (); ++ + test_small (); + + mpfr_init (x); diff --git a/mpfr.spec b/mpfr.spec index 1fac1b3..272dfc9 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -17,6 +17,8 @@ Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # - digamma-hugemem.patch # - digamma-interm-zero.patch # - jn-interm-zero.patch +# - digamma-interm-zero2.patch +# - jyn-asympt-interm-zero.patch Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches # This can be removed when F32 reaches EOL @@ -105,6 +107,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Tue Mar 9 2021 Jerry James - 4.1.0-5 +- Add upstream patches 8-9 + * Wed Feb 17 2021 Jerry James - 4.1.0-4 - Add upstream patches 1-7 From 08cf430d59c65e8b8b75efba05195f61ccedeb96 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Apr 2021 13:34:07 -0600 Subject: [PATCH 21/43] Add upstream patches 10-11. --- allpatches | 850 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mpfr.spec | 12 +- 2 files changed, 860 insertions(+), 2 deletions(-) diff --git a/allpatches b/allpatches index 2f9fa04..e73d95a 100644 --- a/allpatches +++ b/allpatches @@ -1830,3 +1830,853 @@ diff -Naurd mpfr-4.1.0-a/tests/tj1.c mpfr-4.1.0-b/tests/tj1.c test_small (); mpfr_init (x); +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-03-09 13:55:43.183158946 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-03-09 13:55:43.223158508 +0000 +@@ -0,0 +1 @@ ++macros +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-02-17 17:25:46.440981068 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-03-09 13:55:43.223158508 +0000 +@@ -1 +1 @@ +-4.1.0-p9 ++4.1.0-p10 +diff -Naurd mpfr-4.1.0-a/doc/mpfr.info mpfr-4.1.0-b/doc/mpfr.info +--- mpfr-4.1.0-a/doc/mpfr.info 2020-07-10 11:59:13.000000000 +0000 ++++ mpfr-4.1.0-b/doc/mpfr.info 2021-03-09 13:55:51.167071327 +0000 +@@ -3217,7 +3217,11 @@ + + Each function in this interface is also implemented as a macro for + efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the +-macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. ++macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. Note that ++the macro may evaluate arguments multiple times (or none). Moreover, ++macros implementing functions with the ‘void’ return type may not be ++used in contexts where an expression is expected, e.g., inside ++‘for(...)’ or before a comma operator. + + Note 1: MPFR functions may still initialize temporary floating-point + numbers using ‘mpfr_init’ and similar functions. See Custom Allocation +@@ -4579,13 +4583,13 @@ + (line 115) + * mpfr_csch: Transcendental Functions. + (line 180) +-* mpfr_custom_get_exp: Custom Interface. (line 76) +-* mpfr_custom_get_kind: Custom Interface. (line 66) +-* mpfr_custom_get_significand: Custom Interface. (line 71) +-* mpfr_custom_get_size: Custom Interface. (line 37) +-* mpfr_custom_init: Custom Interface. (line 41) +-* mpfr_custom_init_set: Custom Interface. (line 48) +-* mpfr_custom_move: Custom Interface. (line 85) ++* mpfr_custom_get_exp: Custom Interface. (line 80) ++* mpfr_custom_get_kind: Custom Interface. (line 70) ++* mpfr_custom_get_significand: Custom Interface. (line 75) ++* mpfr_custom_get_size: Custom Interface. (line 41) ++* mpfr_custom_init: Custom Interface. (line 45) ++* mpfr_custom_init_set: Custom Interface. (line 52) ++* mpfr_custom_move: Custom Interface. (line 89) + * MPFR_DECL_INIT: Initialization Functions. + (line 77) + * mpfr_digamma: Transcendental Functions. +@@ -5165,19 +5169,19 @@ + Node: Memory Handling Functions155904 + Node: Compatibility with MPF157792 + Node: Custom Interface160961 +-Node: Internals165592 +-Node: API Compatibility167136 +-Node: Type and Macro Changes169084 +-Node: Added Functions172267 +-Node: Changed Functions177074 +-Node: Removed Functions184433 +-Node: Other Changes185163 +-Node: MPFR and the IEEE 754 Standard186864 +-Node: Contributors189481 +-Node: References192620 +-Node: GNU Free Documentation License194501 +-Node: Concept Index217095 +-Node: Function and Type Index223168 ++Node: Internals165852 ++Node: API Compatibility167396 ++Node: Type and Macro Changes169344 ++Node: Added Functions172527 ++Node: Changed Functions177334 ++Node: Removed Functions184693 ++Node: Other Changes185423 ++Node: MPFR and the IEEE 754 Standard187124 ++Node: Contributors189741 ++Node: References192880 ++Node: GNU Free Documentation License194761 ++Node: Concept Index217355 ++Node: Function and Type Index223428 +  + End Tag Table + +diff -Naurd mpfr-4.1.0-a/doc/mpfr.texi mpfr-4.1.0-b/doc/mpfr.texi +--- mpfr-4.1.0-a/doc/mpfr.texi 2020-07-10 11:52:33.000000000 +0000 ++++ mpfr-4.1.0-b/doc/mpfr.texi 2021-03-09 13:55:43.211158639 +0000 +@@ -3817,6 +3817,12 @@ + Each function in this interface is also implemented as a macro for + efficiency reasons: for example @code{mpfr_custom_init (s, p)} + uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function. ++Note that the macro may evaluate arguments multiple times (or none). ++Moreover, macros implementing functions with the @code{void} return type ++may not be used in contexts where an expression is expected, e.g., inside ++@code{for(...)} or before a comma operator. ++@c These limitations with macros cannot be avoided in a C90 compatible way. ++@c In the future, inline functions could be used. + + Note 1: MPFR functions may still initialize temporary floating-point numbers + using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@. +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-02-17 17:25:46.436981105 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-03-09 13:55:43.223158508 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p9" ++#define MPFR_VERSION_STRING "4.1.0-p10" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +@@ -833,23 +833,39 @@ + even if it produces faster and smaller code. */ + #ifndef MPFR_USE_NO_MACRO + +-/* Inlining these functions is both faster and smaller */ +-#define mpfr_nan_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_NAN) +-#define mpfr_inf_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_INF) +-#define mpfr_zero_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_ZERO) +-#define mpfr_regular_p(_x) ((_x)->_mpfr_exp > __MPFR_EXP_INF) ++/* In the implementation of these macros, we need to make sure that the ++ arguments are evaluated one time exactly and that type conversion is ++ done as it would be with a function. Tests should be added to ensure ++ that. ++ Note that the macros for the custom interface are not concerned; the ++ MPFR manual has been clarified. */ ++ ++/* Prevent x from being used as an lvalue. ++ Thanks to Wojtek Lerch and Tim Rentsch for the idea. */ ++#define MPFR_VALUE_OF(x) (0 ? (x) : (x)) ++ ++/* The following macro converts the argument to mpfr_srcptr, as in type ++ conversion for function parameters. But it will detect disallowed ++ implicit conversions, e.g. when the argument has an integer type. */ ++#define MPFR_SRCPTR(x) ((mpfr_srcptr) (0 ? (x) : (mpfr_srcptr) (x))) ++#define MPFR_GET_SIGN(_x) MPFR_VALUE_OF(MPFR_SIGN(MPFR_SRCPTR(_x))) ++ ++#define mpfr_nan_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_NAN) ++#define mpfr_inf_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_INF) ++#define mpfr_zero_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_ZERO) ++#define mpfr_regular_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp > __MPFR_EXP_INF) ++ ++/* mpfr_sgn is documented as a macro, thus the following code is fine. ++ But it would be safer to regard it as a function in some future ++ MPFR version. */ + #define mpfr_sgn(_x) \ + ((_x)->_mpfr_exp < __MPFR_EXP_INF ? \ + (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \ + MPFR_SIGN (_x)) + +-/* Prevent them from using as lvalues */ +-#define MPFR_VALUE_OF(x) (0 ? (x) : (x)) +-#define mpfr_get_prec(_x) MPFR_VALUE_OF((_x)->_mpfr_prec) +-#define mpfr_get_exp(_x) MPFR_VALUE_OF((_x)->_mpfr_exp) +-/* Note 1: If need be, the MPFR_VALUE_OF can be used for other expressions +- (of any type). Thanks to Wojtek Lerch and Tim Rentsch for the idea. +- Note 2: Defining mpfr_get_exp() as a macro has the effect to disable ++#define mpfr_get_prec(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_prec) ++#define mpfr_get_exp(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_exp) ++/* Note: Defining mpfr_get_exp() as a macro has the effect to disable + the check that the argument is a pure FP number (done in the function); + this increases the risk of undetected error and makes debugging more + complex. Is it really worth in practice? (Potential FIXME) */ +@@ -861,11 +877,17 @@ + + #define mpfr_cmp_ui(b,i) mpfr_cmp_ui_2exp((b),(i),0) + #define mpfr_cmp_si(b,i) mpfr_cmp_si_2exp((b),(i),0) +-#define mpfr_set(a,b,r) mpfr_set4(a,b,r,MPFR_SIGN(b)) ++#if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 ++#define mpfr_set(a,b,r) \ ++ __extension__ ({ \ ++ mpfr_srcptr _p = (b); \ ++ mpfr_set4(a,_p,r,MPFR_SIGN(_p)); \ ++ }) ++#endif + #define mpfr_abs(a,b,r) mpfr_set4(a,b,r,1) +-#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_SIGN(c)) ++#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_GET_SIGN(c)) + #define mpfr_setsign(a,b,s,r) mpfr_set4(a,b,r,(s) ? -1 : 1) +-#define mpfr_signbit(x) (MPFR_SIGN(x) < 0) ++#define mpfr_signbit(x) (MPFR_GET_SIGN(x) < 0) + #define mpfr_cmp(b, c) mpfr_cmp3(b, c, 1) + #define mpfr_mul_2exp(y,x,n,r) mpfr_mul_2ui((y),(x),(n),(r)) + #define mpfr_div_2exp(y,x,n,r) mpfr_div_2ui((y),(x),(n),(r)) +diff -Naurd mpfr-4.1.0-a/src/ubf.c mpfr-4.1.0-b/src/ubf.c +--- mpfr-4.1.0-a/src/ubf.c 2020-02-12 01:38:57.000000000 +0000 ++++ mpfr-4.1.0-b/src/ubf.c 2021-03-09 13:55:43.211158639 +0000 +@@ -78,7 +78,7 @@ + mpfr_get_prec (b), mpfr_log_prec, b, + mpfr_get_prec (c), mpfr_log_prec, c), + ("a[%Pu]=%.*Rg", +- mpfr_get_prec (a), mpfr_log_prec, a)); ++ mpfr_get_prec ((mpfr_ptr) a), mpfr_log_prec, a)); + + MPFR_ASSERTD ((mpfr_ptr) a != b); + MPFR_ASSERTD ((mpfr_ptr) a != c); +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-02-17 17:25:46.440981068 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-03-09 13:55:43.223158508 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p9"; ++ return "4.1.0-p10"; + } +diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h +--- mpfr-4.1.0-a/tests/mpfr-test.h 2021-02-17 17:25:46.424981219 +0000 ++++ mpfr-4.1.0-b/tests/mpfr-test.h 2021-03-09 13:55:43.211158639 +0000 +@@ -92,6 +92,32 @@ + #define STRINGIZE(S) #S + #define MAKE_STR(S) STRINGIZE(S) + ++/* In C (but not C++), mpfr_ptr and mpfr_srcptr arguments can be provided ++ in a different pointer type, such as void *. For functions implemented ++ as macros, the type conversion for the function parameters will not be ++ done by the compiler, which means potential bugs in these implementations ++ if we forget to take these unusual cases into account. So we need to test ++ such arguments, in order to make sure that the arguments are converted to ++ the expected type when needed. ++ ++ However, at least when the function is not implemented as a macro (which ++ is the case when MPFR_USE_NO_MACRO is defined), such tests with void * ++ arguments are not valid in C++; therefore, we will not do the cast to ++ void * if the __cplusplus macro is defined. And with GCC compilers (and ++ compatible), we will ignore the -Wc++-compat option around these tests. ++ ++ Note: in the future, inline functions could be used instead of macros, ++ and such tests would become useless (except to detect compiler bugs). ++*/ ++#if defined (__cplusplus) ++#define VOIDP_CAST(X) (X) ++#else ++#define VOIDP_CAST(X) ((void *) (X)) ++#if defined (__GNUC__) ++#define IGNORE_CPP_COMPAT ++#endif ++#endif ++ + #if defined (__cplusplus) + extern "C" { + #endif +diff -Naurd mpfr-4.1.0-a/tests/tcopysign.c mpfr-4.1.0-b/tests/tcopysign.c +--- mpfr-4.1.0-a/tests/tcopysign.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tcopysign.c 2021-03-09 13:55:43.211158639 +0000 +@@ -26,26 +26,72 @@ + copysign_variant (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y, + mpfr_rnd_t rnd_mode, int k) + { ++ mpfr_srcptr p; ++ int a = 0, b = 0, c = 0; ++ ++ /* invalid sign, to test that the sign is always correctly set */ ++ MPFR_SIGN (z) = 0; ++ ++ if (k >= 8) ++ { ++ MPFR_ASSERTN (MPFR_PREC (z) >= MPFR_PREC (x)); ++ mpfr_set (z, x, MPFR_RNDN); ++ p = z; ++ k -= 8; ++ } ++ else ++ p = x; ++ + mpfr_clear_flags (); + switch (k) + { + case 0: +- mpfr_copysign (z, x, y, MPFR_RNDN); ++ mpfr_copysign (z, p, y, rnd_mode); + return; + case 1: +- (mpfr_copysign) (z, x, y, MPFR_RNDN); ++ (mpfr_copysign) (z, p, y, rnd_mode); + return; + case 2: +- mpfr_setsign (z, x, mpfr_signbit (y), MPFR_RNDN); ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wc++-compat" ++#endif ++ mpfr_copysign ((a++, VOIDP_CAST(z)), ++ (b++, VOIDP_CAST(p)), ++ (c++, VOIDP_CAST(y)), rnd_mode); ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic pop ++#endif ++ MPFR_ASSERTN (a == 1); ++ MPFR_ASSERTN (b == 1); ++ MPFR_ASSERTN (c == 1); + return; + case 3: +- mpfr_setsign (z, x, (mpfr_signbit) (y), MPFR_RNDN); ++ mpfr_setsign (z, p, mpfr_signbit (y), rnd_mode); + return; + case 4: +- (mpfr_setsign) (z, x, mpfr_signbit (y), MPFR_RNDN); ++ mpfr_setsign (z, p, (mpfr_signbit) (y), rnd_mode); + return; + case 5: +- (mpfr_setsign) (z, x, (mpfr_signbit) (y), MPFR_RNDN); ++ (mpfr_setsign) (z, p, mpfr_signbit (y), rnd_mode); ++ return; ++ case 6: ++ (mpfr_setsign) (z, p, (mpfr_signbit) (y), rnd_mode); ++ return; ++ case 7: ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wc++-compat" ++#endif ++ mpfr_setsign ((a++, VOIDP_CAST(z)), ++ (b++, VOIDP_CAST(p)), ++ mpfr_signbit ((c++, VOIDP_CAST(y))), rnd_mode); ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic pop ++#endif ++ MPFR_ASSERTN (a == 1); ++ MPFR_ASSERTN (b == 1); ++ MPFR_ASSERTN (c == 1); + return; + } + } +@@ -64,7 +110,7 @@ + + for (i = 0; i <= 1; i++) + for (j = 0; j <= 1; j++) +- for (k = 0; k <= 5; k++) ++ for (k = 0; k < 16; k++) + { + mpfr_set_nan (x); + i ? MPFR_SET_NEG (x) : MPFR_SET_POS (x); +diff -Naurd mpfr-4.1.0-a/tests/texceptions.c mpfr-4.1.0-b/tests/texceptions.c +--- mpfr-4.1.0-a/tests/texceptions.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/texceptions.c 2021-03-09 13:55:43.211158639 +0000 +@@ -103,10 +103,26 @@ + check_get_prec (void) + { + mpfr_t x; ++ int i = 0; + + mpfr_init2 (x, 17); +- if (mpfr_get_prec (x) != 17 || (mpfr_get_prec)(x) != 17) ++ ++ if (mpfr_get_prec (x) != 17 || (mpfr_get_prec) (x) != 17) + PRINT_ERROR ("mpfr_get_prec"); ++ ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wc++-compat" ++#endif ++ ++ if (mpfr_get_prec ((i++, VOIDP_CAST(x))) != 17) ++ PRINT_ERROR ("mpfr_get_prec (2)"); ++ ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic pop ++#endif ++ ++ MPFR_ASSERTN (i == 1); + mpfr_clear (x); + } + +diff -Naurd mpfr-4.1.0-a/tests/tisnan.c mpfr-4.1.0-b/tests/tisnan.c +--- mpfr-4.1.0-a/tests/tisnan.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tisnan.c 2021-03-09 13:55:43.211158639 +0000 +@@ -27,180 +27,235 @@ + main (void) + { + mpfr_t x; ++ int i = 0, j = 0; ++ ++ /* We need to check that when the function is implemented by a macro, ++ it behaves correctly. */ ++#define ARG (i++, VOIDP_CAST(x)) ++#define CHECK MPFR_ASSERTN (i == ++j) + + tests_start_mpfr (); + + mpfr_init (x); + ++#if 0 ++ /* The following should yield a compilation error when the functions ++ are implemented as macros. Change 0 to 1 above in order to test. */ ++ (void) (mpfr_nan_p (1L)); ++ (void) (mpfr_inf_p (1L)); ++ (void) (mpfr_number_p (1L)); ++ (void) (mpfr_zero_p (1L)); ++ (void) (mpfr_regular_p (1L)); ++#endif ++ ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wc++-compat" ++#endif ++ + /* check +infinity gives non-zero for mpfr_inf_p only */ + mpfr_set_ui (x, 1L, MPFR_RNDZ); + mpfr_div_ui (x, x, 0L, MPFR_RNDZ); +- if (mpfr_nan_p (x) || (mpfr_nan_p) (x) ) ++ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) + { + printf ("Error: mpfr_nan_p(+Inf) gives non-zero\n"); + exit (1); + } +- if (mpfr_inf_p (x) == 0) ++ CHECK; ++ if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG)) + { + printf ("Error: mpfr_inf_p(+Inf) gives zero\n"); + exit (1); + } +- if (mpfr_number_p (x) || (mpfr_number_p) (x) ) ++ CHECK; ++ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG)) + { + printf ("Error: mpfr_number_p(+Inf) gives non-zero\n"); + exit (1); + } +- if (mpfr_zero_p (x) || (mpfr_zero_p) (x) ) ++ CHECK; ++ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) + { + printf ("Error: mpfr_zero_p(+Inf) gives non-zero\n"); + exit (1); + } +- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) ++ CHECK; ++ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) + { + printf ("Error: mpfr_regular_p(+Inf) gives non-zero\n"); + exit (1); + } ++ CHECK; + + /* same for -Inf */ + mpfr_neg (x, x, MPFR_RNDN); +- if (mpfr_nan_p (x) || (mpfr_nan_p(x))) ++ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) + { + printf ("Error: mpfr_nan_p(-Inf) gives non-zero\n"); + exit (1); + } +- if (mpfr_inf_p (x) == 0) ++ CHECK; ++ if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG)) + { + printf ("Error: mpfr_inf_p(-Inf) gives zero\n"); + exit (1); + } +- if (mpfr_number_p (x) || (mpfr_number_p)(x) ) ++ CHECK; ++ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG)) + { + printf ("Error: mpfr_number_p(-Inf) gives non-zero\n"); + exit (1); + } +- if (mpfr_zero_p (x) || (mpfr_zero_p)(x) ) ++ CHECK; ++ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) + { + printf ("Error: mpfr_zero_p(-Inf) gives non-zero\n"); + exit (1); + } +- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) ++ CHECK; ++ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) + { + printf ("Error: mpfr_regular_p(-Inf) gives non-zero\n"); + exit (1); + } ++ CHECK; + + /* same for NaN */ + mpfr_sub (x, x, x, MPFR_RNDN); +- if (mpfr_nan_p (x) == 0) ++ if (!mpfr_nan_p (x) || !(mpfr_nan_p) (x) || !mpfr_nan_p (ARG)) + { + printf ("Error: mpfr_nan_p(NaN) gives zero\n"); + exit (1); + } +- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) ++ CHECK; ++ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) + { + printf ("Error: mpfr_inf_p(NaN) gives non-zero\n"); + exit (1); + } +- if (mpfr_number_p (x) || (mpfr_number_p) (x) ) ++ CHECK; ++ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG)) + { + printf ("Error: mpfr_number_p(NaN) gives non-zero\n"); + exit (1); + } +- if (mpfr_zero_p (x) || (mpfr_zero_p)(x) ) ++ CHECK; ++ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) + { + printf ("Error: mpfr_number_p(NaN) gives non-zero\n"); + exit (1); + } +- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) ++ CHECK; ++ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) + { + printf ("Error: mpfr_regular_p(NaN) gives non-zero\n"); + exit (1); + } ++ CHECK; + + /* same for a regular number */ + mpfr_set_ui (x, 1, MPFR_RNDN); +- if (mpfr_nan_p (x) || (mpfr_nan_p)(x)) ++ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) + { + printf ("Error: mpfr_nan_p(1) gives non-zero\n"); + exit (1); + } +- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) ++ CHECK; ++ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) + { + printf ("Error: mpfr_inf_p(1) gives non-zero\n"); + exit (1); + } +- if (mpfr_number_p (x) == 0) ++ CHECK; ++ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG)) + { + printf ("Error: mpfr_number_p(1) gives zero\n"); + exit (1); + } +- if (mpfr_zero_p (x) || (mpfr_zero_p) (x) ) ++ CHECK; ++ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) + { + printf ("Error: mpfr_zero_p(1) gives non-zero\n"); + exit (1); + } +- if (mpfr_regular_p (x) == 0 || (mpfr_regular_p) (x) == 0) ++ CHECK; ++ if (!mpfr_regular_p (x) || !(mpfr_regular_p) (x) || !mpfr_regular_p (ARG)) + { + printf ("Error: mpfr_regular_p(1) gives zero\n"); + exit (1); + } ++ CHECK; + + /* Same for +0 */ + mpfr_set_ui (x, 0, MPFR_RNDN); +- if (mpfr_nan_p (x) || (mpfr_nan_p)(x)) ++ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) + { + printf ("Error: mpfr_nan_p(+0) gives non-zero\n"); + exit (1); + } +- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) ++ CHECK; ++ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) + { + printf ("Error: mpfr_inf_p(+0) gives non-zero\n"); + exit (1); + } +- if (mpfr_number_p (x) == 0) ++ CHECK; ++ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG)) + { + printf ("Error: mpfr_number_p(+0) gives zero\n"); + exit (1); + } +- if (mpfr_zero_p (x) == 0 ) ++ CHECK; ++ if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG)) + { + printf ("Error: mpfr_zero_p(+0) gives zero\n"); + exit (1); + } +- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) ++ CHECK; ++ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) + { + printf ("Error: mpfr_regular_p(+0) gives non-zero\n"); + exit (1); + } ++ CHECK; + + /* Same for -0 */ + mpfr_set_ui (x, 0, MPFR_RNDN); + mpfr_neg (x, x, MPFR_RNDN); +- if (mpfr_nan_p (x) || (mpfr_nan_p)(x)) ++ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) + { + printf ("Error: mpfr_nan_p(-0) gives non-zero\n"); + exit (1); + } +- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) ++ CHECK; ++ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) + { + printf ("Error: mpfr_inf_p(-0) gives non-zero\n"); + exit (1); + } +- if (mpfr_number_p (x) == 0) ++ CHECK; ++ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG)) + { + printf ("Error: mpfr_number_p(-0) gives zero\n"); + exit (1); + } +- if (mpfr_zero_p (x) == 0 ) ++ CHECK; ++ if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG)) + { + printf ("Error: mpfr_zero_p(-0) gives zero\n"); + exit (1); + } +- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) ++ CHECK; ++ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) + { + printf ("Error: mpfr_regular_p(-0) gives non-zero\n"); + exit (1); + } ++ CHECK; ++ ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic pop ++#endif + + mpfr_clear (x); + +diff -Naurd mpfr-4.1.0-a/tests/tset.c mpfr-4.1.0-b/tests/tset.c +--- mpfr-4.1.0-a/tests/tset.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tset.c 2021-03-09 13:55:43.207158683 +0000 +@@ -207,7 +207,7 @@ + static void + check_ternary_value (void) + { +- int p, q, rnd; ++ int k, p, q, rnd; + int inexact, cmp; + mpfr_t x, y; + +@@ -226,28 +226,45 @@ + { + if (rnd == MPFR_RNDF) /* the test below makes no sense */ + continue; +- inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd); +- cmp = mpfr_cmp (y, x); +- if (((inexact == 0) && (cmp != 0)) || +- ((inexact > 0) && (cmp <= 0)) || +- ((inexact < 0) && (cmp >= 0))) +- { +- printf ("Wrong ternary value in mpfr_set for %s: expected" +- " %d, got %d\n", +- mpfr_print_rnd_mode ((mpfr_rnd_t) rnd), cmp, +- inexact); +- exit (1); +- } +- /* Test mpfr_set function too */ +- inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd); +- cmp = mpfr_cmp (y, x); +- if (((inexact == 0) && (cmp != 0)) || +- ((inexact > 0) && (cmp <= 0)) || +- ((inexact < 0) && (cmp >= 0))) ++ for (k = 0; k < 3; k++) + { +- printf ("Wrong ternary value in mpfr_set(2): expected %d," +- " got %d\n", cmp, inexact); +- exit (1); ++ int a = 0, b = 0, c = 0; ++ ++ switch (k) ++ { ++ case 0: ++ inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd); ++ break; ++ case 1: ++ inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd); ++ break; ++ case 2: ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wc++-compat" ++#endif ++ inexact = mpfr_set ((a++, VOIDP_CAST(y)), ++ (b++, VOIDP_CAST(x)), ++ (c++, (mpfr_rnd_t) rnd)); ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic pop ++#endif ++ MPFR_ASSERTN (a == 1); ++ MPFR_ASSERTN (b == 1); ++ MPFR_ASSERTN (c == 1); ++ break; ++ } ++ cmp = mpfr_cmp (y, x); ++ if (((inexact == 0) && (cmp != 0)) || ++ ((inexact > 0) && (cmp <= 0)) || ++ ((inexact < 0) && (cmp >= 0))) ++ { ++ printf ("Wrong ternary value in mpfr_set for %s (%d):" ++ " expected %d, got %d\n", ++ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd), ++ k, cmp, inexact); ++ exit (1); ++ } + } + } + } +diff -Naurd mpfr-4.1.0-a/tests/tset_exp.c mpfr-4.1.0-b/tests/tset_exp.c +--- mpfr-4.1.0-a/tests/tset_exp.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tset_exp.c 2021-03-09 13:55:43.211158639 +0000 +@@ -28,6 +28,7 @@ + mpfr_t x; + int ret; + mpfr_exp_t emin, emax, e; ++ int i = 0; + + tests_start_mpfr (); + +@@ -63,6 +64,17 @@ + e = (mpfr_get_exp) (x); + MPFR_ASSERTN (e == emin); + ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wc++-compat" ++#endif ++ e = mpfr_get_exp ((i++, VOIDP_CAST(x))); ++#ifdef IGNORE_CPP_COMPAT ++#pragma GCC diagnostic pop ++#endif ++ MPFR_ASSERTN (e == emin); ++ MPFR_ASSERTN (i == 1); ++ + ret = mpfr_set_exp (x, -1); + MPFR_ASSERTN (ret == 0 && mpfr_cmp_ui_2exp (x, 1, -2) == 0); + +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-03-09 13:58:00.889650773 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-03-09 13:58:00.937650249 +0000 +@@ -0,0 +1 @@ ++tset_sij +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-03-09 13:55:43.223158508 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-03-09 13:58:00.937650249 +0000 +@@ -1 +1 @@ +-4.1.0-p10 ++4.1.0-p11 +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-03-09 13:55:43.223158508 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-03-09 13:58:00.933650293 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p10" ++#define MPFR_VERSION_STRING "4.1.0-p11" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-03-09 13:55:43.223158508 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-03-09 13:58:00.933650293 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p10"; ++ return "4.1.0-p11"; + } +diff -Naurd mpfr-4.1.0-a/tests/tset_si.c mpfr-4.1.0-b/tests/tset_si.c +--- mpfr-4.1.0-a/tests/tset_si.c 2020-03-26 11:51:33.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tset_si.c 2021-03-09 13:58:00.917650467 +0000 +@@ -127,27 +127,29 @@ + power of 2 is exact, unless underflow/overflow occurs. + The tests on the exponent below avoid integer overflows + (ep[i] may take extreme values). */ +- e = mpfr_get_exp (x1); + mpfr_clear_flags (); +- if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ ++ if (j == 0) ++ goto zero; ++ e = MPFR_GET_EXP (x1); ++ if (ep[i] < __gmpfr_emin - e) /* underflow */ + { + mpfr_rnd_t r = + (rnd == MPFR_RNDN && +- (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || ++ (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 || + IS_POW2 (sign * j))) ? + MPFR_RNDZ : (mpfr_rnd_t) rnd; + inex1 = mpfr_underflow (x1, r, sign); + flags1 = __gmpfr_flags; + } +- else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ ++ else if (ep[i] > __gmpfr_emax - e) /* overflow */ + { + inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); + flags1 = __gmpfr_flags; + } + else + { +- if (j != 0) +- mpfr_set_exp (x1, ep[i] + e); ++ mpfr_set_exp (x1, ep[i] + e); ++ zero: + flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; + } + +diff -Naurd mpfr-4.1.0-a/tests/tset_sj.c mpfr-4.1.0-b/tests/tset_sj.c +--- mpfr-4.1.0-a/tests/tset_sj.c 2020-06-01 10:39:52.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tset_sj.c 2021-03-09 13:58:00.917650467 +0000 +@@ -225,27 +225,29 @@ + power of 2 is exact, unless underflow/overflow occurs. + The tests on the exponent below avoid integer overflows + (ep[i] may take extreme values). */ +- e = mpfr_get_exp (x1); + mpfr_clear_flags (); +- if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ ++ if (j == 0) ++ goto zero; ++ e = MPFR_GET_EXP (x1); ++ if (ep[i] < __gmpfr_emin - e) /* underflow */ + { + mpfr_rnd_t r = + (rnd == MPFR_RNDN && +- (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || ++ (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 || + IS_POW2 (sign * j))) ? + MPFR_RNDZ : (mpfr_rnd_t) rnd; + inex1 = mpfr_underflow (x1, r, sign); + flags1 = __gmpfr_flags; + } +- else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ ++ else if (ep[i] > __gmpfr_emax - e) /* overflow */ + { + inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); + flags1 = __gmpfr_flags; + } + else + { +- if (j != 0) +- mpfr_set_exp (x1, ep[i] + e); ++ mpfr_set_exp (x1, ep[i] + e); ++ zero: + flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; + } + } diff --git a/mpfr.spec b/mpfr.spec index 272dfc9..005bf29 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,11 +1,14 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ -BuildRequires: gmp-devel gcc make +BuildRequires: gcc +BuildRequires: gmp-devel +BuildRequires: make +BuildRequires: texinfo Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz @@ -19,6 +22,8 @@ Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # - jn-interm-zero.patch # - digamma-interm-zero2.patch # - jyn-asympt-interm-zero.patch +# - macros.patch +# - tset_sij.patch Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches # This can be removed when F32 reaches EOL @@ -107,6 +112,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Tue Apr 13 2021 Jerry James - 4.1.0-6 +- Add upstream patches 10-11 + * Tue Mar 9 2021 Jerry James - 4.1.0-5 - Add upstream patches 8-9 From f1eb89ef0d14384610d83f64d8b58cdd65358a5d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Sat, 22 May 2021 20:24:48 -0600 Subject: [PATCH 22/43] Add upstream patches 12-13. --- allpatches | 294 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mpfr.spec | 7 +- 2 files changed, 300 insertions(+), 1 deletion(-) diff --git a/allpatches b/allpatches index e73d95a..3ecb16f 100644 --- a/allpatches +++ b/allpatches @@ -2680,3 +2680,297 @@ diff -Naurd mpfr-4.1.0-a/tests/tset_sj.c mpfr-4.1.0-b/tests/tset_sj.c flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; } } +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-04-23 09:49:34.648281897 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-04-23 09:49:34.696281616 +0000 +@@ -0,0 +1 @@ ++get_str_ndigits +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-03-09 13:58:00.937650249 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-04-23 09:49:34.696281616 +0000 +@@ -1 +1 @@ +-4.1.0-p11 ++4.1.0-p12 +diff -Naurd mpfr-4.1.0-a/src/get_str.c mpfr-4.1.0-b/src/get_str.c +--- mpfr-4.1.0-a/src/get_str.c 2020-06-18 17:17:18.000000000 +0000 ++++ mpfr-4.1.0-b/src/get_str.c 2021-04-23 09:49:34.680281710 +0000 +@@ -2484,6 +2484,8 @@ + size_t + mpfr_get_str_ndigits (int b, mpfr_prec_t p) + { ++ MPFR_SAVE_EXPO_DECL (expo); ++ + MPFR_ASSERTN (2 <= b && b <= 62); + + /* deal first with power of two bases, since even for those, mpfr_ceil_mul +@@ -2497,17 +2499,26 @@ + return 1 + (p + k - 2) / k; + } + ++ MPFR_SAVE_EXPO_MARK (expo); ++ + /* the value returned by mpfr_ceil_mul is guaranteed to be + 1 + ceil(p*log(2)/log(b)) for p < 186564318007 (it returns one more + for p=186564318007 and b=7 or 49) */ + MPFR_STAT_STATIC_ASSERT (MPFR_PREC_BITS >= 64 || MPFR_PREC_BITS <= 32); ++ if + #if MPFR_PREC_BITS >= 64 + /* 64-bit numbers are supported by the C implementation, so that we can + use the large constant below. If MPFR_PREC_BITS <= 32, the condition + is always satisfied, so that we do not need any test. */ +- if (MPFR_LIKELY (p < 186564318007)) ++ (MPFR_LIKELY (p < 186564318007)) ++#else ++ (1) + #endif +- return 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1); ++ { ++ size_t ret = 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1); ++ MPFR_SAVE_EXPO_FREE (expo); ++ return ret; ++ } + + /* Now p is large and b is not a power of two. The code below works for any + value of p and b, as long as b is not a power of two. Indeed, in such a +@@ -2541,6 +2552,8 @@ + mpfr_clear (d); + mpfr_clear (u); + } ++ ++ MPFR_SAVE_EXPO_FREE (expo); + return 1 + ret; + } + } +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-03-09 13:58:00.933650293 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-04-23 09:49:34.692281639 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p11" ++#define MPFR_VERSION_STRING "4.1.0-p12" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-03-09 13:58:00.933650293 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-04-23 09:49:34.696281616 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p11"; ++ return "4.1.0-p12"; + } +diff -Naurd mpfr-4.1.0-a/tests/tget_str.c mpfr-4.1.0-b/tests/tget_str.c +--- mpfr-4.1.0-a/tests/tget_str.c 2020-01-08 18:11:13.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tget_str.c 2021-04-23 09:49:34.680281710 +0000 +@@ -1311,6 +1311,33 @@ + mpfr_clear (x); + } + ++static void ++test_ndigits_aux (int b, mpfr_prec_t p, size_t expected_m) ++{ ++ size_t m; ++ mpfr_exp_t old_emin, old_emax, e[] = { MPFR_EMIN_MIN, 0, MPFR_EMAX_MAX }; ++ mpfr_flags_t flags; ++ int i; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ i = randlimb () % (numberof (e) + 1); ++ if (i < numberof (e)) ++ { ++ set_emin (e[i]); ++ set_emax (e[i]); ++ } ++ ++ __gmpfr_flags = flags = randlimb () & MPFR_FLAGS_ALL; ++ m = mpfr_get_str_ndigits (b, p); ++ MPFR_ASSERTN (m == expected_m); ++ MPFR_ASSERTN (__gmpfr_flags == flags); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + /* test of mpfr_get_str_ndigits */ + static void + test_ndigits (void) +@@ -1319,61 +1346,61 @@ + + /* for b=2, we have 1 + ceil((p-1)*log(2)/log(b)) = p */ + for (p = MPFR_PREC_MIN; p <= 1024; p++) +- MPFR_ASSERTN(mpfr_get_str_ndigits (2, p) == p); ++ test_ndigits_aux (2, p, p); + + /* for b=4, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/2) + = 1 + floor(p/2) */ + for (p = MPFR_PREC_MIN; p <= 1024; p++) +- MPFR_ASSERTN(mpfr_get_str_ndigits (4, p) == 1 + (p / 2)); ++ test_ndigits_aux (4, p, 1 + (p / 2)); + + /* for b=8, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/3) + = 1 + floor((p+1)/3) */ + for (p = MPFR_PREC_MIN; p <= 1024; p++) +- MPFR_ASSERTN(mpfr_get_str_ndigits (8, p) == 1 + ((p + 1) / 3)); ++ test_ndigits_aux (8, p, 1 + ((p + 1) / 3)); + + /* for b=16, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/4) + = 1 + floor((p+2)/4) */ + for (p = MPFR_PREC_MIN; p <= 1024; p++) +- MPFR_ASSERTN(mpfr_get_str_ndigits (16, p) == 1 + ((p + 2) / 4)); ++ test_ndigits_aux (16, p, 1 + ((p + 2) / 4)); + + /* for b=32, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/5) + = 1 + floor((p+3)/5) */ + for (p = MPFR_PREC_MIN; p <= 1024; p++) +- MPFR_ASSERTN(mpfr_get_str_ndigits (32, p) == 1 + ((p + 3) / 5)); ++ test_ndigits_aux (32, p, 1 + ((p + 3) / 5)); + + /* error < 1e-3 */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (57, 35) == 8); ++ test_ndigits_aux (57, 35, 8); + + /* error < 1e-4 */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (31, 649) == 133); ++ test_ndigits_aux (31, 649, 133); + + /* error < 1e-5 */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (43, 5041) == 931); ++ test_ndigits_aux (43, 5041, 931); + + /* error < 1e-6 */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (41, 17771) == 3319); ++ test_ndigits_aux (41, 17771, 3319); + + /* 20th convergent of log(2)/log(3) */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 630138897) == 397573381); ++ test_ndigits_aux (3, 630138897, 397573381); + + #if MPFR_PREC_BITS >= 64 + /* 21st convergent of log(2)/log(3) */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 9809721694) == 6189245292); ++ test_ndigits_aux (3, 9809721694, 6189245292); + + /* 22nd convergent of log(2)/log(3) */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 10439860591) == 6586818672); ++ test_ndigits_aux (3, 10439860591, 6586818672); + + /* 23rd convergent of log(2)/log(3) */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 103768467013) == 65470613322); ++ test_ndigits_aux (3, 103768467013, 65470613322); + + /* 24th convergent of log(2)/log(3) */ +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 217976794617) == 137528045314); ++ test_ndigits_aux (3, 217976794617, 137528045314); + +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 1193652440098) == 753110839882); ++ test_ndigits_aux (3, 1193652440098, 753110839882); + +- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 683381996816440) == 431166034846569); ++ test_ndigits_aux (3, 683381996816440, 431166034846569); + +- MPFR_ASSERTN(mpfr_get_str_ndigits (7, 186564318007) == 66455550933); ++ test_ndigits_aux (7, 186564318007, 66455550933); + #endif + } + +diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES +--- mpfr-4.1.0-a/PATCHES 2021-05-17 16:09:00.574477185 +0000 ++++ mpfr-4.1.0-b/PATCHES 2021-05-17 16:09:00.754476587 +0000 +@@ -0,0 +1 @@ ++vasprintf-prec-zero +diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION +--- mpfr-4.1.0-a/VERSION 2021-04-23 09:49:34.696281616 +0000 ++++ mpfr-4.1.0-b/VERSION 2021-05-17 16:09:00.754476587 +0000 +@@ -1 +1 @@ +-4.1.0-p12 ++4.1.0-p13 +diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h +--- mpfr-4.1.0-a/src/mpfr.h 2021-04-23 09:49:34.692281639 +0000 ++++ mpfr-4.1.0-b/src/mpfr.h 2021-05-17 16:09:00.754476587 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.1.0-p12" ++#define MPFR_VERSION_STRING "4.1.0-p13" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c +--- mpfr-4.1.0-a/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000 ++++ mpfr-4.1.0-b/src/vasprintf.c 2021-05-17 16:09:00.598477107 +0000 +@@ -635,7 +635,13 @@ + static int + buffer_cat (struct string_buffer *b, const char *s, size_t len) + { +- MPFR_ASSERTD (len > 0); ++ /* If len == 0, which is possible when outputting an integer 0 ++ (either a native one or mpfr_prec_t) with precision field = 0, ++ do nothing. This test is not necessary since the code below is ++ valid for len == 0, but this is safer, just in case. */ ++ if (len == 0) ++ return 0; ++ + MPFR_ASSERTD (len <= strlen (s)); + + if (buffer_incr_len (b, len)) +diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c +--- mpfr-4.1.0-a/src/version.c 2021-04-23 09:49:34.696281616 +0000 ++++ mpfr-4.1.0-b/src/version.c 2021-05-17 16:09:00.754476587 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.0-p12"; ++ return "4.1.0-p13"; + } +diff -Naurd mpfr-4.1.0-a/tests/tsprintf.c mpfr-4.1.0-b/tests/tsprintf.c +--- mpfr-4.1.0-a/tests/tsprintf.c 2020-04-08 22:39:35.000000000 +0000 ++++ mpfr-4.1.0-b/tests/tsprintf.c 2021-05-17 16:09:00.598477107 +0000 +@@ -193,6 +193,10 @@ + sprintf (buf, "%d", i); + check_vsprintf (buf, "%d", i); + ++ check_vsprintf ("0", "%d", 0); ++ check_vsprintf ("", "%.d", 0); ++ check_vsprintf ("", "%.0d", 0); ++ + sprintf (buf, "%e", d); + check_vsprintf (buf, "%e", d); + +@@ -227,9 +231,6 @@ + mpfr_prec_t p = 128; + mpfr_t x, y, z; + +- mpfr_init (z); +- mpfr_init2 (x, p); +- + /* specifier 'P' for precision */ + check_vsprintf ("128", "%Pu", p); + check_vsprintf ("00128", "%.5Pu", p); +@@ -247,9 +248,19 @@ + check_vsprintf ("0200:", "%0#+ -Po:", p); + check_vsprintf ("+0000128 :", "%0+ *.*Pd:", -9, 7, p); + check_vsprintf ("+12345 :", "%0+ -*.*Pd:", -9, -3, (mpfr_prec_t) 12345); ++ check_vsprintf ("0", "%Pu", (mpfr_prec_t) 0); + /* Do not add a test like "%05.1Pd" as MS Windows is buggy: when + a precision is given, the '0' flag must be ignored. */ + ++ /* specifier 'P' with precision field 0 */ ++ check_vsprintf ("128", "%.Pu", p); ++ check_vsprintf ("128", "%.0Pd", p); ++ /* check_vsprintf ("", "%.Pu", (mpfr_prec_t) 0); */ ++ check_vsprintf ("", "%.0Pd", (mpfr_prec_t) 0); ++ ++ mpfr_init (z); ++ mpfr_init2 (x, 128); ++ + /* special numbers */ + mpfr_set_inf (x, 1); + check_sprintf (pinf_str, "%Re", x); diff --git a/mpfr.spec b/mpfr.spec index 005bf29..1ec14db 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 6%{?dist} +Release: 7%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -24,6 +24,8 @@ Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # - jyn-asympt-interm-zero.patch # - macros.patch # - tset_sij.patch +# - get_str_ndigits.patch +# - vasprintf-prec-zero.patch Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches # This can be removed when F32 reaches EOL @@ -112,6 +114,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Sat May 22 2021 Jerry James - 4.1.0-7 +- Add upstream patches 12-13 + * Tue Apr 13 2021 Jerry James - 4.1.0-6 - Add upstream patches 10-11 From 4a657d60454c2ead67b2521013f220143e041895 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:28:11 +0000 Subject: [PATCH 23/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 1ec14db..b791a83 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 7%{?dist} +Release: 8%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -114,6 +114,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 4.1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Sat May 22 2021 Jerry James - 4.1.0-7 - Add upstream patches 12-13 From d80e858fdc1fd0c371f1fe97dd1cdd8f7d10c709 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 14 Jan 2022 13:13:19 -0700 Subject: [PATCH 24/43] Remove old obsoletes used in the 3.x to 4.x transition. --- mpfr.rpmlintrc | 5 ----- mpfr.spec | 11 +++-------- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 mpfr.rpmlintrc diff --git a/mpfr.rpmlintrc b/mpfr.rpmlintrc deleted file mode 100644 index 1379528..0000000 --- a/mpfr.rpmlintrc +++ /dev/null @@ -1,5 +0,0 @@ -# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON -# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors - -# Documentation is in the -doc subpackage -addFilter(r'^mpfr.?-devel\.[^:]+: W: no-documentation') diff --git a/mpfr.spec b/mpfr.spec index b791a83..2b0a053 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -28,10 +28,6 @@ Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # - vasprintf-prec-zero.patch Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches -# This can be removed when F32 reaches EOL -Obsoletes: mpfr3 < 4.0.0 -Provides: mpfr3 = %{version}-%{release} - %description The MPFR library is a C library for multiple-precision floating-point computations with "correct rounding". The MPFR is efficient and @@ -44,10 +40,6 @@ Summary: Development files for the MPFR library Requires: %{name}%{?_isa} = %{version}-%{release} Requires: gmp-devel%{?_isa} -# This can be removed when F32 reaches EOL -Obsoletes: mpfr3-devel < 4.0.0 -Provides: mpfr3-devel = %{version}-%{release} - %description devel Header files and documentation for using the MPFR multiple-precision floating-point library in applications. @@ -114,6 +106,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Fri Jan 14 2022 Jerry James - 4.1.0-8 +- Remove old obsoletes used in the 3.x to 4.x transition + * Thu Jul 22 2021 Fedora Release Engineering - 4.1.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 4290d2859530ca83ffd85c0465292d2ef48c405c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:30:59 +0000 Subject: [PATCH 25/43] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 2b0a053..b2c3bce 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 8%{?dist} +Release: 9%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -106,6 +106,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 4.1.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jan 14 2022 Jerry James - 4.1.0-8 - Remove old obsoletes used in the 3.x to 4.x transition From ed735e8d2c9b0bb2b47683796b242937319254eb Mon Sep 17 00:00:00 2001 From: Jerry James Date: Mon, 18 Jul 2022 13:59:56 -0600 Subject: [PATCH 26/43] Add README.md. --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..5a022dd --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# mpfr + +The [MPFR library](https://www.mpfr.org/) is a C library for +multiple-precision floating-point computations with _correct rounding_. MPFR +has continuously been supported by [INRIA](https://www.inria.fr/) and the +current main authors come from the [Caramba](https://caramba.loria.fr/) and +[AriC](http://www.ens-lyon.fr/LIP/AriC/) project teams at +[Loria](https://www.loria.fr/) (Nancy, France) and +[LIP](http://www.ens-lyon.fr/LIP/) (Lyon, France) respectively; see more on +the [credit page](https://www.mpfr.org/credit.html). MPFR is based on the +[GMP](https://gmplib.org/) multiple-precision library. + +The main goal of MPFR is to provide a library for multiple-precision +floating-point computation which is both efficient and has a well-defined +semantics. It copies the good ideas from the ANSI/IEEE-754 standard for +double-precision floating-point arithmetic (53-bit significand). From 2fb321653b5db202e380f8a44568c7a918c41140 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:50:16 +0000 Subject: [PATCH 27/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index b2c3bce..ca3ca96 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.0 -Release: 9%{?dist} +Release: 10%{?dist} URL: https://www.mpfr.org/ License: LGPLv3+ @@ -106,6 +106,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 4.1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 4.1.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From cca6e934e8ff9c5c8151f2e363b197dcd1c4af1d Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 17 Nov 2022 14:38:40 -0700 Subject: [PATCH 28/43] Update to MPFR version 4.1.1 - Drop all patches - Convert License tags to SPDX --- allpatches | 2976 ---------------------------------------------------- mpfr.spec | 32 +- sources | 2 +- 3 files changed, 12 insertions(+), 2998 deletions(-) delete mode 100644 allpatches diff --git a/allpatches b/allpatches deleted file mode 100644 index 3ecb16f..0000000 --- a/allpatches +++ /dev/null @@ -1,2976 +0,0 @@ -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:40:40.079363480 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:40:40.119363040 +0000 -@@ -0,0 +1 @@ -+decimal128-conv -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2020-07-10 11:52:33.000000000 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:40:40.119363040 +0000 -@@ -1 +1 @@ --4.1.0 -+4.1.0-p1 -diff -Naurd mpfr-4.1.0-a/src/get_d128.c mpfr-4.1.0-b/src/get_d128.c ---- mpfr-4.1.0-a/src/get_d128.c 2020-04-08 22:39:35.000000000 +0000 -+++ mpfr-4.1.0-b/src/get_d128.c 2021-02-11 12:40:40.103363216 +0000 -@@ -40,22 +40,21 @@ - static _Decimal128 - get_decimal128_nan (void) - { -- return (_Decimal128) MPFR_DBL_NAN; -+ return 0.0dl / 0.0dl; - } - - /* construct the decimal128 Inf with given sign */ - static _Decimal128 - get_decimal128_inf (int negative) - { -- return (_Decimal128) (negative ? MPFR_DBL_INFM : MPFR_DBL_INFP); -+ return negative ? - 1.0dl / 0.0dl : 1.0dl / 0.0dl; - } - - /* construct the decimal128 zero with given sign */ - static _Decimal128 - get_decimal128_zero (int negative) - { -- _Decimal128 zero = 0; -- return (_Decimal128) (negative ? -zero : zero); -+ return negative ? - 0.0dl : 0.0dl; - } - - /* construct the decimal128 smallest non-zero with given sign: -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2020-07-10 11:52:33.000000000 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0" -+#define MPFR_VERSION_STRING "4.1.0-p1" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2020-07-10 11:52:33.000000000 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:40:40.119363040 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0"; -+ return "4.1.0-p1"; - } -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:43:51.761257868 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:43:51.801257430 +0000 -@@ -0,0 +1 @@ -+random_deviate -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:40:40.119363040 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:43:51.801257430 +0000 -@@ -1 +1 @@ --4.1.0-p1 -+4.1.0-p2 -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:40:40.115363084 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p1" -+#define MPFR_VERSION_STRING "4.1.0-p2" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c ---- mpfr-4.1.0-a/src/random_deviate.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000 -@@ -289,6 +289,7 @@ - mpfr_random_size_t p = mpfr_get_prec (z); /* Number of bits in result */ - mpz_t t; - int inex; -+ mpfr_exp_t negxe; - - if (n == 0) - { -@@ -370,14 +371,22 @@ - mpz_setbit (t, 0); /* Set the trailing bit so result is always inexact */ - if (neg) - mpz_neg (t, t); -- /* Is -x->e representable as a mpfr_exp_t? */ -- MPFR_ASSERTN (x->e <= (mpfr_uexp_t)(-1) >> 1); -+ /* Portable version of the negation of x->e, with a check of overflow. */ -+ if (MPFR_UNLIKELY (x->e > MPFR_EXP_MAX)) -+ { -+ /* Overflow, except when x->e = MPFR_EXP_MAX + 1 = - MPFR_EXP_MIN. */ -+ MPFR_ASSERTN (MPFR_EXP_MIN + MPFR_EXP_MAX == -1 && -+ x->e == (mpfr_random_size_t) MPFR_EXP_MAX + 1); -+ negxe = MPFR_EXP_MIN; -+ } -+ else -+ negxe = - (mpfr_exp_t) x->e; - /* - * Let mpfr_set_z_2exp do all the work of rounding to the requested - * precision, setting overflow/underflow flags, and returning the right - * inexact value. - */ -- inex = mpfr_set_z_2exp (z, t, -x->e, rnd); -+ inex = mpfr_set_z_2exp (z, t, negxe, rnd); - mpz_clear (t); - return inex; - } -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:40:40.119363040 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:43:51.801257430 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p1"; -+ return "4.1.0-p2"; - } -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:46:49.075316772 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:46:49.115316335 +0000 -@@ -0,0 +1 @@ -+set_z_2exp-overflow -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:43:51.801257430 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:46:49.115316335 +0000 -@@ -1 +1 @@ --4.1.0-p2 -+4.1.0-p3 -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:43:51.801257430 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p2" -+#define MPFR_VERSION_STRING "4.1.0-p3" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/set_z_exp.c mpfr-4.1.0-b/src/set_z_exp.c ---- mpfr-4.1.0-a/src/set_z_exp.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/set_z_exp.c 2021-02-11 12:46:49.103316466 +0000 -@@ -28,10 +28,11 @@ - int - mpfr_set_z_2exp (mpfr_ptr f, mpz_srcptr z, mpfr_exp_t e, mpfr_rnd_t rnd_mode) - { -- mp_size_t fn, zn, dif, en; -+ mp_size_t fn, zn, dif; - int k, sign_z, inex; - mp_limb_t *fp, *zp; -- mpfr_exp_t exp; -+ mpfr_exp_t exp, nmax; -+ mpfr_uexp_t uexp; - - sign_z = mpz_sgn (z); - if (MPFR_UNLIKELY (sign_z == 0)) /* ignore the exponent for 0 */ -@@ -43,10 +44,15 @@ - MPFR_ASSERTD (sign_z == MPFR_SIGN_POS || sign_z == MPFR_SIGN_NEG); - - zn = ABSIZ(z); /* limb size of z */ -- /* compute en = floor(e/GMP_NUMB_BITS) */ -- en = (e >= 0) ? e / GMP_NUMB_BITS : (e + 1) / GMP_NUMB_BITS - 1; - MPFR_ASSERTD (zn >= 1); -- if (MPFR_UNLIKELY (zn + en > MPFR_EMAX_MAX / GMP_NUMB_BITS + 1)) -+ nmax = MPFR_EMAX_MAX / GMP_NUMB_BITS + 1; -+ /* Detect early overflow with zn + en > nmax, -+ where en = floor(e / GMP_NUMB_BITS). -+ This is checked without an integer overflow (even assuming some -+ future version of GMP, where limitations may be removed). */ -+ if (MPFR_UNLIKELY (e >= 0 ? -+ zn > nmax - e / GMP_NUMB_BITS : -+ zn + (e + 1) / GMP_NUMB_BITS - 1 > nmax)) - return mpfr_overflow (f, rnd_mode, sign_z); - /* because zn + en >= MPFR_EMAX_MAX / GMP_NUMB_BITS + 2 - implies (zn + en) * GMP_NUMB_BITS >= MPFR_EMAX_MAX + GMP_NUMB_BITS + 1 -@@ -64,8 +70,21 @@ - and exp = zn * GMP_NUMB_BITS + e - k - <= (zn + en) * GMP_NUMB_BITS - k + GMP_NUMB_BITS - 1 - <= MPFR_EMAX_MAX + 2 * GMP_NUMB_BITS - 1 */ -- exp = (mpfr_prec_t) zn * GMP_NUMB_BITS + e - k; -+ /* We need to compute exp = zn * GMP_NUMB_BITS + e - k with well-defined -+ operations (no integer overflows / no implementation-defined results). -+ The mathematical result of zn * GMP_NUMB_BITS may be larger than -+ the largest value of mpfr_exp_t while exp could still be less than -+ __gmpfr_emax. Thanks to early overflow detection, we can compute the -+ result in modular arithmetic, using mpfr_uexp_t, and convert it to -+ mpfr_exp_t. */ -+ uexp = (mpfr_uexp_t) zn * GMP_NUMB_BITS + (mpfr_uexp_t) e - k; -+ -+ /* Convert to signed in a portable way (see doc/README.dev). -+ On most platforms, this can be optimized to identity (no-op). */ -+ exp = uexp > MPFR_EXP_MAX ? -1 - (mpfr_exp_t) ~uexp : (mpfr_exp_t) uexp; -+ - /* The exponent will be exp or exp + 1 (due to rounding) */ -+ - if (MPFR_UNLIKELY (exp > __gmpfr_emax)) - return mpfr_overflow (f, rnd_mode, sign_z); - if (MPFR_UNLIKELY (exp + 1 < __gmpfr_emin)) -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:43:51.801257430 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:46:49.115316335 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p2"; -+ return "4.1.0-p3"; - } -diff -Naurd mpfr-4.1.0-a/tests/tset_z_exp.c mpfr-4.1.0-b/tests/tset_z_exp.c ---- mpfr-4.1.0-a/tests/tset_z_exp.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tset_z_exp.c 2021-02-11 12:46:49.103316466 +0000 -@@ -97,49 +97,149 @@ - mpfr_get_si is a rather indirect test of a low level routine. */ - - static void --check (long i, mpfr_rnd_t rnd) -+check (long i, mpfr_rnd_t rnd, int reduced) - { -- mpfr_t f; -+ mpfr_t f1, f2, f3; - mpz_t z; -- mpfr_exp_t e; -+ mpfr_exp_t e, old_emin, old_emax; - int inex; -+ mpfr_flags_t flags; -+ -+ old_emin = mpfr_get_emin (); -+ old_emax = mpfr_get_emax (); - - /* using CHAR_BIT * sizeof(long) bits of precision ensures that - mpfr_set_z_2exp is exact below */ -- mpfr_init2 (f, CHAR_BIT * sizeof(long)); -+ mpfr_inits2 (CHAR_BIT * sizeof(long), f1, f2, f3, (mpfr_ptr) 0); - mpz_init (z); - mpz_set_ui (z, i); - /* the following loop ensures that no overflow occurs */ - do - e = randexp (); - while (e > mpfr_get_emax () - CHAR_BIT * sizeof(long)); -- inex = mpfr_set_z_2exp (f, z, e, rnd); -- if (inex != 0) -+ -+ mpfr_clear_flags (); -+ inex = mpfr_set_z_2exp (f1, z, e, rnd); -+ flags = __gmpfr_flags; -+ -+ if (inex != 0 || flags != 0 || -+ (mpfr_div_2si (f2, f1, e, rnd), mpfr_get_si (f2, MPFR_RNDZ) != i)) - { -- printf ("Error in mpfr_set_z_2exp for i=%ld, e=%ld," -- " wrong ternary value\n", i, (long) e); -- printf ("expected 0, got %d\n", inex); -+ printf ("Error in mpfr_set_z_2exp for i=%ld e=%" MPFR_EXP_FSPEC -+ "d rnd_mode=%d\n", i, (mpfr_eexp_t) e, rnd); -+ mpfr_set_si_2exp (f2, i, e, MPFR_RNDN); -+ printf ("expected "); mpfr_dump (f2); -+ printf ("with inex = %d and flags =", 0); -+ flags_out (0); -+ printf ("got "); mpfr_dump (f1); -+ printf ("with inex = %d and flags =", inex); -+ flags_out (flags); - exit (1); - } -- mpfr_div_2si (f, f, e, rnd); -- if (mpfr_get_si (f, MPFR_RNDZ) != i) -+ -+ if (reduced) - { -- printf ("Error in mpfr_set_z_2exp for i=%ld e=", i); -- if (e < LONG_MIN) -- printf ("( LONG_MAX) -- printf ("(>LONG_MAX)"); -- else -- printf ("%ld", (long) e); -- printf (" rnd_mode=%d\n", rnd); -- printf ("expected %ld\n", i); -- printf ("got "); mpfr_dump (f); -- exit (1); -+ mpfr_exp_t ef, emin, emax; -+ int inex2, inex3; -+ mpfr_flags_t flags2, flags3; -+ -+ ef = i == 0 ? 0 : mpfr_get_exp (f1); -+ for (emin = ef - 2; emin <= ef + 2; emin++) -+ for (emax = emin; emax <= ef + 2; emax++) -+ { -+ inex3 = mpfr_set (f3, f1, rnd); -+ MPFR_ASSERTN (inex3 == 0); -+ mpfr_set_emin (emin); -+ mpfr_set_emax (emax); -+ mpfr_clear_flags (); -+ inex2 = mpfr_set_z_2exp (f2, z, e, rnd); -+ flags2 = __gmpfr_flags; -+ mpfr_clear_flags (); -+ inex3 = mpfr_check_range (f3, 0, rnd); -+ flags3 = __gmpfr_flags; -+ if (!(mpfr_equal_p (f2, f3) && -+ SAME_SIGN (inex2, inex3) && -+ flags2 == flags3)) -+ { -+ printf ("Error in mpfr_set_z_2exp for i=%ld e=%" -+ MPFR_EXP_FSPEC "d rnd_mode=%d\nand emin=%" -+ MPFR_EXP_FSPEC "d emax=%" MPFR_EXP_FSPEC -+ "d\n", i, (mpfr_eexp_t) e, rnd, -+ (mpfr_eexp_t) emin, (mpfr_eexp_t) emax); -+ printf ("expected "); mpfr_dump (f3); -+ printf ("with inex = %d and flags =", inex3); -+ flags_out (flags3); -+ printf ("got "); mpfr_dump (f2); -+ printf ("with inex = %d and flags =", inex2); -+ flags_out (flags2); -+ exit (1); -+ } -+ } -+ mpfr_set_emin (old_emin); -+ mpfr_set_emax (old_emax); - } -- mpfr_clear (f); -+ -+ mpfr_clears (f1, f2, f3, (mpfr_ptr) 0); - mpz_clear (z); - } - -+static void -+check_huge (void) -+{ -+ if (getenv ("MPFR_CHECK_LARGEMEM") != NULL) -+ { -+ mpfr_t x; -+ mpz_t z; -+ long e; -+ -+ /* Increase tests_memory_limit to the maximum in order to avoid -+ an obvious failure due to insufficient memory. */ -+ tests_memory_limit = (size_t) -1; /* no memory limit */ -+ -+ mpfr_init2 (x, 32); -+ -+ /* In r14140, with a 32-bit ABI (GCC's -m32): -+ - With UBsan (-fsanitize=undefined -fno-sanitize-recover), -+ this fails with: -+ set_z_2exp.c:71:26: runtime error: signed integer overflow: -+ 67108864 * 32 cannot be represented in type 'long int' -+ - With -D_MPFR_EXP_FORMAT=4, this fails with: -+ Expected 0.10001000000000000000000000000000E5 -+ Got 0 -+ */ -+ mpz_init_set_ui (z, 17); -+ e = 0x7ffffff0; -+ mpz_mul_2exp (z, z, e); -+ mpz_add_ui (z, z, 1); -+ mpfr_set_z_2exp (x, z, -e, MPFR_RNDN); -+ if (mpfr_cmp_ui0 (x, 17) != 0) -+ { -+ printf ("Error 1 in check_huge\n"); -+ printf ("Expected 0.10001000000000000000000000000000E5\n"); -+ printf ("Got "); -+ mpfr_dump (x); -+ exit (1); -+ } -+ mpz_clear (z); -+ -+ mpz_init_set_ui (z, 17); -+ mpz_mul_2exp (z, z, 0xffffffb0); -+ mpz_add_ui (z, z, 1); -+ mpfr_set_z_2exp (x, z, -1, MPFR_RNDN); -+ if (! MPFR_IS_INF (x) || MPFR_IS_NEG (x)) -+ { -+ printf ("Error 2 in check_huge\n"); -+ printf ("Expected @Inf@\n"); -+ printf ("Got "); -+ mpfr_dump (x); -+ exit (1); -+ } -+ mpz_clear (z); -+ -+ mpfr_clear (x); -+ } -+} -+ - int - main (int argc, char *argv[]) - { -@@ -147,11 +247,13 @@ - - tests_start_mpfr (); - -- check (0, MPFR_RNDN); -+ check (0, MPFR_RNDN, 0); - for (j = 0; j < 200000; j++) -- check (randlimb () & LONG_MAX, RND_RAND ()); -+ check (randlimb () & LONG_MAX, RND_RAND (), j < 200); - check0 (); - -+ check_huge (); -+ - tests_end_mpfr (); - - return 0; -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:48:27.322243271 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:48:27.370242746 +0000 -@@ -0,0 +1 @@ -+prototypes -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:46:49.115316335 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:48:27.370242746 +0000 -@@ -1 +1 @@ --4.1.0-p3 -+4.1.0-p4 -diff -Naurd mpfr-4.1.0-a/src/atan.c mpfr-4.1.0-b/src/atan.c ---- mpfr-4.1.0-a/src/atan.c 2020-04-22 15:27:07.000000000 +0000 -+++ mpfr-4.1.0-b/src/atan.c 2021-02-11 12:48:27.354242922 +0000 -@@ -56,7 +56,7 @@ - }; - - static void --set_table (mpfr_t y, const mp_limb_t x[3]) -+set_table (mpfr_ptr y, const mp_limb_t x[3]) - { - mpfr_prec_t p = MPFR_PREC(y); - mp_size_t n = MPFR_PREC2LIMBS(p); -diff -Naurd mpfr-4.1.0-a/src/const_euler.c mpfr-4.1.0-b/src/const_euler.c ---- mpfr-4.1.0-a/src/const_euler.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/const_euler.c 2021-02-11 12:48:27.354242922 +0000 -@@ -181,7 +181,7 @@ - } - - int --mpfr_const_euler_internal (mpfr_t x, mpfr_rnd_t rnd) -+mpfr_const_euler_internal (mpfr_ptr x, mpfr_rnd_t rnd) - { - mpfr_const_euler_bs_t sum; - mpz_t t, u, v; -diff -Naurd mpfr-4.1.0-a/src/eint.c mpfr-4.1.0-b/src/eint.c ---- mpfr-4.1.0-a/src/eint.c 2020-03-09 15:31:45.000000000 +0000 -+++ mpfr-4.1.0-b/src/eint.c 2021-02-11 12:48:27.354242922 +0000 -@@ -36,7 +36,7 @@ - Return PREC(y) when the truncated series does not converge. - */ - static mpfr_exp_t --mpfr_eint_aux (mpfr_t y, mpfr_srcptr x) -+mpfr_eint_aux (mpfr_ptr y, mpfr_srcptr x) - { - mpfr_t eps; /* dynamic (absolute) error bound on t */ - mpfr_t erru, errs; -diff -Naurd mpfr-4.1.0-a/src/erandom.c mpfr-4.1.0-b/src/erandom.c ---- mpfr-4.1.0-a/src/erandom.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/erandom.c 2021-02-11 12:48:27.354242922 +0000 -@@ -80,7 +80,7 @@ - - /* return an exponential random deviate with mean 1 as a MPFR */ - int --mpfr_erandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd) -+mpfr_erandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd) - { - mpfr_random_deviate_t x, p, q; - int inex; -diff -Naurd mpfr-4.1.0-a/src/fpif.c mpfr-4.1.0-b/src/fpif.c ---- mpfr-4.1.0-a/src/fpif.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/fpif.c 2021-02-11 12:48:27.354242922 +0000 -@@ -291,7 +291,8 @@ - * until one has integer types larger than 128 bits). - */ - static unsigned char* --mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, mpfr_t x) -+mpfr_fpif_store_exponent (unsigned char *buffer, size_t *buffer_size, -+ mpfr_ptr x) - { - unsigned char *result; - mpfr_uexp_t uexp; -@@ -372,7 +373,7 @@ - * than 128 bits). - */ - static int --mpfr_fpif_read_exponent_from_file (mpfr_t x, FILE * fh) -+mpfr_fpif_read_exponent_from_file (mpfr_ptr x, FILE * fh) - { - mpfr_exp_t exponent; - mpfr_uexp_t uexp; -@@ -456,7 +457,7 @@ - * format - */ - static unsigned char* --mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_t x) -+mpfr_fpif_store_limbs (unsigned char *buffer, size_t *buffer_size, mpfr_ptr x) - { - unsigned char *result; - mpfr_prec_t precision; -@@ -492,7 +493,7 @@ - * Assume buffer is not NULL. - */ - static void --mpfr_fpif_read_limbs (mpfr_t x, unsigned char *buffer, size_t nb_byte) -+mpfr_fpif_read_limbs (mpfr_ptr x, unsigned char *buffer, size_t nb_byte) - { - size_t mp_bytes_per_limb; - size_t nb_partial_byte; -@@ -522,7 +523,7 @@ - * return 0 if successful - */ - int --mpfr_fpif_export (FILE *fh, mpfr_t x) -+mpfr_fpif_export (FILE *fh, mpfr_ptr x) - { - int status; - unsigned char *buf; -@@ -582,7 +583,7 @@ - * Return 0 if the import was successful. - */ - int --mpfr_fpif_import (mpfr_t x, FILE *fh) -+mpfr_fpif_import (mpfr_ptr x, FILE *fh) - { - int status; - mpfr_prec_t precision; -diff -Naurd mpfr-4.1.0-a/src/li2.c mpfr-4.1.0-b/src/li2.c ---- mpfr-4.1.0-a/src/li2.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/li2.c 2021-02-11 12:48:27.354242922 +0000 -@@ -31,7 +31,7 @@ - for determinating the relative error. - */ - static int --li2_series (mpfr_t sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode) -+li2_series (mpfr_ptr sum, mpfr_srcptr z, mpfr_rnd_t rnd_mode) - { - int i; - mpfr_t s, u, v, w; -diff -Naurd mpfr-4.1.0-a/src/lngamma.c mpfr-4.1.0-b/src/lngamma.c ---- mpfr-4.1.0-a/src/lngamma.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/lngamma.c 2021-02-11 12:48:27.354242922 +0000 -@@ -31,7 +31,7 @@ - precision should be >= 4. - */ - static void --mpfr_gamma_alpha (mpfr_t s, mpfr_prec_t p) -+mpfr_gamma_alpha (mpfr_ptr s, mpfr_prec_t p) - { - MPFR_LOG_FUNC - (("p=%Pu", p), -diff -Naurd mpfr-4.1.0-a/src/mpfr-impl.h mpfr-4.1.0-b/src/mpfr-impl.h ---- mpfr-4.1.0-a/src/mpfr-impl.h 2020-06-10 21:50:12.000000000 +0000 -+++ mpfr-4.1.0-b/src/mpfr-impl.h 2021-02-11 12:48:27.354242922 +0000 -@@ -2474,7 +2474,8 @@ - __MPFR_DECLSPEC mpz_srcptr mpfr_bernoulli_cache (unsigned long); - __MPFR_DECLSPEC void mpfr_bernoulli_freecache (void); - --__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_t, mpfr_t, mpfr_srcptr, mpfr_rnd_t); -+__MPFR_DECLSPEC int mpfr_sincos_fast (mpfr_ptr, mpfr_ptr, mpfr_srcptr, -+ mpfr_rnd_t); - - __MPFR_DECLSPEC double mpfr_scale2 (double, int); - -@@ -2485,7 +2486,7 @@ - mpfr_prec_t); - - __MPFR_DECLSPEC void mpfr_mpz_init (mpz_ptr); --__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_t, mp_bitcnt_t); -+__MPFR_DECLSPEC void mpfr_mpz_init2 (mpz_ptr, mp_bitcnt_t); - __MPFR_DECLSPEC void mpfr_mpz_clear (mpz_ptr); - - __MPFR_DECLSPEC int mpfr_odd_p (mpfr_srcptr); -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:46:49.115316335 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p3" -+#define MPFR_VERSION_STRING "4.1.0-p4" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -@@ -781,8 +781,8 @@ - __MPFR_DECLSPEC int mpfr_strtofr (mpfr_ptr, const char *, char **, int, - mpfr_rnd_t); - --__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_t); --__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_t, int); -+__MPFR_DECLSPEC void mpfr_round_nearest_away_begin (mpfr_ptr); -+__MPFR_DECLSPEC int mpfr_round_nearest_away_end (mpfr_ptr, int); - - __MPFR_DECLSPEC size_t mpfr_custom_get_size (mpfr_prec_t); - __MPFR_DECLSPEC void mpfr_custom_init (void *, mpfr_prec_t); -@@ -1080,10 +1080,12 @@ - #define mpfr_set_uj_2exp __gmpfr_set_uj_2exp - #define mpfr_get_sj __gmpfr_mpfr_get_sj - #define mpfr_get_uj __gmpfr_mpfr_get_uj --__MPFR_DECLSPEC int mpfr_set_sj (mpfr_t, intmax_t, mpfr_rnd_t); --__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_t, intmax_t, intmax_t, mpfr_rnd_t); --__MPFR_DECLSPEC int mpfr_set_uj (mpfr_t, uintmax_t, mpfr_rnd_t); --__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_t, uintmax_t, intmax_t, mpfr_rnd_t); -+__MPFR_DECLSPEC int mpfr_set_sj (mpfr_ptr, intmax_t, mpfr_rnd_t); -+__MPFR_DECLSPEC int mpfr_set_sj_2exp (mpfr_ptr, intmax_t, intmax_t, -+ mpfr_rnd_t); -+__MPFR_DECLSPEC int mpfr_set_uj (mpfr_ptr, uintmax_t, mpfr_rnd_t); -+__MPFR_DECLSPEC int mpfr_set_uj_2exp (mpfr_ptr, uintmax_t, intmax_t, -+ mpfr_rnd_t); - __MPFR_DECLSPEC intmax_t mpfr_get_sj (mpfr_srcptr, mpfr_rnd_t); - __MPFR_DECLSPEC uintmax_t mpfr_get_uj (mpfr_srcptr, mpfr_rnd_t); - -diff -Naurd mpfr-4.1.0-a/src/nrandom.c mpfr-4.1.0-b/src/nrandom.c ---- mpfr-4.1.0-a/src/nrandom.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/nrandom.c 2021-02-11 12:48:27.354242922 +0000 -@@ -155,7 +155,7 @@ - - /* return a normal random deviate with mean 0 and variance 1 as a MPFR */ - int --mpfr_nrandom (mpfr_t z, gmp_randstate_t r, mpfr_rnd_t rnd) -+mpfr_nrandom (mpfr_ptr z, gmp_randstate_t r, mpfr_rnd_t rnd) - { - mpfr_random_deviate_t x, p, q; - int inex; -diff -Naurd mpfr-4.1.0-a/src/pool.c mpfr-4.1.0-b/src/pool.c ---- mpfr-4.1.0-a/src/pool.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/pool.c 2021-02-11 12:48:27.354242922 +0000 -@@ -35,7 +35,7 @@ - static MPFR_THREAD_ATTR __mpz_struct mpz_tab[MPFR_POOL_NENTRIES]; - - MPFR_HOT_FUNCTION_ATTR void --mpfr_mpz_init (mpz_t z) -+mpfr_mpz_init (mpz_ptr z) - { - if (MPFR_LIKELY (n_alloc > 0)) - { -@@ -54,7 +54,7 @@ - } - - MPFR_HOT_FUNCTION_ATTR void --mpfr_mpz_init2 (mpz_t z, mp_bitcnt_t n) -+mpfr_mpz_init2 (mpz_ptr z, mp_bitcnt_t n) - { - /* The condition on n is used below as the argument n will be ignored if - the mpz_t is obtained from the MPFR stack of previously used mpz_t. -@@ -82,7 +82,7 @@ - - - MPFR_HOT_FUNCTION_ATTR void --mpfr_mpz_clear (mpz_t z) -+mpfr_mpz_clear (mpz_ptr z) - { - /* We only put objects with at most MPFR_POOL_MAX_SIZE in the mpz_t pool, - to avoid it takes too much memory (and anyway the speedup is mainly -diff -Naurd mpfr-4.1.0-a/src/random_deviate.c mpfr-4.1.0-b/src/random_deviate.c ---- mpfr-4.1.0-a/src/random_deviate.c 2021-02-11 12:43:51.789257562 +0000 -+++ mpfr-4.1.0-b/src/random_deviate.c 2021-02-11 12:48:27.354242922 +0000 -@@ -64,7 +64,7 @@ - - /* allocate and set to (0,1) */ - void --mpfr_random_deviate_init (mpfr_random_deviate_t x) -+mpfr_random_deviate_init (mpfr_random_deviate_ptr x) - { - mpz_init (x->f); - x->e = 0; -@@ -72,21 +72,22 @@ - - /* reset to (0,1) */ - void --mpfr_random_deviate_reset (mpfr_random_deviate_t x) -+mpfr_random_deviate_reset (mpfr_random_deviate_ptr x) - { - x->e = 0; - } - - /* deallocate */ - void --mpfr_random_deviate_clear (mpfr_random_deviate_t x) -+mpfr_random_deviate_clear (mpfr_random_deviate_ptr x) - { - mpz_clear (x->f); - } - - /* swap two random deviates */ - void --mpfr_random_deviate_swap (mpfr_random_deviate_t x, mpfr_random_deviate_t y) -+mpfr_random_deviate_swap (mpfr_random_deviate_ptr x, -+ mpfr_random_deviate_ptr y) - { - mpfr_random_size_t s; - unsigned long t; -@@ -107,7 +108,7 @@ - - /* ensure x has at least k bits */ - static void --random_deviate_generate (mpfr_random_deviate_t x, mpfr_random_size_t k, -+random_deviate_generate (mpfr_random_deviate_ptr x, mpfr_random_size_t k, - gmp_randstate_t r, mpz_t t) - { - /* Various compile time checks on mpfr_random_deviate_t */ -@@ -223,7 +224,7 @@ - - /* return position of leading bit, counting from 1 */ - static mpfr_random_size_t --random_deviate_leading_bit (mpfr_random_deviate_t x, gmp_randstate_t r) -+random_deviate_leading_bit (mpfr_random_deviate_ptr x, gmp_randstate_t r) - { - mpfr_random_size_t l; - random_deviate_generate (x, W, r, 0); -@@ -243,7 +244,7 @@ - - /* return kth bit of fraction, representing 2^-k */ - int --mpfr_random_deviate_tstbit (mpfr_random_deviate_t x, mpfr_random_size_t k, -+mpfr_random_deviate_tstbit (mpfr_random_deviate_ptr x, mpfr_random_size_t k, - gmp_randstate_t r) - { - if (k == 0) -@@ -256,7 +257,8 @@ - - /* compare two random deviates, x < y */ - int --mpfr_random_deviate_less (mpfr_random_deviate_t x, mpfr_random_deviate_t y, -+mpfr_random_deviate_less (mpfr_random_deviate_ptr x, -+ mpfr_random_deviate_ptr y, - gmp_randstate_t r) - { - mpfr_random_size_t k = 1; -@@ -280,7 +282,7 @@ - /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */ - int - mpfr_random_deviate_value (int neg, unsigned long n, -- mpfr_random_deviate_t x, mpfr_t z, -+ mpfr_random_deviate_ptr x, mpfr_ptr z, - gmp_randstate_t r, mpfr_rnd_t rnd) - { - /* r is used to add as many bits as necessary to match the precision of z */ -diff -Naurd mpfr-4.1.0-a/src/random_deviate.h mpfr-4.1.0-b/src/random_deviate.h ---- mpfr-4.1.0-a/src/random_deviate.h 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/random_deviate.h 2021-02-11 12:48:27.354242922 +0000 -@@ -76,7 +76,7 @@ - /* set mpfr_t z = (neg ? -1 : 1) * (n + x) */ - __MPFR_DECLSPEC int - mpfr_random_deviate_value (int, unsigned long, -- mpfr_random_deviate_ptr, mpfr_t, -+ mpfr_random_deviate_ptr, mpfr_ptr, - gmp_randstate_t, mpfr_rnd_t); - - #if defined(__cplusplus) -diff -Naurd mpfr-4.1.0-a/src/rndna.c mpfr-4.1.0-b/src/rndna.c ---- mpfr-4.1.0-a/src/rndna.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/rndna.c 2021-02-11 12:48:27.354242922 +0000 -@@ -61,7 +61,7 @@ - and prepares rop to give it one more bit of precision - and to save its old value within it. */ - void --mpfr_round_nearest_away_begin (mpfr_t rop) -+mpfr_round_nearest_away_begin (mpfr_ptr rop) - { - mpfr_t tmp; - mp_size_t xsize; -@@ -129,7 +129,7 @@ - copying it back the result of the applied function - and performing additional roundings. */ - int --mpfr_round_nearest_away_end (mpfr_t rop, int inex) -+mpfr_round_nearest_away_end (mpfr_ptr rop, int inex) - { - mpfr_t tmp; - mp_size_t xsize; -diff -Naurd mpfr-4.1.0-a/src/set_sj.c mpfr-4.1.0-b/src/set_sj.c ---- mpfr-4.1.0-a/src/set_sj.c 2020-06-01 10:39:52.000000000 +0000 -+++ mpfr-4.1.0-b/src/set_sj.c 2021-02-11 12:48:27.354242922 +0000 -@@ -26,13 +26,13 @@ - #ifdef _MPFR_H_HAVE_INTMAX_T - - int --mpfr_set_sj (mpfr_t x, intmax_t j, mpfr_rnd_t rnd) -+mpfr_set_sj (mpfr_ptr x, intmax_t j, mpfr_rnd_t rnd) - { - return mpfr_set_sj_2exp (x, j, 0, rnd); - } - - int --mpfr_set_sj_2exp (mpfr_t x, intmax_t j, intmax_t e, mpfr_rnd_t rnd) -+mpfr_set_sj_2exp (mpfr_ptr x, intmax_t j, intmax_t e, mpfr_rnd_t rnd) - { - if (j >= 0) - return mpfr_set_uj_2exp (x, j, e, rnd); -diff -Naurd mpfr-4.1.0-a/src/set_str.c mpfr-4.1.0-b/src/set_str.c ---- mpfr-4.1.0-a/src/set_str.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/set_str.c 2021-02-11 12:48:27.354242922 +0000 -@@ -23,7 +23,7 @@ - #include "mpfr-impl.h" - - int --mpfr_set_str (mpfr_t x, const char *str, int base, mpfr_rnd_t rnd) -+mpfr_set_str (mpfr_ptr x, const char *str, int base, mpfr_rnd_t rnd) - { - char *p; - -diff -Naurd mpfr-4.1.0-a/src/set_uj.c mpfr-4.1.0-b/src/set_uj.c ---- mpfr-4.1.0-a/src/set_uj.c 2020-06-01 10:39:52.000000000 +0000 -+++ mpfr-4.1.0-b/src/set_uj.c 2021-02-11 12:48:27.354242922 +0000 -@@ -29,13 +29,13 @@ - #define uintmaxpml (sizeof(uintmax_t) / sizeof(mp_limb_t)) - - int --mpfr_set_uj (mpfr_t x, uintmax_t j, mpfr_rnd_t rnd) -+mpfr_set_uj (mpfr_ptr x, uintmax_t j, mpfr_rnd_t rnd) - { - return mpfr_set_uj_2exp (x, j, 0, rnd); - } - - int --mpfr_set_uj_2exp (mpfr_t x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd) -+mpfr_set_uj_2exp (mpfr_ptr x, uintmax_t j, intmax_t e, mpfr_rnd_t rnd) - { - int cnt, inex; - mp_size_t i, k; -diff -Naurd mpfr-4.1.0-a/src/sin_cos.c mpfr-4.1.0-b/src/sin_cos.c ---- mpfr-4.1.0-a/src/sin_cos.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/sin_cos.c 2021-02-11 12:48:27.354242922 +0000 -@@ -463,7 +463,7 @@ - Return err such that the relative error is bounded by 2^err ulps. - */ - static int --sincos_aux (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd_mode) -+sincos_aux (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd_mode) - { - mpfr_prec_t prec_s, sh; - mpz_t Q, S, C, Q2, S2, C2, y; -@@ -577,7 +577,7 @@ - Assumes s differs from c. - */ - int --mpfr_sincos_fast (mpfr_t s, mpfr_t c, mpfr_srcptr x, mpfr_rnd_t rnd) -+mpfr_sincos_fast (mpfr_ptr s, mpfr_ptr c, mpfr_srcptr x, mpfr_rnd_t rnd) - { - int inexs, inexc; - mpfr_t x_red, ts, tc; -diff -Naurd mpfr-4.1.0-a/src/strtofr.c mpfr-4.1.0-b/src/strtofr.c ---- mpfr-4.1.0-a/src/strtofr.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/strtofr.c 2021-02-11 12:48:27.354242922 +0000 -@@ -226,7 +226,7 @@ - BUT if it returns 0 (NAN or INF), the ternary value is also '0' - (ie NAN and INF are exact) */ - static int --parse_string (mpfr_t x, struct parsed_string *pstr, -+parse_string (mpfr_ptr x, struct parsed_string *pstr, - const char **string, int base) - { - const char *str = *string; -@@ -451,7 +451,7 @@ - and the precision of x. - Returns the ternary value. */ - static int --parsed_string_to_mpfr (mpfr_t x, struct parsed_string *pstr, mpfr_rnd_t rnd) -+parsed_string_to_mpfr (mpfr_ptr x, struct parsed_string *pstr, mpfr_rnd_t rnd) - { - mpfr_prec_t precx, prec, ysize_bits, pstr_size; - mpfr_exp_t exp; -@@ -934,7 +934,7 @@ - } - - int --mpfr_strtofr (mpfr_t x, const char *string, char **end, int base, -+mpfr_strtofr (mpfr_ptr x, const char *string, char **end, int base, - mpfr_rnd_t rnd) - { - int res; -diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c ---- mpfr-4.1.0-a/src/vasprintf.c 2020-06-01 10:39:52.000000000 +0000 -+++ mpfr-4.1.0-b/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000 -@@ -963,7 +963,7 @@ - #define NDIGITS 8 - - MPFR_RETURNS_NONNULL static char * --mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, const mpfr_t op, -+mpfr_get_str_wrapper (mpfr_exp_t *exp, int base, size_t n, mpfr_srcptr op, - const struct printf_spec spec) - { - size_t ndigits; -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:46:49.115316335 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:48:27.370242746 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p3"; -+ return "4.1.0-p4"; - } -diff -Naurd mpfr-4.1.0-a/src/zeta.c mpfr-4.1.0-b/src/zeta.c ---- mpfr-4.1.0-a/src/zeta.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/src/zeta.c 2021-02-11 12:48:27.354242922 +0000 -@@ -35,7 +35,7 @@ - sum(tc[i]*product((s+2j)*(s+2j-1)/n^2,j=1..i-1), i=1..p)*s*n^(-s-1) - */ - static void --mpfr_zeta_part_b (mpfr_t b, mpfr_srcptr s, int n, int p, mpfr_t *tc) -+mpfr_zeta_part_b (mpfr_ptr b, mpfr_srcptr s, int n, int p, mpfr_t *tc) - { - mpfr_t s1, d, u; - unsigned long n2; -@@ -130,7 +130,7 @@ - n - an integer - Output: sum - a floating-point number approximating sum(1/i^s, i=1..n-1) */ - static void --mpfr_zeta_part_a (mpfr_t sum, mpfr_srcptr s, int n) -+mpfr_zeta_part_a (mpfr_ptr sum, mpfr_srcptr s, int n) - { - mpfr_t u, s1; - int i; -@@ -158,7 +158,7 @@ - Output: z - Zeta(s) rounded to the precision of z with direction rnd_mode - */ - static int --mpfr_zeta_pos (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) -+mpfr_zeta_pos (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) - { - mpfr_t b, c, z_pre, f, s1; - double beta, sd, dnep; -@@ -356,8 +356,8 @@ - At input, p is Pi rounded down. - The comments in the code are for rnd = RNDD. */ - static void --mpfr_reflection_overflow (mpfr_t z, mpfr_t s1, const mpfr_t s, mpfr_t y, -- mpfr_t p, mpfr_rnd_t rnd) -+mpfr_reflection_overflow (mpfr_ptr z, mpfr_ptr s1, mpfr_srcptr s, mpfr_ptr y, -+ mpfr_ptr p, mpfr_rnd_t rnd) - { - mpz_t sint; - -@@ -432,7 +432,7 @@ - } - - int --mpfr_zeta (mpfr_t z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) -+mpfr_zeta (mpfr_ptr z, mpfr_srcptr s, mpfr_rnd_t rnd_mode) - { - mpfr_t z_pre, s1, y, p; - long add; -diff -Naurd mpfr-4.1.0-a/tests/tcmp2.c mpfr-4.1.0-b/tests/tcmp2.c ---- mpfr-4.1.0-a/tests/tcmp2.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tcmp2.c 2021-02-11 12:48:27.350242965 +0000 -@@ -24,7 +24,7 @@ - - /* set bit n of x to b, where bit 0 is the most significant one */ - static void --set_bit (mpfr_t x, unsigned int n, int b) -+set_bit (mpfr_ptr x, unsigned int n, int b) - { - unsigned l; - mp_size_t xn; -diff -Naurd mpfr-4.1.0-a/tests/tdiv.c mpfr-4.1.0-b/tests/tdiv.c ---- mpfr-4.1.0-a/tests/tdiv.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tdiv.c 2021-02-11 12:48:27.350242965 +0000 -@@ -369,7 +369,7 @@ - /* given y = o(x/u), x, u, find the inexact flag by - multiplying y by u */ - static int --get_inexact (mpfr_t y, mpfr_t x, mpfr_t u) -+get_inexact (mpfr_ptr y, mpfr_ptr x, mpfr_ptr u) - { - mpfr_t xx; - int inex; -diff -Naurd mpfr-4.1.0-a/tests/teq.c mpfr-4.1.0-b/tests/teq.c ---- mpfr-4.1.0-a/tests/teq.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/teq.c 2021-02-11 12:48:27.350242965 +0000 -@@ -23,7 +23,7 @@ - #include "mpfr-test.h" - - static void --teq (mpfr_t x) -+teq (mpfr_ptr x) - { - mpfr_t y; - unsigned long k, px, mx; -diff -Naurd mpfr-4.1.0-a/tests/terandom_chisq.c mpfr-4.1.0-b/tests/terandom_chisq.c ---- mpfr-4.1.0-a/tests/terandom_chisq.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/terandom_chisq.c 2021-02-11 12:48:27.350242965 +0000 -@@ -26,7 +26,7 @@ - * exponential distribution. We only take differences of this function so the - * offset doesn't matter; here Phi(0) = 0. */ - static void --exponential_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd) -+exponential_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd) - { - mpfr_neg (z, x, rnd); - mpfr_expm1 (z, z, rnd); -@@ -43,7 +43,7 @@ - * TAOCP, Vol 2, 3.3.1, Table 1. It more accurate than the similar formula, - * DLMF 8.11.10. */ - static void --chisq_prob (mpfr_t q, long nu, mpfr_t chisqp) -+chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp) - { - mpfr_t t; - mpfr_rnd_t rnd; -@@ -170,7 +170,7 @@ - * this function. low precision means prec = 2, 3, or 4. High values of - * precision will result in integer overflow. */ - static long --sequential (mpfr_t x) -+sequential (mpfr_ptr x) - { - long expt, prec; - -diff -Naurd mpfr-4.1.0-a/tests/tfmma.c mpfr-4.1.0-b/tests/tfmma.c ---- mpfr-4.1.0-a/tests/tfmma.c 2020-03-24 13:47:38.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tfmma.c 2021-02-11 12:48:27.350242965 +0000 -@@ -24,7 +24,7 @@ - - /* check both mpfr_fmma and mpfr_fmms */ - static void --random_test (mpfr_t a, mpfr_t b, mpfr_t c, mpfr_t d, mpfr_rnd_t rnd) -+random_test (mpfr_ptr a, mpfr_ptr b, mpfr_ptr c, mpfr_ptr d, mpfr_rnd_t rnd) - { - mpfr_t ref, res, ab, cd; - int inex_ref, inex_res; -diff -Naurd mpfr-4.1.0-a/tests/tfmod.c mpfr-4.1.0-b/tests/tfmod.c ---- mpfr-4.1.0-a/tests/tfmod.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tfmod.c 2021-02-11 12:48:27.350242965 +0000 -@@ -62,8 +62,8 @@ - } - - static void --test_failed (mpfr_t erem, mpfr_t grem, int eret, int gret, mpfr_t x, mpfr_t y, -- mpfr_rnd_t rnd) -+test_failed (mpfr_ptr erem, mpfr_ptr grem, int eret, int gret, -+ mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd) - { - printf ("error: mpfr_fmod (r, x, y, rnd)\n x = "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD); -@@ -83,7 +83,7 @@ - } - - static void --check (mpfr_t r0, mpfr_t x, mpfr_t y, mpfr_rnd_t rnd) -+check (mpfr_ptr r0, mpfr_ptr x, mpfr_ptr y, mpfr_rnd_t rnd) - { - int inex0, inex1; - mpfr_t r1; -diff -Naurd mpfr-4.1.0-a/tests/tfprintf.c mpfr-4.1.0-b/tests/tfprintf.c ---- mpfr-4.1.0-a/tests/tfprintf.c 2020-06-01 10:39:52.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tfprintf.c 2021-02-11 12:48:27.350242965 +0000 -@@ -65,7 +65,7 @@ - const int prec_max_printf = 5000; - - static void --check (FILE *fout, const char *fmt, mpfr_t x) -+check (FILE *fout, const char *fmt, mpfr_ptr x) - { - if (mpfr_fprintf (fout, fmt, x) == -1) - { -diff -Naurd mpfr-4.1.0-a/tests/tgamma.c mpfr-4.1.0-b/tests/tgamma.c ---- mpfr-4.1.0-a/tests/tgamma.c 2020-06-01 00:15:37.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tgamma.c 2021-02-11 12:48:27.350242965 +0000 -@@ -890,7 +890,7 @@ - computing with a working precision p2. Assume that x is not an - integer <= 2. */ - static void --exp_lgamma (mpfr_t x, mpfr_prec_t p1, mpfr_prec_t p2) -+exp_lgamma (mpfr_ptr x, mpfr_prec_t p1, mpfr_prec_t p2) - { - mpfr_t yd, yu, zd, zu; - int inexd, inexu, sign; -diff -Naurd mpfr-4.1.0-a/tests/tnrandom_chisq.c mpfr-4.1.0-b/tests/tnrandom_chisq.c ---- mpfr-4.1.0-a/tests/tnrandom_chisq.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tnrandom_chisq.c 2021-02-11 12:48:27.350242965 +0000 -@@ -26,7 +26,7 @@ - * for the normal distribution. We only take differences of this function so - * the offset doesn't matter; here Phi(0) = 0. */ - static void --normal_cumulative (mpfr_t z, mpfr_t x, mpfr_rnd_t rnd) -+normal_cumulative (mpfr_ptr z, mpfr_ptr x, mpfr_rnd_t rnd) - { - mpfr_sqrt_ui (z, 2, rnd); - mpfr_div (z, x, z, rnd); -@@ -44,7 +44,7 @@ - * TAOCP, Vol 2, 3.3.1, Table 1. It more accurate than the similar formula, - * DLMF 8.11.10. */ - static void --chisq_prob (mpfr_t q, long nu, mpfr_t chisqp) -+chisq_prob (mpfr_ptr q, long nu, mpfr_ptr chisqp) - { - mpfr_t t; - mpfr_rnd_t rnd; -@@ -166,7 +166,7 @@ - * this function. low precision means prec = 2, 3, or 4. High values of - * precision will result in integer overflow. */ - static long --sequential (mpfr_t x) -+sequential (mpfr_ptr x) - { - long expt, prec; - -diff -Naurd mpfr-4.1.0-a/tests/tprintf.c mpfr-4.1.0-b/tests/tprintf.c ---- mpfr-4.1.0-a/tests/tprintf.c 2020-06-01 10:39:52.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tprintf.c 2021-02-11 12:48:27.350242965 +0000 -@@ -74,7 +74,7 @@ - int stdout_redirect; - - static void --check (const char *fmt, mpfr_t x) -+check (const char *fmt, mpfr_ptr x) - { - if (mpfr_printf (fmt, x) == -1) - { -diff -Naurd mpfr-4.1.0-a/tests/trint.c mpfr-4.1.0-b/tests/trint.c ---- mpfr-4.1.0-a/tests/trint.c 2020-02-12 13:04:50.000000000 +0000 -+++ mpfr-4.1.0-b/tests/trint.c 2021-02-11 12:48:27.350242965 +0000 -@@ -367,7 +367,7 @@ - #endif - - static void --err (const char *str, mp_size_t s, mpfr_t x, mpfr_t y, mpfr_prec_t p, -+err (const char *str, mp_size_t s, mpfr_ptr x, mpfr_ptr y, mpfr_prec_t p, - mpfr_rnd_t r, int trint, int inexact) - { - printf ("Error: %s\ns = %u, p = %u, r = %s, trint = %d, inexact = %d\nx = ", -diff -Naurd mpfr-4.1.0-a/tests/tsinh_cosh.c mpfr-4.1.0-b/tests/tsinh_cosh.c ---- mpfr-4.1.0-a/tests/tsinh_cosh.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tsinh_cosh.c 2021-02-11 12:48:27.350242965 +0000 -@@ -23,7 +23,7 @@ - #include "mpfr-test.h" - - static void --failed (mpfr_t x, mpfr_t esh, mpfr_t gsh, mpfr_t ech, mpfr_t gch) -+failed (mpfr_ptr x, mpfr_ptr esh, mpfr_ptr gsh, mpfr_ptr ech, mpfr_ptr gch) - { - printf ("error : mpfr_sinh_cosh (x) x = "); - mpfr_out_str (stdout, 10, 0, x, MPFR_RNDD); -@@ -43,7 +43,7 @@ - - /* check against sinh, cosh */ - static void --check (mpfr_t x, mpfr_rnd_t rnd) -+check (mpfr_ptr x, mpfr_rnd_t rnd) - { - mpfr_t s, c, sx, cx; - int isc, is, ic; -diff -Naurd mpfr-4.1.0-a/tests/tsqr.c mpfr-4.1.0-b/tests/tsqr.c ---- mpfr-4.1.0-a/tests/tsqr.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tsqr.c 2021-02-11 12:48:27.350242965 +0000 -@@ -33,7 +33,7 @@ - - static void - error1 (mpfr_rnd_t rnd, mpfr_prec_t prec, -- mpfr_t in, mpfr_t outmul, mpfr_t outsqr) -+ mpfr_t in, mpfr_ptr outmul, mpfr_ptr outsqr) - { - printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd), - (unsigned long) prec); -@@ -44,7 +44,7 @@ - } - - static void --error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_t in, mpfr_t out, -+error2 (mpfr_rnd_t rnd, mpfr_prec_t prec, mpfr_ptr in, mpfr_ptr out, - int inexactmul, int inexactsqr) - { - printf("ERROR: for %s and prec=%lu\nINPUT=", mpfr_print_rnd_mode(rnd), -diff -Naurd mpfr-4.1.0-a/tests/tsum.c mpfr-4.1.0-b/tests/tsum.c ---- mpfr-4.1.0-a/tests/tsum.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tsum.c 2021-02-11 12:48:27.350242965 +0000 -@@ -59,7 +59,7 @@ - } - - static void --get_exact_sum (mpfr_t sum, mpfr_t *tab, int n) -+get_exact_sum (mpfr_ptr sum, mpfr_t *tab, int n) - { - int i; - -@@ -1198,7 +1198,7 @@ - } - - static int --mpfr_sum_naive (mpfr_t s, mpfr_t *x, int n, mpfr_rnd_t rnd) -+mpfr_sum_naive (mpfr_ptr s, mpfr_t *x, int n, mpfr_rnd_t rnd) - { - int ret, i; - switch (n) -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:50:22.384987438 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:50:22.424987002 +0000 -@@ -0,0 +1 @@ -+digamma-hugemem -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:48:27.370242746 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:50:22.424987002 +0000 -@@ -1 +1 @@ --4.1.0-p4 -+4.1.0-p5 -diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c ---- mpfr-4.1.0-a/src/digamma.c 2020-06-18 17:17:18.000000000 +0000 -+++ mpfr-4.1.0-b/src/digamma.c 2021-02-11 12:50:22.412987133 +0000 -@@ -214,19 +214,27 @@ - (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec(x), mpfr_log_prec, x, rnd_mode), - ("y[%Pu]=%.*Rg inexact=%d", mpfr_get_prec(y), mpfr_log_prec, y, inex)); - -- /* compute a precision q such that x+1 is exact */ -- if (MPFR_PREC(x) < MPFR_GET_EXP(x)) -- q = MPFR_EXP(x); -- else -- q = MPFR_PREC(x) + 1; -- -- /* for very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)) */ -- if (MPFR_PREC(y) + 10 < MPFR_EXP(x)) -+ /* For very large x, use |digamma(x) - log(x)| < 1/x < 2^(1-EXP(x)). -+ However, for a fixed value of GUARD, MPFR_CAN_ROUND() might fail -+ with probability 1/2^GUARD, in which case the default code will -+ fail since it requires x+1 to be exact, thus a huge precision if -+ x is huge. There are two workarounds: -+ * either perform a Ziv's loop, by increasing GUARD at each step. -+ However, this might fail if x is moderately large, in which case -+ more terms of the asymptotic expansion would be needed. -+ * implement a full asymptotic expansion (with Ziv's loop). */ -+#define GUARD 30 -+ if (MPFR_PREC(y) + GUARD < MPFR_EXP(x)) - { - /* this ensures EXP(x) >= 3, thus x >= 4, thus log(x) > 1 */ -- mpfr_init2 (t, MPFR_PREC(y) + 10); -- mpfr_log (t, x, MPFR_RNDZ); -- if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + 10, MPFR_PREC(y), rnd_mode)) -+ mpfr_init2 (t, MPFR_PREC(y) + GUARD); -+ mpfr_log (t, x, MPFR_RNDN); -+ /* |t - digamma(x)| <= 1/2*ulp(t) + |digamma(x) - log(x)| -+ <= 1/2*ulp(t) + 2^(1-EXP(x)) -+ <= 1/2*ulp(t) + 2^(-PREC(y)-GUARD) -+ <= ulp(t) -+ since |t| >= 1 thus ulp(t) >= 2^(1-PREC(y)-GUARD) */ -+ if (MPFR_CAN_ROUND (t, MPFR_PREC(y) + GUARD, MPFR_PREC(y), rnd_mode)) - { - inex = mpfr_set (y, t, rnd_mode); - mpfr_clear (t); -@@ -235,6 +243,21 @@ - mpfr_clear (t); - } - -+ /* compute a precision q such that x+1 is exact */ -+ if (MPFR_PREC(x) < MPFR_GET_EXP(x)) -+ { -+ /* The goal of the first assertion is to let the compiler ignore -+ the second one when MPFR_EMAX_MAX <= MPFR_PREC_MAX. */ -+ MPFR_ASSERTD (MPFR_EXP(x) <= MPFR_EMAX_MAX); -+ MPFR_ASSERTN (MPFR_EXP(x) <= MPFR_PREC_MAX); -+ q = MPFR_EXP(x); -+ } -+ else -+ q = MPFR_PREC(x) + 1; -+ -+ /* FIXME: q can be much too large, e.g. equal to the maximum exponent! */ -+ MPFR_LOG_MSG (("q=%Pu\n", q)); -+ - mpfr_init2 (x_plus_j, q); - - mpfr_init2 (t, p); -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:48:27.366242791 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:50:22.424987002 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p4" -+#define MPFR_VERSION_STRING "4.1.0-p5" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:48:27.370242746 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:50:22.424987002 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p4"; -+ return "4.1.0-p5"; - } -diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c ---- mpfr-4.1.0-a/tests/tdigamma.c 2020-06-18 17:17:18.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-11 12:50:22.412987133 +0000 -@@ -49,12 +49,54 @@ - mpfr_clear (y); - } - -+/* With some GMP_CHECK_RANDOMIZE values, test_generic triggers an error -+ tests_addsize(): too much memory (576460752303432776 bytes) -+ Each time on prec = 200, n = 3, xprec = 140. -+ The following test is a more general testcase. -+*/ -+static void -+bug20210206 (void) -+{ -+#define NPREC 4 -+ mpfr_t x, y[NPREC], z; -+ mpfr_exp_t emin, emax; -+ int i, precx, precy[NPREC] = { 200, 400, 520, 1416 }; -+ -+ emin = mpfr_get_emin (); -+ emax = mpfr_get_emax (); -+ set_emin (MPFR_EMIN_MIN); -+ set_emax (MPFR_EMAX_MAX); -+ -+ for (i = 0; i < NPREC; i++) -+ mpfr_init2 (y[i], precy[i]); -+ mpfr_init2 (z, precy[0]); -+ -+ for (precx = MPFR_PREC_MIN; precx < 150; precx++) -+ { -+ mpfr_init2 (x, precx); -+ mpfr_setmax (x, __gmpfr_emax); -+ for (i = 0; i < NPREC; i++) -+ mpfr_digamma (y[i], x, MPFR_RNDA); -+ mpfr_set (z, y[1], MPFR_RNDA); -+ MPFR_ASSERTN (mpfr_equal_p (y[0], z)); -+ mpfr_clear (x); -+ } -+ -+ for (i = 0; i < NPREC; i++) -+ mpfr_clear (y[i]); -+ mpfr_clear (z); -+ -+ set_emin (emin); -+ set_emax (emax); -+} -+ - int - main (int argc, char *argv[]) - { - tests_start_mpfr (); - - special (); -+ bug20210206 (); - - test_generic (MPFR_PREC_MIN, 200, 20); - -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:52:52.519350662 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:52:52.563350183 +0000 -@@ -0,0 +1 @@ -+digamma-interm-zero -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:50:22.424987002 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:52:52.563350183 +0000 -@@ -1 +1 @@ --4.1.0-p5 -+4.1.0-p6 -diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c ---- mpfr-4.1.0-a/src/digamma.c 2021-02-11 12:50:22.412987133 +0000 -+++ mpfr-4.1.0-b/src/digamma.c 2021-02-11 12:52:52.547350357 +0000 -@@ -296,21 +296,26 @@ - errt = mpfr_digamma_approx (t, x_plus_j); - expt = MPFR_GET_EXP (t); - mpfr_sub (t, t, u, MPFR_RNDN); -- if (MPFR_GET_EXP (t) < expt) -- errt += expt - MPFR_EXP(t); -- /* Warning: if u is zero (which happens when x_plus_j >= min at the -- beginning of the while loop above), EXP(u) is not defined. -- In this case we have no error from u. */ -- if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u)) -- erru += MPFR_EXP(u) - MPFR_EXP(t); -- if (errt > erru) -- errt = errt + 1; -- else if (errt == erru) -- errt = errt + 2; -- else -- errt = erru + 1; -- if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode)) -- break; -+ /* Warning! t may be zero (more likely in small precision). Note -+ that in this case, this is an exact zero, not an underflow. */ -+ if (MPFR_NOTZERO(t)) -+ { -+ if (MPFR_GET_EXP (t) < expt) -+ errt += expt - MPFR_EXP(t); -+ /* Warning: if u is zero (which happens when x_plus_j >= min at the -+ beginning of the while loop above), EXP(u) is not defined. -+ In this case we have no error from u. */ -+ if (MPFR_NOTZERO(u) && MPFR_GET_EXP (t) < MPFR_GET_EXP (u)) -+ erru += MPFR_EXP(u) - MPFR_EXP(t); -+ if (errt > erru) -+ errt = errt + 1; -+ else if (errt == erru) -+ errt = errt + 2; -+ else -+ errt = erru + 1; -+ if (MPFR_CAN_ROUND (t, p - errt, MPFR_PREC(y), rnd_mode)) -+ break; -+ } - MPFR_ZIV_NEXT (loop, p); - mpfr_set_prec (t, p); - mpfr_set_prec (u, p); -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:50:22.424987002 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:52:52.559350226 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p5" -+#define MPFR_VERSION_STRING "4.1.0-p6" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:50:22.424987002 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:52:52.559350226 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p5"; -+ return "4.1.0-p6"; - } -diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c ---- mpfr-4.1.0-a/tests/tdigamma.c 2021-02-11 12:50:22.412987133 +0000 -+++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-11 12:52:52.547350357 +0000 -@@ -90,6 +90,26 @@ - set_emax (emax); - } - -+/* another test that fails with GMP_CHECK_RANDOMIZE=1612741376857003 -+ on revision 14398 */ -+static void -+bug20210208 (void) -+{ -+ mpfr_t x, y; -+ int inex; -+ -+ mpfr_init2 (x, 73); -+ mpfr_init2 (y, 1); -+ mpfr_set_str (x, "1.4613470547060071827450", 10, MPFR_RNDN); -+ mpfr_clear_flags (); -+ inex = mpfr_digamma (y, x, MPFR_RNDU); -+ MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -12) == 0); -+ MPFR_ASSERTN (inex > 0); -+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -97,6 +117,7 @@ - - special (); - bug20210206 (); -+ bug20210208 (); - - test_generic (MPFR_PREC_MIN, 200, 20); - -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-11 12:53:38.382850990 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-11 12:53:38.426850512 +0000 -@@ -0,0 +1 @@ -+jn-interm-zero -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:52:52.563350183 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-11 12:53:38.426850512 +0000 -@@ -1 +1 @@ --4.1.0-p6 -+4.1.0-p7 -diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c ---- mpfr-4.1.0-a/src/jyn_asympt.c 2020-07-10 10:33:32.000000000 +0000 -+++ mpfr-4.1.0-b/src/jyn_asympt.c 2021-02-11 12:53:38.410850685 +0000 -@@ -69,6 +69,8 @@ - MPFR_ZIV_INIT (loop, w); - for (;;) - { -+ int ok = 1; -+ - mpfr_set_prec (c, w); - mpfr_init2 (s, w); - mpfr_init2 (P, w); -@@ -92,6 +94,13 @@ - /* now s approximates sin(z)+cos(z), and c approximates sin(z)-cos(z), - with total absolute error bounded by 2^(1-w). */ - -+ /* if s or c is zero, MPFR_GET_EXP will fail below */ -+ if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c)) -+ { -+ ok = 0; -+ goto clear; -+ } -+ - /* precompute 1/(8|z|) */ - mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN); /* err <= 1 */ - mpfr_div_2ui (iz, iz, 3, MPFR_RNDN); -@@ -257,6 +266,9 @@ - err = (err >= err2) ? err + 1 : err2 + 1; - /* the absolute error on c is bounded by 2^(err - w) */ - -+ err -= MPFR_GET_EXP (c); -+ -+ clear: - mpfr_clear (s); - mpfr_clear (P); - mpfr_clear (Q); -@@ -266,8 +278,7 @@ - mpfr_clear (err_s); - mpfr_clear (err_u); - -- err -= MPFR_GET_EXP (c); -- if (MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r))) -+ if (ok && MPFR_LIKELY (MPFR_CAN_ROUND (c, w - err, MPFR_PREC(res), r))) - break; - if (diverge != 0) - { -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:52:52.559350226 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-11 12:53:38.422850555 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p6" -+#define MPFR_VERSION_STRING "4.1.0-p7" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:52:52.559350226 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-11 12:53:38.426850512 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p6"; -+ return "4.1.0-p7"; - } -diff -Naurd mpfr-4.1.0-a/tests/tj0.c mpfr-4.1.0-b/tests/tj0.c ---- mpfr-4.1.0-a/tests/tj0.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tj0.c 2021-02-11 12:53:38.410850685 +0000 -@@ -27,6 +27,25 @@ - #define REDUCE_EMAX 262143 /* otherwise arg. reduction is too expensive */ - #include "tgeneric.c" - -+/* bug found in revision 14399 with GMP_CHECK_RANDOMIZE=1612721106588971 */ -+static void -+bug20210208 (void) -+{ -+ mpfr_t x, y; -+ int inex; -+ -+ mpfr_init2 (x, 79); -+ mpfr_init2 (y, 1); -+ mpfr_set_str (x, "2.552495117262005805960565e+02", 10, MPFR_RNDN); -+ mpfr_clear_flags (); -+ inex = mpfr_j0 (y, x, MPFR_RNDZ); -+ MPFR_ASSERTN (mpfr_cmp_si_2exp (y, -1, -5) == 0); -+ MPFR_ASSERTN (inex > 0); -+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -35,6 +54,8 @@ - - tests_start_mpfr (); - -+ bug20210208 (); -+ - mpfr_init (x); - mpfr_init (y); - -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-17 17:22:34.594973310 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-17 17:22:34.702972090 +0000 -@@ -0,0 +1 @@ -+digamma-interm-zero2 -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-11 12:53:38.426850512 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-17 17:22:34.702972090 +0000 -@@ -1 +1 @@ --4.1.0-p7 -+4.1.0-p8 -diff -Naurd mpfr-4.1.0-a/src/digamma.c mpfr-4.1.0-b/src/digamma.c ---- mpfr-4.1.0-a/src/digamma.c 2021-02-11 12:52:52.547350357 +0000 -+++ mpfr-4.1.0-b/src/digamma.c 2021-02-17 17:22:34.690972226 +0000 -@@ -173,16 +173,19 @@ - mpfr_digamma (v, u, MPFR_RNDN); /* error <= 1/2 ulp */ - expv = MPFR_GET_EXP (v); - mpfr_sub (v, v, t, MPFR_RNDN); -- if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t)) -- e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */ -- /* now take into account the 1/2 ulp error for v */ -- if (expv - MPFR_EXP(v) - 1 > e1) -- e1 = expv - MPFR_EXP(v) - 1; -- else -- e1 ++; -- e1 ++; /* rounding error for mpfr_sub */ -- if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode)) -- break; -+ if (MPFR_NOTZERO(v)) -+ { -+ if (MPFR_GET_EXP (v) < MPFR_GET_EXP (t)) -+ e1 += MPFR_EXP(t) - MPFR_EXP(v); /* scale error for t wrt new v */ -+ /* now take into account the 1/2 ulp error for v */ -+ if (expv - MPFR_EXP(v) - 1 > e1) -+ e1 = expv - MPFR_EXP(v) - 1; -+ else -+ e1 ++; -+ e1 ++; /* rounding error for mpfr_sub */ -+ if (MPFR_CAN_ROUND (v, p - e1, MPFR_PREC(y), rnd_mode)) -+ break; -+ } - MPFR_ZIV_NEXT (loop, p); - mpfr_set_prec (t, p); - mpfr_set_prec (v, p); -@@ -416,10 +419,8 @@ - } - } - -- if (MPFR_IS_NEG(x)) -- inex = mpfr_digamma_reflection (y, x, rnd_mode); - /* if x < 1/2 we use the reflection formula */ -- else if (MPFR_EXP(x) < 0) -+ if (MPFR_IS_NEG(x) || MPFR_EXP(x) < 0) - inex = mpfr_digamma_reflection (y, x, rnd_mode); - else - inex = mpfr_digamma_positive (y, x, rnd_mode); -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-11 12:53:38.422850555 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-17 17:22:34.702972090 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p7" -+#define MPFR_VERSION_STRING "4.1.0-p8" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-11 12:53:38.426850512 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-17 17:22:34.702972090 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p7"; -+ return "4.1.0-p8"; - } -diff -Naurd mpfr-4.1.0-a/tests/tdigamma.c mpfr-4.1.0-b/tests/tdigamma.c ---- mpfr-4.1.0-a/tests/tdigamma.c 2021-02-11 12:52:52.547350357 +0000 -+++ mpfr-4.1.0-b/tests/tdigamma.c 2021-02-17 17:22:34.690972226 +0000 -@@ -110,6 +110,26 @@ - mpfr_clear (y); - } - -+/* another test that fails with GMP_CHECK_RANDOMIZE=1613197421465830 -+ on revision 14429 */ -+static void -+bug20210215 (void) -+{ -+ mpfr_t x, y; -+ int inex; -+ -+ mpfr_init2 (x, 510); -+ mpfr_init2 (y, 4); -+ mpfr_set_str (x, "-8.2923051438433494998166335341807999322052669984208422481227138906096000469898717007386115912802685588348601663465077353194268894939972221117314512518182580e+35", 10, MPFR_RNDN); -+ mpfr_clear_flags (); -+ inex = mpfr_digamma (y, x, MPFR_RNDU); -+ MPFR_ASSERTN (mpfr_cmp_ui0 (y, 88) == 0); -+ MPFR_ASSERTN (inex > 0); -+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -118,6 +138,7 @@ - special (); - bug20210206 (); - bug20210208 (); -+ bug20210215 (); - - test_generic (MPFR_PREC_MIN, 200, 20); - -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-02-17 17:25:46.396981483 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-02-17 17:25:46.440981068 +0000 -@@ -0,0 +1 @@ -+jyn_asympt-interm-zero -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-17 17:22:34.702972090 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-02-17 17:25:46.440981068 +0000 -@@ -1 +1 @@ --4.1.0-p8 -+4.1.0-p9 -diff -Naurd mpfr-4.1.0-a/src/jyn_asympt.c mpfr-4.1.0-b/src/jyn_asympt.c ---- mpfr-4.1.0-a/src/jyn_asympt.c 2021-02-11 12:53:38.410850685 +0000 -+++ mpfr-4.1.0-b/src/jyn_asympt.c 2021-02-17 17:25:46.424981219 +0000 -@@ -69,7 +69,7 @@ - MPFR_ZIV_INIT (loop, w); - for (;;) - { -- int ok = 1; -+ int ok = 0; - - mpfr_set_prec (c, w); - mpfr_init2 (s, w); -@@ -96,10 +96,7 @@ - - /* if s or c is zero, MPFR_GET_EXP will fail below */ - if (MPFR_IS_ZERO(s) || MPFR_IS_ZERO(c)) -- { -- ok = 0; -- goto clear; -- } -+ goto clear; /* with ok=0 */ - - /* precompute 1/(8|z|) */ - mpfr_si_div (iz, MPFR_IS_POS(z) ? 1 : -1, z, MPFR_RNDN); /* err <= 1 */ -@@ -227,6 +224,9 @@ - mpfr_sub (s, c, s, MPFR_RNDN); - #endif - } -+ if (MPFR_IS_ZERO(s)) -+ goto clear; /* with ok=0 */ -+ ok = 1; - if ((n & 2) != 0) - mpfr_neg (s, s, MPFR_RNDN); - if (MPFR_GET_EXP (s) > err) -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-17 17:22:34.702972090 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-02-17 17:25:46.436981105 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p8" -+#define MPFR_VERSION_STRING "4.1.0-p9" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-17 17:22:34.702972090 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-02-17 17:25:46.440981068 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p8"; -+ return "4.1.0-p9"; - } -diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h ---- mpfr-4.1.0-a/tests/mpfr-test.h 2020-06-29 13:57:32.000000000 +0000 -+++ mpfr-4.1.0-b/tests/mpfr-test.h 2021-02-17 17:25:46.424981219 +0000 -@@ -191,6 +191,8 @@ - - #define mpfr_cmp0(x,y) (MPFR_ASSERTN (!MPFR_IS_NAN (x) && !MPFR_IS_NAN (y)), mpfr_cmp (x,y)) - #define mpfr_cmp_ui0(x,i) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), mpfr_cmp_ui (x,i)) -+#define mpfr_cmp_si_2exp0(x,i,e) (MPFR_ASSERTN (!MPFR_IS_NAN (x)), \ -+ mpfr_cmp_si_2exp (x,i,e)) - - /* define CHECK_EXTERNAL if you want to check mpfr against another library - with correct rounding. You'll probably have to modify mpfr_print_raw() -diff -Naurd mpfr-4.1.0-a/tests/tj1.c mpfr-4.1.0-b/tests/tj1.c ---- mpfr-4.1.0-a/tests/tj1.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tj1.c 2021-02-17 17:25:46.424981219 +0000 -@@ -55,14 +55,14 @@ - /* since |x| is just above 2^e, |j1(x)| is just above 2^(e-1), - thus y should be 2^(e-1) and the inexact flag should be - of opposite sign of x */ -- MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e - 1) == 0); -+ MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e - 1) == 0); - MPFR_ASSERTN(VSIGN (inex) * sign < 0); - } - else - { - /* here |y| should be 0.5*2^emin and the inexact flag should - have the sign of x */ -- MPFR_ASSERTN(mpfr_cmp_si_2exp (y, sign, e) == 0); -+ MPFR_ASSERTN(mpfr_cmp_si_2exp0 (y, sign, e) == 0); - MPFR_ASSERTN(VSIGN (inex) * sign > 0); - } - } -@@ -72,6 +72,26 @@ - mpfr_clear (y); - } - -+/* a test that fails with GMP_CHECK_RANDOMIZE=1613146232984428 -+ on revision 14429 */ -+static void -+bug20210215 (void) -+{ -+ mpfr_t x, y; -+ int inex; -+ -+ mpfr_init2 (x, 221); -+ mpfr_init2 (y, 1); -+ mpfr_set_str (x, "1.6484611511696130037307738844228498447763863563070374544054791168614e+01", 10, MPFR_RNDN); -+ mpfr_clear_flags (); -+ inex = mpfr_j1 (y, x, MPFR_RNDZ); -+ MPFR_ASSERTN (mpfr_cmp_si_2exp0 (y, -1, -9) == 0); -+ MPFR_ASSERTN (inex > 0); -+ MPFR_ASSERTN (__gmpfr_flags == MPFR_FLAGS_INEXACT); -+ mpfr_clear (x); -+ mpfr_clear (y); -+} -+ - int - main (int argc, char *argv[]) - { -@@ -79,6 +99,8 @@ - - tests_start_mpfr (); - -+ bug20210215 (); -+ - test_small (); - - mpfr_init (x); -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-03-09 13:55:43.183158946 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-03-09 13:55:43.223158508 +0000 -@@ -0,0 +1 @@ -+macros -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-02-17 17:25:46.440981068 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-03-09 13:55:43.223158508 +0000 -@@ -1 +1 @@ --4.1.0-p9 -+4.1.0-p10 -diff -Naurd mpfr-4.1.0-a/doc/mpfr.info mpfr-4.1.0-b/doc/mpfr.info ---- mpfr-4.1.0-a/doc/mpfr.info 2020-07-10 11:59:13.000000000 +0000 -+++ mpfr-4.1.0-b/doc/mpfr.info 2021-03-09 13:55:51.167071327 +0000 -@@ -3217,7 +3217,11 @@ - - Each function in this interface is also implemented as a macro for - efficiency reasons: for example ‘mpfr_custom_init (s, p)’ uses the --macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. -+macro, while ‘(mpfr_custom_init) (s, p)’ uses the function. Note that -+the macro may evaluate arguments multiple times (or none). Moreover, -+macros implementing functions with the ‘void’ return type may not be -+used in contexts where an expression is expected, e.g., inside -+‘for(...)’ or before a comma operator. - - Note 1: MPFR functions may still initialize temporary floating-point - numbers using ‘mpfr_init’ and similar functions. See Custom Allocation -@@ -4579,13 +4583,13 @@ - (line 115) - * mpfr_csch: Transcendental Functions. - (line 180) --* mpfr_custom_get_exp: Custom Interface. (line 76) --* mpfr_custom_get_kind: Custom Interface. (line 66) --* mpfr_custom_get_significand: Custom Interface. (line 71) --* mpfr_custom_get_size: Custom Interface. (line 37) --* mpfr_custom_init: Custom Interface. (line 41) --* mpfr_custom_init_set: Custom Interface. (line 48) --* mpfr_custom_move: Custom Interface. (line 85) -+* mpfr_custom_get_exp: Custom Interface. (line 80) -+* mpfr_custom_get_kind: Custom Interface. (line 70) -+* mpfr_custom_get_significand: Custom Interface. (line 75) -+* mpfr_custom_get_size: Custom Interface. (line 41) -+* mpfr_custom_init: Custom Interface. (line 45) -+* mpfr_custom_init_set: Custom Interface. (line 52) -+* mpfr_custom_move: Custom Interface. (line 89) - * MPFR_DECL_INIT: Initialization Functions. - (line 77) - * mpfr_digamma: Transcendental Functions. -@@ -5165,19 +5169,19 @@ - Node: Memory Handling Functions155904 - Node: Compatibility with MPF157792 - Node: Custom Interface160961 --Node: Internals165592 --Node: API Compatibility167136 --Node: Type and Macro Changes169084 --Node: Added Functions172267 --Node: Changed Functions177074 --Node: Removed Functions184433 --Node: Other Changes185163 --Node: MPFR and the IEEE 754 Standard186864 --Node: Contributors189481 --Node: References192620 --Node: GNU Free Documentation License194501 --Node: Concept Index217095 --Node: Function and Type Index223168 -+Node: Internals165852 -+Node: API Compatibility167396 -+Node: Type and Macro Changes169344 -+Node: Added Functions172527 -+Node: Changed Functions177334 -+Node: Removed Functions184693 -+Node: Other Changes185423 -+Node: MPFR and the IEEE 754 Standard187124 -+Node: Contributors189741 -+Node: References192880 -+Node: GNU Free Documentation License194761 -+Node: Concept Index217355 -+Node: Function and Type Index223428 -  - End Tag Table - -diff -Naurd mpfr-4.1.0-a/doc/mpfr.texi mpfr-4.1.0-b/doc/mpfr.texi ---- mpfr-4.1.0-a/doc/mpfr.texi 2020-07-10 11:52:33.000000000 +0000 -+++ mpfr-4.1.0-b/doc/mpfr.texi 2021-03-09 13:55:43.211158639 +0000 -@@ -3817,6 +3817,12 @@ - Each function in this interface is also implemented as a macro for - efficiency reasons: for example @code{mpfr_custom_init (s, p)} - uses the macro, while @code{(mpfr_custom_init) (s, p)} uses the function. -+Note that the macro may evaluate arguments multiple times (or none). -+Moreover, macros implementing functions with the @code{void} return type -+may not be used in contexts where an expression is expected, e.g., inside -+@code{for(...)} or before a comma operator. -+@c These limitations with macros cannot be avoided in a C90 compatible way. -+@c In the future, inline functions could be used. - - Note 1: MPFR functions may still initialize temporary floating-point numbers - using @code{mpfr_init} and similar functions. See Custom Allocation (GNU MP)@. -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-02-17 17:25:46.436981105 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-03-09 13:55:43.223158508 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p9" -+#define MPFR_VERSION_STRING "4.1.0-p10" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -@@ -833,23 +833,39 @@ - even if it produces faster and smaller code. */ - #ifndef MPFR_USE_NO_MACRO - --/* Inlining these functions is both faster and smaller */ --#define mpfr_nan_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_NAN) --#define mpfr_inf_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_INF) --#define mpfr_zero_p(_x) ((_x)->_mpfr_exp == __MPFR_EXP_ZERO) --#define mpfr_regular_p(_x) ((_x)->_mpfr_exp > __MPFR_EXP_INF) -+/* In the implementation of these macros, we need to make sure that the -+ arguments are evaluated one time exactly and that type conversion is -+ done as it would be with a function. Tests should be added to ensure -+ that. -+ Note that the macros for the custom interface are not concerned; the -+ MPFR manual has been clarified. */ -+ -+/* Prevent x from being used as an lvalue. -+ Thanks to Wojtek Lerch and Tim Rentsch for the idea. */ -+#define MPFR_VALUE_OF(x) (0 ? (x) : (x)) -+ -+/* The following macro converts the argument to mpfr_srcptr, as in type -+ conversion for function parameters. But it will detect disallowed -+ implicit conversions, e.g. when the argument has an integer type. */ -+#define MPFR_SRCPTR(x) ((mpfr_srcptr) (0 ? (x) : (mpfr_srcptr) (x))) -+#define MPFR_GET_SIGN(_x) MPFR_VALUE_OF(MPFR_SIGN(MPFR_SRCPTR(_x))) -+ -+#define mpfr_nan_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_NAN) -+#define mpfr_inf_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_INF) -+#define mpfr_zero_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp == __MPFR_EXP_ZERO) -+#define mpfr_regular_p(_x) (MPFR_SRCPTR(_x)->_mpfr_exp > __MPFR_EXP_INF) -+ -+/* mpfr_sgn is documented as a macro, thus the following code is fine. -+ But it would be safer to regard it as a function in some future -+ MPFR version. */ - #define mpfr_sgn(_x) \ - ((_x)->_mpfr_exp < __MPFR_EXP_INF ? \ - (mpfr_nan_p (_x) ? mpfr_set_erangeflag () : (mpfr_void) 0), 0 : \ - MPFR_SIGN (_x)) - --/* Prevent them from using as lvalues */ --#define MPFR_VALUE_OF(x) (0 ? (x) : (x)) --#define mpfr_get_prec(_x) MPFR_VALUE_OF((_x)->_mpfr_prec) --#define mpfr_get_exp(_x) MPFR_VALUE_OF((_x)->_mpfr_exp) --/* Note 1: If need be, the MPFR_VALUE_OF can be used for other expressions -- (of any type). Thanks to Wojtek Lerch and Tim Rentsch for the idea. -- Note 2: Defining mpfr_get_exp() as a macro has the effect to disable -+#define mpfr_get_prec(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_prec) -+#define mpfr_get_exp(_x) MPFR_VALUE_OF(MPFR_SRCPTR(_x)->_mpfr_exp) -+/* Note: Defining mpfr_get_exp() as a macro has the effect to disable - the check that the argument is a pure FP number (done in the function); - this increases the risk of undetected error and makes debugging more - complex. Is it really worth in practice? (Potential FIXME) */ -@@ -861,11 +877,17 @@ - - #define mpfr_cmp_ui(b,i) mpfr_cmp_ui_2exp((b),(i),0) - #define mpfr_cmp_si(b,i) mpfr_cmp_si_2exp((b),(i),0) --#define mpfr_set(a,b,r) mpfr_set4(a,b,r,MPFR_SIGN(b)) -+#if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 -+#define mpfr_set(a,b,r) \ -+ __extension__ ({ \ -+ mpfr_srcptr _p = (b); \ -+ mpfr_set4(a,_p,r,MPFR_SIGN(_p)); \ -+ }) -+#endif - #define mpfr_abs(a,b,r) mpfr_set4(a,b,r,1) --#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_SIGN(c)) -+#define mpfr_copysign(a,b,c,r) mpfr_set4(a,b,r,MPFR_GET_SIGN(c)) - #define mpfr_setsign(a,b,s,r) mpfr_set4(a,b,r,(s) ? -1 : 1) --#define mpfr_signbit(x) (MPFR_SIGN(x) < 0) -+#define mpfr_signbit(x) (MPFR_GET_SIGN(x) < 0) - #define mpfr_cmp(b, c) mpfr_cmp3(b, c, 1) - #define mpfr_mul_2exp(y,x,n,r) mpfr_mul_2ui((y),(x),(n),(r)) - #define mpfr_div_2exp(y,x,n,r) mpfr_div_2ui((y),(x),(n),(r)) -diff -Naurd mpfr-4.1.0-a/src/ubf.c mpfr-4.1.0-b/src/ubf.c ---- mpfr-4.1.0-a/src/ubf.c 2020-02-12 01:38:57.000000000 +0000 -+++ mpfr-4.1.0-b/src/ubf.c 2021-03-09 13:55:43.211158639 +0000 -@@ -78,7 +78,7 @@ - mpfr_get_prec (b), mpfr_log_prec, b, - mpfr_get_prec (c), mpfr_log_prec, c), - ("a[%Pu]=%.*Rg", -- mpfr_get_prec (a), mpfr_log_prec, a)); -+ mpfr_get_prec ((mpfr_ptr) a), mpfr_log_prec, a)); - - MPFR_ASSERTD ((mpfr_ptr) a != b); - MPFR_ASSERTD ((mpfr_ptr) a != c); -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-02-17 17:25:46.440981068 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-03-09 13:55:43.223158508 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p9"; -+ return "4.1.0-p10"; - } -diff -Naurd mpfr-4.1.0-a/tests/mpfr-test.h mpfr-4.1.0-b/tests/mpfr-test.h ---- mpfr-4.1.0-a/tests/mpfr-test.h 2021-02-17 17:25:46.424981219 +0000 -+++ mpfr-4.1.0-b/tests/mpfr-test.h 2021-03-09 13:55:43.211158639 +0000 -@@ -92,6 +92,32 @@ - #define STRINGIZE(S) #S - #define MAKE_STR(S) STRINGIZE(S) - -+/* In C (but not C++), mpfr_ptr and mpfr_srcptr arguments can be provided -+ in a different pointer type, such as void *. For functions implemented -+ as macros, the type conversion for the function parameters will not be -+ done by the compiler, which means potential bugs in these implementations -+ if we forget to take these unusual cases into account. So we need to test -+ such arguments, in order to make sure that the arguments are converted to -+ the expected type when needed. -+ -+ However, at least when the function is not implemented as a macro (which -+ is the case when MPFR_USE_NO_MACRO is defined), such tests with void * -+ arguments are not valid in C++; therefore, we will not do the cast to -+ void * if the __cplusplus macro is defined. And with GCC compilers (and -+ compatible), we will ignore the -Wc++-compat option around these tests. -+ -+ Note: in the future, inline functions could be used instead of macros, -+ and such tests would become useless (except to detect compiler bugs). -+*/ -+#if defined (__cplusplus) -+#define VOIDP_CAST(X) (X) -+#else -+#define VOIDP_CAST(X) ((void *) (X)) -+#if defined (__GNUC__) -+#define IGNORE_CPP_COMPAT -+#endif -+#endif -+ - #if defined (__cplusplus) - extern "C" { - #endif -diff -Naurd mpfr-4.1.0-a/tests/tcopysign.c mpfr-4.1.0-b/tests/tcopysign.c ---- mpfr-4.1.0-a/tests/tcopysign.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tcopysign.c 2021-03-09 13:55:43.211158639 +0000 -@@ -26,26 +26,72 @@ - copysign_variant (mpfr_ptr z, mpfr_srcptr x, mpfr_srcptr y, - mpfr_rnd_t rnd_mode, int k) - { -+ mpfr_srcptr p; -+ int a = 0, b = 0, c = 0; -+ -+ /* invalid sign, to test that the sign is always correctly set */ -+ MPFR_SIGN (z) = 0; -+ -+ if (k >= 8) -+ { -+ MPFR_ASSERTN (MPFR_PREC (z) >= MPFR_PREC (x)); -+ mpfr_set (z, x, MPFR_RNDN); -+ p = z; -+ k -= 8; -+ } -+ else -+ p = x; -+ - mpfr_clear_flags (); - switch (k) - { - case 0: -- mpfr_copysign (z, x, y, MPFR_RNDN); -+ mpfr_copysign (z, p, y, rnd_mode); - return; - case 1: -- (mpfr_copysign) (z, x, y, MPFR_RNDN); -+ (mpfr_copysign) (z, p, y, rnd_mode); - return; - case 2: -- mpfr_setsign (z, x, mpfr_signbit (y), MPFR_RNDN); -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wc++-compat" -+#endif -+ mpfr_copysign ((a++, VOIDP_CAST(z)), -+ (b++, VOIDP_CAST(p)), -+ (c++, VOIDP_CAST(y)), rnd_mode); -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic pop -+#endif -+ MPFR_ASSERTN (a == 1); -+ MPFR_ASSERTN (b == 1); -+ MPFR_ASSERTN (c == 1); - return; - case 3: -- mpfr_setsign (z, x, (mpfr_signbit) (y), MPFR_RNDN); -+ mpfr_setsign (z, p, mpfr_signbit (y), rnd_mode); - return; - case 4: -- (mpfr_setsign) (z, x, mpfr_signbit (y), MPFR_RNDN); -+ mpfr_setsign (z, p, (mpfr_signbit) (y), rnd_mode); - return; - case 5: -- (mpfr_setsign) (z, x, (mpfr_signbit) (y), MPFR_RNDN); -+ (mpfr_setsign) (z, p, mpfr_signbit (y), rnd_mode); -+ return; -+ case 6: -+ (mpfr_setsign) (z, p, (mpfr_signbit) (y), rnd_mode); -+ return; -+ case 7: -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wc++-compat" -+#endif -+ mpfr_setsign ((a++, VOIDP_CAST(z)), -+ (b++, VOIDP_CAST(p)), -+ mpfr_signbit ((c++, VOIDP_CAST(y))), rnd_mode); -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic pop -+#endif -+ MPFR_ASSERTN (a == 1); -+ MPFR_ASSERTN (b == 1); -+ MPFR_ASSERTN (c == 1); - return; - } - } -@@ -64,7 +110,7 @@ - - for (i = 0; i <= 1; i++) - for (j = 0; j <= 1; j++) -- for (k = 0; k <= 5; k++) -+ for (k = 0; k < 16; k++) - { - mpfr_set_nan (x); - i ? MPFR_SET_NEG (x) : MPFR_SET_POS (x); -diff -Naurd mpfr-4.1.0-a/tests/texceptions.c mpfr-4.1.0-b/tests/texceptions.c ---- mpfr-4.1.0-a/tests/texceptions.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/texceptions.c 2021-03-09 13:55:43.211158639 +0000 -@@ -103,10 +103,26 @@ - check_get_prec (void) - { - mpfr_t x; -+ int i = 0; - - mpfr_init2 (x, 17); -- if (mpfr_get_prec (x) != 17 || (mpfr_get_prec)(x) != 17) -+ -+ if (mpfr_get_prec (x) != 17 || (mpfr_get_prec) (x) != 17) - PRINT_ERROR ("mpfr_get_prec"); -+ -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wc++-compat" -+#endif -+ -+ if (mpfr_get_prec ((i++, VOIDP_CAST(x))) != 17) -+ PRINT_ERROR ("mpfr_get_prec (2)"); -+ -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic pop -+#endif -+ -+ MPFR_ASSERTN (i == 1); - mpfr_clear (x); - } - -diff -Naurd mpfr-4.1.0-a/tests/tisnan.c mpfr-4.1.0-b/tests/tisnan.c ---- mpfr-4.1.0-a/tests/tisnan.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tisnan.c 2021-03-09 13:55:43.211158639 +0000 -@@ -27,180 +27,235 @@ - main (void) - { - mpfr_t x; -+ int i = 0, j = 0; -+ -+ /* We need to check that when the function is implemented by a macro, -+ it behaves correctly. */ -+#define ARG (i++, VOIDP_CAST(x)) -+#define CHECK MPFR_ASSERTN (i == ++j) - - tests_start_mpfr (); - - mpfr_init (x); - -+#if 0 -+ /* The following should yield a compilation error when the functions -+ are implemented as macros. Change 0 to 1 above in order to test. */ -+ (void) (mpfr_nan_p (1L)); -+ (void) (mpfr_inf_p (1L)); -+ (void) (mpfr_number_p (1L)); -+ (void) (mpfr_zero_p (1L)); -+ (void) (mpfr_regular_p (1L)); -+#endif -+ -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wc++-compat" -+#endif -+ - /* check +infinity gives non-zero for mpfr_inf_p only */ - mpfr_set_ui (x, 1L, MPFR_RNDZ); - mpfr_div_ui (x, x, 0L, MPFR_RNDZ); -- if (mpfr_nan_p (x) || (mpfr_nan_p) (x) ) -+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) - { - printf ("Error: mpfr_nan_p(+Inf) gives non-zero\n"); - exit (1); - } -- if (mpfr_inf_p (x) == 0) -+ CHECK; -+ if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG)) - { - printf ("Error: mpfr_inf_p(+Inf) gives zero\n"); - exit (1); - } -- if (mpfr_number_p (x) || (mpfr_number_p) (x) ) -+ CHECK; -+ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG)) - { - printf ("Error: mpfr_number_p(+Inf) gives non-zero\n"); - exit (1); - } -- if (mpfr_zero_p (x) || (mpfr_zero_p) (x) ) -+ CHECK; -+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) - { - printf ("Error: mpfr_zero_p(+Inf) gives non-zero\n"); - exit (1); - } -- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) -+ CHECK; -+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) - { - printf ("Error: mpfr_regular_p(+Inf) gives non-zero\n"); - exit (1); - } -+ CHECK; - - /* same for -Inf */ - mpfr_neg (x, x, MPFR_RNDN); -- if (mpfr_nan_p (x) || (mpfr_nan_p(x))) -+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) - { - printf ("Error: mpfr_nan_p(-Inf) gives non-zero\n"); - exit (1); - } -- if (mpfr_inf_p (x) == 0) -+ CHECK; -+ if (!mpfr_inf_p (x) || !(mpfr_inf_p) (x) || !mpfr_inf_p (ARG)) - { - printf ("Error: mpfr_inf_p(-Inf) gives zero\n"); - exit (1); - } -- if (mpfr_number_p (x) || (mpfr_number_p)(x) ) -+ CHECK; -+ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG)) - { - printf ("Error: mpfr_number_p(-Inf) gives non-zero\n"); - exit (1); - } -- if (mpfr_zero_p (x) || (mpfr_zero_p)(x) ) -+ CHECK; -+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) - { - printf ("Error: mpfr_zero_p(-Inf) gives non-zero\n"); - exit (1); - } -- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) -+ CHECK; -+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) - { - printf ("Error: mpfr_regular_p(-Inf) gives non-zero\n"); - exit (1); - } -+ CHECK; - - /* same for NaN */ - mpfr_sub (x, x, x, MPFR_RNDN); -- if (mpfr_nan_p (x) == 0) -+ if (!mpfr_nan_p (x) || !(mpfr_nan_p) (x) || !mpfr_nan_p (ARG)) - { - printf ("Error: mpfr_nan_p(NaN) gives zero\n"); - exit (1); - } -- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) -+ CHECK; -+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) - { - printf ("Error: mpfr_inf_p(NaN) gives non-zero\n"); - exit (1); - } -- if (mpfr_number_p (x) || (mpfr_number_p) (x) ) -+ CHECK; -+ if (mpfr_number_p (x) || (mpfr_number_p) (x) || mpfr_number_p (ARG)) - { - printf ("Error: mpfr_number_p(NaN) gives non-zero\n"); - exit (1); - } -- if (mpfr_zero_p (x) || (mpfr_zero_p)(x) ) -+ CHECK; -+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) - { - printf ("Error: mpfr_number_p(NaN) gives non-zero\n"); - exit (1); - } -- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) -+ CHECK; -+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) - { - printf ("Error: mpfr_regular_p(NaN) gives non-zero\n"); - exit (1); - } -+ CHECK; - - /* same for a regular number */ - mpfr_set_ui (x, 1, MPFR_RNDN); -- if (mpfr_nan_p (x) || (mpfr_nan_p)(x)) -+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) - { - printf ("Error: mpfr_nan_p(1) gives non-zero\n"); - exit (1); - } -- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) -+ CHECK; -+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) - { - printf ("Error: mpfr_inf_p(1) gives non-zero\n"); - exit (1); - } -- if (mpfr_number_p (x) == 0) -+ CHECK; -+ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG)) - { - printf ("Error: mpfr_number_p(1) gives zero\n"); - exit (1); - } -- if (mpfr_zero_p (x) || (mpfr_zero_p) (x) ) -+ CHECK; -+ if (mpfr_zero_p (x) || (mpfr_zero_p) (x) || mpfr_zero_p (ARG)) - { - printf ("Error: mpfr_zero_p(1) gives non-zero\n"); - exit (1); - } -- if (mpfr_regular_p (x) == 0 || (mpfr_regular_p) (x) == 0) -+ CHECK; -+ if (!mpfr_regular_p (x) || !(mpfr_regular_p) (x) || !mpfr_regular_p (ARG)) - { - printf ("Error: mpfr_regular_p(1) gives zero\n"); - exit (1); - } -+ CHECK; - - /* Same for +0 */ - mpfr_set_ui (x, 0, MPFR_RNDN); -- if (mpfr_nan_p (x) || (mpfr_nan_p)(x)) -+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) - { - printf ("Error: mpfr_nan_p(+0) gives non-zero\n"); - exit (1); - } -- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) -+ CHECK; -+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) - { - printf ("Error: mpfr_inf_p(+0) gives non-zero\n"); - exit (1); - } -- if (mpfr_number_p (x) == 0) -+ CHECK; -+ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG)) - { - printf ("Error: mpfr_number_p(+0) gives zero\n"); - exit (1); - } -- if (mpfr_zero_p (x) == 0 ) -+ CHECK; -+ if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG)) - { - printf ("Error: mpfr_zero_p(+0) gives zero\n"); - exit (1); - } -- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) -+ CHECK; -+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) - { - printf ("Error: mpfr_regular_p(+0) gives non-zero\n"); - exit (1); - } -+ CHECK; - - /* Same for -0 */ - mpfr_set_ui (x, 0, MPFR_RNDN); - mpfr_neg (x, x, MPFR_RNDN); -- if (mpfr_nan_p (x) || (mpfr_nan_p)(x)) -+ if (mpfr_nan_p (x) || (mpfr_nan_p) (x) || mpfr_nan_p (ARG)) - { - printf ("Error: mpfr_nan_p(-0) gives non-zero\n"); - exit (1); - } -- if (mpfr_inf_p (x) || (mpfr_inf_p)(x) ) -+ CHECK; -+ if (mpfr_inf_p (x) || (mpfr_inf_p) (x) || mpfr_inf_p (ARG)) - { - printf ("Error: mpfr_inf_p(-0) gives non-zero\n"); - exit (1); - } -- if (mpfr_number_p (x) == 0) -+ CHECK; -+ if (!mpfr_number_p (x) || !(mpfr_number_p) (x) || !mpfr_number_p (ARG)) - { - printf ("Error: mpfr_number_p(-0) gives zero\n"); - exit (1); - } -- if (mpfr_zero_p (x) == 0 ) -+ CHECK; -+ if (!mpfr_zero_p (x) || !(mpfr_zero_p) (x) || !mpfr_zero_p (ARG)) - { - printf ("Error: mpfr_zero_p(-0) gives zero\n"); - exit (1); - } -- if (mpfr_regular_p (x) || (mpfr_regular_p) (x) ) -+ CHECK; -+ if (mpfr_regular_p (x) || (mpfr_regular_p) (x) || mpfr_regular_p (ARG)) - { - printf ("Error: mpfr_regular_p(-0) gives non-zero\n"); - exit (1); - } -+ CHECK; -+ -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic pop -+#endif - - mpfr_clear (x); - -diff -Naurd mpfr-4.1.0-a/tests/tset.c mpfr-4.1.0-b/tests/tset.c ---- mpfr-4.1.0-a/tests/tset.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tset.c 2021-03-09 13:55:43.207158683 +0000 -@@ -207,7 +207,7 @@ - static void - check_ternary_value (void) - { -- int p, q, rnd; -+ int k, p, q, rnd; - int inexact, cmp; - mpfr_t x, y; - -@@ -226,28 +226,45 @@ - { - if (rnd == MPFR_RNDF) /* the test below makes no sense */ - continue; -- inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd); -- cmp = mpfr_cmp (y, x); -- if (((inexact == 0) && (cmp != 0)) || -- ((inexact > 0) && (cmp <= 0)) || -- ((inexact < 0) && (cmp >= 0))) -- { -- printf ("Wrong ternary value in mpfr_set for %s: expected" -- " %d, got %d\n", -- mpfr_print_rnd_mode ((mpfr_rnd_t) rnd), cmp, -- inexact); -- exit (1); -- } -- /* Test mpfr_set function too */ -- inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd); -- cmp = mpfr_cmp (y, x); -- if (((inexact == 0) && (cmp != 0)) || -- ((inexact > 0) && (cmp <= 0)) || -- ((inexact < 0) && (cmp >= 0))) -+ for (k = 0; k < 3; k++) - { -- printf ("Wrong ternary value in mpfr_set(2): expected %d," -- " got %d\n", cmp, inexact); -- exit (1); -+ int a = 0, b = 0, c = 0; -+ -+ switch (k) -+ { -+ case 0: -+ inexact = mpfr_set (y, x, (mpfr_rnd_t) rnd); -+ break; -+ case 1: -+ inexact = (mpfr_set) (y, x, (mpfr_rnd_t) rnd); -+ break; -+ case 2: -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wc++-compat" -+#endif -+ inexact = mpfr_set ((a++, VOIDP_CAST(y)), -+ (b++, VOIDP_CAST(x)), -+ (c++, (mpfr_rnd_t) rnd)); -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic pop -+#endif -+ MPFR_ASSERTN (a == 1); -+ MPFR_ASSERTN (b == 1); -+ MPFR_ASSERTN (c == 1); -+ break; -+ } -+ cmp = mpfr_cmp (y, x); -+ if (((inexact == 0) && (cmp != 0)) || -+ ((inexact > 0) && (cmp <= 0)) || -+ ((inexact < 0) && (cmp >= 0))) -+ { -+ printf ("Wrong ternary value in mpfr_set for %s (%d):" -+ " expected %d, got %d\n", -+ mpfr_print_rnd_mode ((mpfr_rnd_t) rnd), -+ k, cmp, inexact); -+ exit (1); -+ } - } - } - } -diff -Naurd mpfr-4.1.0-a/tests/tset_exp.c mpfr-4.1.0-b/tests/tset_exp.c ---- mpfr-4.1.0-a/tests/tset_exp.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tset_exp.c 2021-03-09 13:55:43.211158639 +0000 -@@ -28,6 +28,7 @@ - mpfr_t x; - int ret; - mpfr_exp_t emin, emax, e; -+ int i = 0; - - tests_start_mpfr (); - -@@ -63,6 +64,17 @@ - e = (mpfr_get_exp) (x); - MPFR_ASSERTN (e == emin); - -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wc++-compat" -+#endif -+ e = mpfr_get_exp ((i++, VOIDP_CAST(x))); -+#ifdef IGNORE_CPP_COMPAT -+#pragma GCC diagnostic pop -+#endif -+ MPFR_ASSERTN (e == emin); -+ MPFR_ASSERTN (i == 1); -+ - ret = mpfr_set_exp (x, -1); - MPFR_ASSERTN (ret == 0 && mpfr_cmp_ui_2exp (x, 1, -2) == 0); - -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-03-09 13:58:00.889650773 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-03-09 13:58:00.937650249 +0000 -@@ -0,0 +1 @@ -+tset_sij -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-03-09 13:55:43.223158508 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-03-09 13:58:00.937650249 +0000 -@@ -1 +1 @@ --4.1.0-p10 -+4.1.0-p11 -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-03-09 13:55:43.223158508 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-03-09 13:58:00.933650293 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p10" -+#define MPFR_VERSION_STRING "4.1.0-p11" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-03-09 13:55:43.223158508 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-03-09 13:58:00.933650293 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p10"; -+ return "4.1.0-p11"; - } -diff -Naurd mpfr-4.1.0-a/tests/tset_si.c mpfr-4.1.0-b/tests/tset_si.c ---- mpfr-4.1.0-a/tests/tset_si.c 2020-03-26 11:51:33.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tset_si.c 2021-03-09 13:58:00.917650467 +0000 -@@ -127,27 +127,29 @@ - power of 2 is exact, unless underflow/overflow occurs. - The tests on the exponent below avoid integer overflows - (ep[i] may take extreme values). */ -- e = mpfr_get_exp (x1); - mpfr_clear_flags (); -- if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ -+ if (j == 0) -+ goto zero; -+ e = MPFR_GET_EXP (x1); -+ if (ep[i] < __gmpfr_emin - e) /* underflow */ - { - mpfr_rnd_t r = - (rnd == MPFR_RNDN && -- (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || -+ (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 || - IS_POW2 (sign * j))) ? - MPFR_RNDZ : (mpfr_rnd_t) rnd; - inex1 = mpfr_underflow (x1, r, sign); - flags1 = __gmpfr_flags; - } -- else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ -+ else if (ep[i] > __gmpfr_emax - e) /* overflow */ - { - inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); - flags1 = __gmpfr_flags; - } - else - { -- if (j != 0) -- mpfr_set_exp (x1, ep[i] + e); -+ mpfr_set_exp (x1, ep[i] + e); -+ zero: - flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; - } - -diff -Naurd mpfr-4.1.0-a/tests/tset_sj.c mpfr-4.1.0-b/tests/tset_sj.c ---- mpfr-4.1.0-a/tests/tset_sj.c 2020-06-01 10:39:52.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tset_sj.c 2021-03-09 13:58:00.917650467 +0000 -@@ -225,27 +225,29 @@ - power of 2 is exact, unless underflow/overflow occurs. - The tests on the exponent below avoid integer overflows - (ep[i] may take extreme values). */ -- e = mpfr_get_exp (x1); - mpfr_clear_flags (); -- if (j != 0 && ep[i] < __gmpfr_emin - e) /* underflow */ -+ if (j == 0) -+ goto zero; -+ e = MPFR_GET_EXP (x1); -+ if (ep[i] < __gmpfr_emin - e) /* underflow */ - { - mpfr_rnd_t r = - (rnd == MPFR_RNDN && -- (ep[i] < __gmpfr_emin - mpfr_get_exp (y) - 1 || -+ (ep[i] < __gmpfr_emin - MPFR_GET_EXP (y) - 1 || - IS_POW2 (sign * j))) ? - MPFR_RNDZ : (mpfr_rnd_t) rnd; - inex1 = mpfr_underflow (x1, r, sign); - flags1 = __gmpfr_flags; - } -- else if (j != 0 && ep[i] > __gmpfr_emax - e) /* overflow */ -+ else if (ep[i] > __gmpfr_emax - e) /* overflow */ - { - inex1 = mpfr_overflow (x1, (mpfr_rnd_t) rnd, sign); - flags1 = __gmpfr_flags; - } - else - { -- if (j != 0) -- mpfr_set_exp (x1, ep[i] + e); -+ mpfr_set_exp (x1, ep[i] + e); -+ zero: - flags1 = inex1 != 0 ? MPFR_FLAGS_INEXACT : 0; - } - } -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-04-23 09:49:34.648281897 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-04-23 09:49:34.696281616 +0000 -@@ -0,0 +1 @@ -+get_str_ndigits -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-03-09 13:58:00.937650249 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-04-23 09:49:34.696281616 +0000 -@@ -1 +1 @@ --4.1.0-p11 -+4.1.0-p12 -diff -Naurd mpfr-4.1.0-a/src/get_str.c mpfr-4.1.0-b/src/get_str.c ---- mpfr-4.1.0-a/src/get_str.c 2020-06-18 17:17:18.000000000 +0000 -+++ mpfr-4.1.0-b/src/get_str.c 2021-04-23 09:49:34.680281710 +0000 -@@ -2484,6 +2484,8 @@ - size_t - mpfr_get_str_ndigits (int b, mpfr_prec_t p) - { -+ MPFR_SAVE_EXPO_DECL (expo); -+ - MPFR_ASSERTN (2 <= b && b <= 62); - - /* deal first with power of two bases, since even for those, mpfr_ceil_mul -@@ -2497,17 +2499,26 @@ - return 1 + (p + k - 2) / k; - } - -+ MPFR_SAVE_EXPO_MARK (expo); -+ - /* the value returned by mpfr_ceil_mul is guaranteed to be - 1 + ceil(p*log(2)/log(b)) for p < 186564318007 (it returns one more - for p=186564318007 and b=7 or 49) */ - MPFR_STAT_STATIC_ASSERT (MPFR_PREC_BITS >= 64 || MPFR_PREC_BITS <= 32); -+ if - #if MPFR_PREC_BITS >= 64 - /* 64-bit numbers are supported by the C implementation, so that we can - use the large constant below. If MPFR_PREC_BITS <= 32, the condition - is always satisfied, so that we do not need any test. */ -- if (MPFR_LIKELY (p < 186564318007)) -+ (MPFR_LIKELY (p < 186564318007)) -+#else -+ (1) - #endif -- return 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1); -+ { -+ size_t ret = 1 + mpfr_ceil_mul (IS_POW2(b) ? p - 1 : p, b, 1); -+ MPFR_SAVE_EXPO_FREE (expo); -+ return ret; -+ } - - /* Now p is large and b is not a power of two. The code below works for any - value of p and b, as long as b is not a power of two. Indeed, in such a -@@ -2541,6 +2552,8 @@ - mpfr_clear (d); - mpfr_clear (u); - } -+ -+ MPFR_SAVE_EXPO_FREE (expo); - return 1 + ret; - } - } -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-03-09 13:58:00.933650293 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-04-23 09:49:34.692281639 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p11" -+#define MPFR_VERSION_STRING "4.1.0-p12" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-03-09 13:58:00.933650293 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-04-23 09:49:34.696281616 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p11"; -+ return "4.1.0-p12"; - } -diff -Naurd mpfr-4.1.0-a/tests/tget_str.c mpfr-4.1.0-b/tests/tget_str.c ---- mpfr-4.1.0-a/tests/tget_str.c 2020-01-08 18:11:13.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tget_str.c 2021-04-23 09:49:34.680281710 +0000 -@@ -1311,6 +1311,33 @@ - mpfr_clear (x); - } - -+static void -+test_ndigits_aux (int b, mpfr_prec_t p, size_t expected_m) -+{ -+ size_t m; -+ mpfr_exp_t old_emin, old_emax, e[] = { MPFR_EMIN_MIN, 0, MPFR_EMAX_MAX }; -+ mpfr_flags_t flags; -+ int i; -+ -+ old_emin = mpfr_get_emin (); -+ old_emax = mpfr_get_emax (); -+ -+ i = randlimb () % (numberof (e) + 1); -+ if (i < numberof (e)) -+ { -+ set_emin (e[i]); -+ set_emax (e[i]); -+ } -+ -+ __gmpfr_flags = flags = randlimb () & MPFR_FLAGS_ALL; -+ m = mpfr_get_str_ndigits (b, p); -+ MPFR_ASSERTN (m == expected_m); -+ MPFR_ASSERTN (__gmpfr_flags == flags); -+ -+ set_emin (old_emin); -+ set_emax (old_emax); -+} -+ - /* test of mpfr_get_str_ndigits */ - static void - test_ndigits (void) -@@ -1319,61 +1346,61 @@ - - /* for b=2, we have 1 + ceil((p-1)*log(2)/log(b)) = p */ - for (p = MPFR_PREC_MIN; p <= 1024; p++) -- MPFR_ASSERTN(mpfr_get_str_ndigits (2, p) == p); -+ test_ndigits_aux (2, p, p); - - /* for b=4, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/2) - = 1 + floor(p/2) */ - for (p = MPFR_PREC_MIN; p <= 1024; p++) -- MPFR_ASSERTN(mpfr_get_str_ndigits (4, p) == 1 + (p / 2)); -+ test_ndigits_aux (4, p, 1 + (p / 2)); - - /* for b=8, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/3) - = 1 + floor((p+1)/3) */ - for (p = MPFR_PREC_MIN; p <= 1024; p++) -- MPFR_ASSERTN(mpfr_get_str_ndigits (8, p) == 1 + ((p + 1) / 3)); -+ test_ndigits_aux (8, p, 1 + ((p + 1) / 3)); - - /* for b=16, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/4) - = 1 + floor((p+2)/4) */ - for (p = MPFR_PREC_MIN; p <= 1024; p++) -- MPFR_ASSERTN(mpfr_get_str_ndigits (16, p) == 1 + ((p + 2) / 4)); -+ test_ndigits_aux (16, p, 1 + ((p + 2) / 4)); - - /* for b=32, we have 1 + ceil((p-1)*log(2)/log(b)) = 1 + ceil((p-1)/5) - = 1 + floor((p+3)/5) */ - for (p = MPFR_PREC_MIN; p <= 1024; p++) -- MPFR_ASSERTN(mpfr_get_str_ndigits (32, p) == 1 + ((p + 3) / 5)); -+ test_ndigits_aux (32, p, 1 + ((p + 3) / 5)); - - /* error < 1e-3 */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (57, 35) == 8); -+ test_ndigits_aux (57, 35, 8); - - /* error < 1e-4 */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (31, 649) == 133); -+ test_ndigits_aux (31, 649, 133); - - /* error < 1e-5 */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (43, 5041) == 931); -+ test_ndigits_aux (43, 5041, 931); - - /* error < 1e-6 */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (41, 17771) == 3319); -+ test_ndigits_aux (41, 17771, 3319); - - /* 20th convergent of log(2)/log(3) */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 630138897) == 397573381); -+ test_ndigits_aux (3, 630138897, 397573381); - - #if MPFR_PREC_BITS >= 64 - /* 21st convergent of log(2)/log(3) */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 9809721694) == 6189245292); -+ test_ndigits_aux (3, 9809721694, 6189245292); - - /* 22nd convergent of log(2)/log(3) */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 10439860591) == 6586818672); -+ test_ndigits_aux (3, 10439860591, 6586818672); - - /* 23rd convergent of log(2)/log(3) */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 103768467013) == 65470613322); -+ test_ndigits_aux (3, 103768467013, 65470613322); - - /* 24th convergent of log(2)/log(3) */ -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 217976794617) == 137528045314); -+ test_ndigits_aux (3, 217976794617, 137528045314); - -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 1193652440098) == 753110839882); -+ test_ndigits_aux (3, 1193652440098, 753110839882); - -- MPFR_ASSERTN(mpfr_get_str_ndigits (3, 683381996816440) == 431166034846569); -+ test_ndigits_aux (3, 683381996816440, 431166034846569); - -- MPFR_ASSERTN(mpfr_get_str_ndigits (7, 186564318007) == 66455550933); -+ test_ndigits_aux (7, 186564318007, 66455550933); - #endif - } - -diff -Naurd mpfr-4.1.0-a/PATCHES mpfr-4.1.0-b/PATCHES ---- mpfr-4.1.0-a/PATCHES 2021-05-17 16:09:00.574477185 +0000 -+++ mpfr-4.1.0-b/PATCHES 2021-05-17 16:09:00.754476587 +0000 -@@ -0,0 +1 @@ -+vasprintf-prec-zero -diff -Naurd mpfr-4.1.0-a/VERSION mpfr-4.1.0-b/VERSION ---- mpfr-4.1.0-a/VERSION 2021-04-23 09:49:34.696281616 +0000 -+++ mpfr-4.1.0-b/VERSION 2021-05-17 16:09:00.754476587 +0000 -@@ -1 +1 @@ --4.1.0-p12 -+4.1.0-p13 -diff -Naurd mpfr-4.1.0-a/src/mpfr.h mpfr-4.1.0-b/src/mpfr.h ---- mpfr-4.1.0-a/src/mpfr.h 2021-04-23 09:49:34.692281639 +0000 -+++ mpfr-4.1.0-b/src/mpfr.h 2021-05-17 16:09:00.754476587 +0000 -@@ -27,7 +27,7 @@ - #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 0 --#define MPFR_VERSION_STRING "4.1.0-p12" -+#define MPFR_VERSION_STRING "4.1.0-p13" - - /* User macros: - MPFR_USE_FILE: Define it to make MPFR define functions dealing -diff -Naurd mpfr-4.1.0-a/src/vasprintf.c mpfr-4.1.0-b/src/vasprintf.c ---- mpfr-4.1.0-a/src/vasprintf.c 2021-02-11 12:48:27.354242922 +0000 -+++ mpfr-4.1.0-b/src/vasprintf.c 2021-05-17 16:09:00.598477107 +0000 -@@ -635,7 +635,13 @@ - static int - buffer_cat (struct string_buffer *b, const char *s, size_t len) - { -- MPFR_ASSERTD (len > 0); -+ /* If len == 0, which is possible when outputting an integer 0 -+ (either a native one or mpfr_prec_t) with precision field = 0, -+ do nothing. This test is not necessary since the code below is -+ valid for len == 0, but this is safer, just in case. */ -+ if (len == 0) -+ return 0; -+ - MPFR_ASSERTD (len <= strlen (s)); - - if (buffer_incr_len (b, len)) -diff -Naurd mpfr-4.1.0-a/src/version.c mpfr-4.1.0-b/src/version.c ---- mpfr-4.1.0-a/src/version.c 2021-04-23 09:49:34.696281616 +0000 -+++ mpfr-4.1.0-b/src/version.c 2021-05-17 16:09:00.754476587 +0000 -@@ -25,5 +25,5 @@ - const char * - mpfr_get_version (void) - { -- return "4.1.0-p12"; -+ return "4.1.0-p13"; - } -diff -Naurd mpfr-4.1.0-a/tests/tsprintf.c mpfr-4.1.0-b/tests/tsprintf.c ---- mpfr-4.1.0-a/tests/tsprintf.c 2020-04-08 22:39:35.000000000 +0000 -+++ mpfr-4.1.0-b/tests/tsprintf.c 2021-05-17 16:09:00.598477107 +0000 -@@ -193,6 +193,10 @@ - sprintf (buf, "%d", i); - check_vsprintf (buf, "%d", i); - -+ check_vsprintf ("0", "%d", 0); -+ check_vsprintf ("", "%.d", 0); -+ check_vsprintf ("", "%.0d", 0); -+ - sprintf (buf, "%e", d); - check_vsprintf (buf, "%e", d); - -@@ -227,9 +231,6 @@ - mpfr_prec_t p = 128; - mpfr_t x, y, z; - -- mpfr_init (z); -- mpfr_init2 (x, p); -- - /* specifier 'P' for precision */ - check_vsprintf ("128", "%Pu", p); - check_vsprintf ("00128", "%.5Pu", p); -@@ -247,9 +248,19 @@ - check_vsprintf ("0200:", "%0#+ -Po:", p); - check_vsprintf ("+0000128 :", "%0+ *.*Pd:", -9, 7, p); - check_vsprintf ("+12345 :", "%0+ -*.*Pd:", -9, -3, (mpfr_prec_t) 12345); -+ check_vsprintf ("0", "%Pu", (mpfr_prec_t) 0); - /* Do not add a test like "%05.1Pd" as MS Windows is buggy: when - a precision is given, the '0' flag must be ignored. */ - -+ /* specifier 'P' with precision field 0 */ -+ check_vsprintf ("128", "%.Pu", p); -+ check_vsprintf ("128", "%.0Pd", p); -+ /* check_vsprintf ("", "%.Pu", (mpfr_prec_t) 0); */ -+ check_vsprintf ("", "%.0Pd", (mpfr_prec_t) 0); -+ -+ mpfr_init (z); -+ mpfr_init2 (x, 128); -+ - /* special numbers */ - mpfr_set_inf (x, 1); - check_sprintf (pinf_str, "%Re", x); diff --git a/mpfr.spec b/mpfr.spec index ca3ca96..00a1bb6 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,10 +1,10 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr -Version: 4.1.0 -Release: 10%{?dist} +Version: 4.1.1 +Release: 1%{?dist} URL: https://www.mpfr.org/ -License: LGPLv3+ +License: LGPL-3.0-or-later BuildRequires: gcc BuildRequires: gmp-devel BuildRequires: make @@ -12,22 +12,6 @@ BuildRequires: texinfo Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz -# Upstream post-release patches. This currently contains: -# - decimal128-conv.patch -# - random_deviate.patch -# - set_z_2exp-overflow.patch -# - prototypes.patch -# - digamma-hugemem.patch -# - digamma-interm-zero.patch -# - jn-interm-zero.patch -# - digamma-interm-zero2.patch -# - jyn-asympt-interm-zero.patch -# - macros.patch -# - tset_sij.patch -# - get_str_ndigits.patch -# - vasprintf-prec-zero.patch -Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches - %description The MPFR library is a C library for multiple-precision floating-point computations with "correct rounding". The MPFR is efficient and @@ -50,7 +34,7 @@ install the mpfr package. %package doc Summary: Documentation for the MPFR library -License: GFDL +License: GFDL-1.2-no-invariants-or-later BuildArch: noarch %description doc @@ -73,7 +57,7 @@ sed -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ %install %make_install -cp -p PATCHES README %{buildroot}%{_pkgdocdir} +cp -p ChangeLog PATCHES README %{buildroot}%{_pkgdocdir} rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_infodir}/dir @@ -87,6 +71,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %files %license COPYING COPYING.LESSER %{_pkgdocdir}/BUGS +%{_pkgdocdir}/ChangeLog %{_pkgdocdir}/NEWS %{_pkgdocdir}/PATCHES %{_pkgdocdir}/README @@ -106,6 +91,11 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Nov 17 2022 Jerry James - 4.1.1-1 +- Update to MPFR version 4.1.1 +- Drop all patches +- Convert License tags to SPDX + * Thu Jul 21 2022 Fedora Release Engineering - 4.1.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 111089f..a05ee6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpfr-4.1.0.tar.xz) = 1bd1c349741a6529dfa53af4f0da8d49254b164ece8a46928cdb13a99460285622d57fe6f68cef19c6727b3f9daa25ddb3d7d65c201c8f387e421c7f7bee6273 +SHA512 (mpfr-4.1.1.tar.xz) = be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1 From 30b564b576b8ace46aa995088b75bce2207a4906 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 23 Nov 2022 15:04:59 -0700 Subject: [PATCH 29/43] Update to MPFR 4.1.1-p1 (rhbz#2147377) --- allpatches | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ mpfr.spec | 9 +++++- 2 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 allpatches diff --git a/allpatches b/allpatches new file mode 100644 index 0000000..0566c80 --- /dev/null +++ b/allpatches @@ -0,0 +1,83 @@ +diff -Naurd mpfr-4.1.1-a/PATCHES mpfr-4.1.1-b/PATCHES +--- mpfr-4.1.1-a/PATCHES 2022-11-23 11:45:26.800476079 +0000 ++++ mpfr-4.1.1-b/PATCHES 2022-11-23 11:45:26.844475966 +0000 +@@ -0,0 +1 @@ ++mpfr_custom_get_kind +diff -Naurd mpfr-4.1.1-a/VERSION mpfr-4.1.1-b/VERSION +--- mpfr-4.1.1-a/VERSION 2022-11-17 13:28:44.000000000 +0000 ++++ mpfr-4.1.1-b/VERSION 2022-11-23 11:45:26.844475966 +0000 +@@ -1 +1 @@ +-4.1.1 ++4.1.1-p1 +diff -Naurd mpfr-4.1.1-a/src/mpfr.h mpfr-4.1.1-b/src/mpfr.h +--- mpfr-4.1.1-a/src/mpfr.h 2022-11-17 13:28:44.000000000 +0000 ++++ mpfr-4.1.1-b/src/mpfr.h 2022-11-23 11:45:26.840475978 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 1 + #define MPFR_VERSION_PATCHLEVEL 1 +-#define MPFR_VERSION_STRING "4.1.1" ++#define MPFR_VERSION_STRING "4.1.1-p1" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +@@ -1027,7 +1027,7 @@ + #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 + #define mpfr_custom_get_kind(x) \ + __extension__ ({ \ +- mpfr_ptr _x = (x); \ ++ mpfr_srcptr _x = (x); \ + _x->_mpfr_exp > __MPFR_EXP_INF ? \ + (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \ + : _x->_mpfr_exp == __MPFR_EXP_INF ? \ +diff -Naurd mpfr-4.1.1-a/src/version.c mpfr-4.1.1-b/src/version.c +--- mpfr-4.1.1-a/src/version.c 2022-11-17 13:28:44.000000000 +0000 ++++ mpfr-4.1.1-b/src/version.c 2022-11-23 11:45:26.844475966 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.1.1"; ++ return "4.1.1-p1"; + } +diff -Naurd mpfr-4.1.1-a/tests/tstckintc.c mpfr-4.1.1-b/tests/tstckintc.c +--- mpfr-4.1.1-a/tests/tstckintc.c 2022-05-06 13:47:17.000000000 +0000 ++++ mpfr-4.1.1-b/tests/tstckintc.c 2022-11-23 11:45:26.836475987 +0000 +@@ -295,14 +295,16 @@ + test_nan_inf_zero (void) + { + mpfr_ptr val; ++ mpfr_srcptr sval; /* for compilation error checking */ + int sign; + int kind; + + reset_stack (); + + val = new_mpfr (MPFR_PREC_MIN); ++ sval = val; + mpfr_set_nan (val); +- kind = (mpfr_custom_get_kind) (val); ++ kind = (mpfr_custom_get_kind) (sval); + if (kind != MPFR_NAN_KIND) + { + printf ("mpfr_custom_get_kind error: "); +@@ -380,7 +382,8 @@ + dummy_set_si (long si) + { + mpfr_t x; +- long * r = dummy_new (); ++ mpfr_srcptr px; /* for compilation error checking */ ++ long *r = dummy_new (); + int i1, i2, i3, i4, i5; + + /* Check that the type "void *" can be used, like with the function. +@@ -405,7 +408,8 @@ + MPFR_ASSERTN (i5 == 1); + + mpfr_set_si (x, si, MPFR_RNDN); +- r[0] = mpfr_custom_get_kind (x); ++ px = x; ++ r[0] = mpfr_custom_get_kind (px); + + /* Check that the type "void *" can be used in C, like with the function + (forbidden in C++). Also check side effects. */ diff --git a/mpfr.spec b/mpfr.spec index 00a1bb6..844fcdd 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -12,6 +12,10 @@ BuildRequires: texinfo Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz +# Upstream post-release patches. This currently contains: +# - mpfr_custom_get_kind.patch +Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches + %description The MPFR library is a C library for multiple-precision floating-point computations with "correct rounding". The MPFR is efficient and @@ -91,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Wed Nov 23 2022 Jerry James - 4.1.1-2 +- Update to MPFR 4.1.1-p1 + * Thu Nov 17 2022 Jerry James - 4.1.1-1 - Update to MPFR version 4.1.1 - Drop all patches From b8d86e27c1337c926b6aadb7b3326467131fbf1b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:49:46 +0000 Subject: [PATCH 30/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 844fcdd..a858eac 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.1.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -95,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 4.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Nov 23 2022 Jerry James - 4.1.1-2 - Update to MPFR 4.1.1-p1 From 820b49a7d3c2660ea1252da3046f2d7d6fbe612b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 12 Jul 2023 20:11:53 -0600 Subject: [PATCH 31/43] Update to MPFR 4.2.0-p9 --- allpatches | 2091 ++++++++++++++++++++++++++++++++++++++++++++++++++-- mpfr.spec | 26 +- sources | 2 +- 3 files changed, 2047 insertions(+), 72 deletions(-) diff --git a/allpatches b/allpatches index 0566c80..07fcf25 100644 --- a/allpatches +++ b/allpatches @@ -1,83 +1,2046 @@ -diff -Naurd mpfr-4.1.1-a/PATCHES mpfr-4.1.1-b/PATCHES ---- mpfr-4.1.1-a/PATCHES 2022-11-23 11:45:26.800476079 +0000 -+++ mpfr-4.1.1-b/PATCHES 2022-11-23 11:45:26.844475966 +0000 +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:17:39.748645280 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:17:39.792645218 +0000 @@ -0,0 +1 @@ -+mpfr_custom_get_kind -diff -Naurd mpfr-4.1.1-a/VERSION mpfr-4.1.1-b/VERSION ---- mpfr-4.1.1-a/VERSION 2022-11-17 13:28:44.000000000 +0000 -+++ mpfr-4.1.1-b/VERSION 2022-11-23 11:45:26.844475966 +0000 ++tsprintf-thousands +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:17:39.792645218 +0000 @@ -1 +1 @@ --4.1.1 -+4.1.1-p1 -diff -Naurd mpfr-4.1.1-a/src/mpfr.h mpfr-4.1.1-b/src/mpfr.h ---- mpfr-4.1.1-a/src/mpfr.h 2022-11-17 13:28:44.000000000 +0000 -+++ mpfr-4.1.1-b/src/mpfr.h 2022-11-23 11:45:26.840475978 +0000 +-4.2.0 ++4.2.0-p1 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 @@ -27,7 +27,7 @@ #define MPFR_VERSION_MAJOR 4 - #define MPFR_VERSION_MINOR 1 - #define MPFR_VERSION_PATCHLEVEL 1 --#define MPFR_VERSION_STRING "4.1.1" -+#define MPFR_VERSION_STRING "4.1.1-p1" + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0" ++#define MPFR_VERSION_STRING "4.2.0-p1" /* User macros: MPFR_USE_FILE: Define it to make MPFR define functions dealing -@@ -1027,7 +1027,7 @@ - #if __GNUC__ > 2 || __GNUC_MINOR__ >= 95 - #define mpfr_custom_get_kind(x) \ - __extension__ ({ \ -- mpfr_ptr _x = (x); \ -+ mpfr_srcptr _x = (x); \ - _x->_mpfr_exp > __MPFR_EXP_INF ? \ - (mpfr_int) MPFR_REGULAR_KIND * MPFR_SIGN (_x) \ - : _x->_mpfr_exp == __MPFR_EXP_INF ? \ -diff -Naurd mpfr-4.1.1-a/src/version.c mpfr-4.1.1-b/src/version.c ---- mpfr-4.1.1-a/src/version.c 2022-11-17 13:28:44.000000000 +0000 -+++ mpfr-4.1.1-b/src/version.c 2022-11-23 11:45:26.844475966 +0000 +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-01-06 10:55:57.000000000 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:17:39.792645218 +0000 @@ -25,5 +25,5 @@ const char * mpfr_get_version (void) { -- return "4.1.1"; -+ return "4.1.1-p1"; +- return "4.2.0"; ++ return "4.2.0-p1"; } -diff -Naurd mpfr-4.1.1-a/tests/tstckintc.c mpfr-4.1.1-b/tests/tstckintc.c ---- mpfr-4.1.1-a/tests/tstckintc.c 2022-05-06 13:47:17.000000000 +0000 -+++ mpfr-4.1.1-b/tests/tstckintc.c 2022-11-23 11:45:26.836475987 +0000 -@@ -295,14 +295,16 @@ - test_nan_inf_zero (void) +diff -Naurd mpfr-4.2.0-a/tests/tsprintf.c mpfr-4.2.0-b/tests/tsprintf.c +--- mpfr-4.2.0-a/tests/tsprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tsprintf.c 2023-04-17 21:17:39.784645229 +0000 +@@ -1715,7 +1715,25 @@ + check_sprintf ("000000001,000", "%'013.4Rg", x); + + #ifdef PRINTF_GROUPFLAG +- check_vsprintf ("+01,234,567 :", "%0+ -'13.10Pd:", (mpfr_prec_t) 1234567); ++ /* Do not test the thousands separator with a precision field larger ++ than the number of digits (thus needing leading zeros), such as ++ "%0+ -'13.10Pd:" (used up to MPFR 4.2.0), since the GNU libc is ++ buggy: https://sourceware.org/bugzilla/show_bug.cgi?id=23432 ++ We don't know about the other implementations. ++ This new test works fine with glibc up to 2.36, but fails with 2.37 ++ (as reported by Klaus Dittrich in the MPFR mailing-list); this is ++ actually a bug introduced in glibc 2.37, not in MPFR: ++ https://sourceware.org/bugzilla/show_bug.cgi?id=30068 ++ Since this bug can yield a buffer overflow (CVE-2023-25139), possibly ++ affecting MPFR users, let us rather require a fix in glibc. This bug ++ has been fixed in the 2.37 branch: ++ https://sourceware.org/git/?p=glibc.git;a=commit;h=07b9521fc6 ++ If we wanted to check that and avoid a failure of the test because of ++ a buggy C library (while MPFR would be consistent with the C library), ++ we could compare the MPFR output with both the correct output and the ++ output from the C library (possibly buggy). But to do that in a clean ++ way, this would require a change in the check_vsprintf() call. */ ++ check_vsprintf ("+1,234,567 :", "%0+ -'13Pd:", (mpfr_prec_t) 1234567); + #endif + + mpfr_clear (x); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:00.464616127 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:00.512616059 +0000 +@@ -0,0 +1 @@ ++ui_pow_ui-overflow +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:17:39.792645218 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:00.512616059 +0000 +@@ -1 +1 @@ +-4.2.0-p1 ++4.2.0-p2 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:17:39.788645224 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p1" ++#define MPFR_VERSION_STRING "4.2.0-p2" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/ui_pow_ui.c mpfr-4.2.0-b/src/ui_pow_ui.c +--- mpfr-4.2.0-a/src/ui_pow_ui.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/ui_pow_ui.c 2023-04-17 21:18:00.504616070 +0000 +@@ -23,7 +23,7 @@ + #include "mpfr-impl.h" + + int +-mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int y, unsigned long int n, ++mpfr_ui_pow_ui (mpfr_ptr x, unsigned long int k, unsigned long int n, + mpfr_rnd_t rnd) { - mpfr_ptr val; -+ mpfr_srcptr sval; /* for compilation error checking */ - int sign; - int kind; + mpfr_exp_t err; +@@ -35,22 +35,28 @@ + MPFR_ZIV_DECL (loop); + MPFR_SAVE_EXPO_DECL (expo); - reset_stack (); - - val = new_mpfr (MPFR_PREC_MIN); -+ sval = val; - mpfr_set_nan (val); -- kind = (mpfr_custom_get_kind) (val); -+ kind = (mpfr_custom_get_kind) (sval); - if (kind != MPFR_NAN_KIND) ++ MPFR_LOG_FUNC ++ (("k=%lu n=%lu rnd=%d", k, n, rnd), ++ ("y[%Pu]=%.*Rg inexact=%d", ++ mpfr_get_prec (x), mpfr_log_prec, x, inexact)); ++ + if (MPFR_UNLIKELY (n <= 1)) { - printf ("mpfr_custom_get_kind error: "); -@@ -380,7 +382,8 @@ - dummy_set_si (long si) + if (n == 1) +- return mpfr_set_ui (x, y, rnd); /* y^1 = y */ ++ return mpfr_set_ui (x, k, rnd); /* k^1 = k */ + else +- return mpfr_set_ui (x, 1, rnd); /* y^0 = 1 for any y */ ++ return mpfr_set_ui (x, 1, rnd); /* k^0 = 1 for any k */ + } +- else if (MPFR_UNLIKELY (y <= 1)) ++ else if (MPFR_UNLIKELY (k <= 1)) + { +- if (y == 1) ++ if (k == 1) + return mpfr_set_ui (x, 1, rnd); /* 1^n = 1 for any n > 0 */ + else + return mpfr_set_ui (x, 0, rnd); /* 0^n = 0 for any n > 0 */ + } + +- for (size_n = 0, m = n; m; size_n++, m >>= 1); ++ for (size_n = 0, m = n; m != 0; size_n++, m >>= 1) ++ ; + + MPFR_SAVE_EXPO_MARK (expo); + prec = MPFR_PREC (x) + 3 + size_n; +@@ -60,23 +66,55 @@ + for (;;) + { + int i = size_n; ++ unsigned int inex_res; + +- inexact = mpfr_set_ui (res, y, MPFR_RNDU); ++ inex_res = mpfr_set_ui (res, k, MPFR_RNDU); + err = 1; + /* now 2^(i-1) <= n < 2^i: i=1+floor(log2(n)) */ + for (i -= 2; i >= 0; i--) + { +- inexact |= mpfr_sqr (res, res, MPFR_RNDU); ++ inex_res |= mpfr_sqr (res, res, MPFR_RNDU); + err++; + if (n & (1UL << i)) +- inexact |= mpfr_mul_ui (res, res, y, MPFR_RNDU); ++ inex_res |= mpfr_mul_ui (res, res, k, MPFR_RNDU); + } ++ ++ if (MPFR_UNLIKELY (MPFR_IS_INF (res))) ++ { ++ mpfr_t kf; ++ mpz_t z; ++ int size_k; ++ MPFR_BLOCK_DECL (flags); ++ ++ /* Let's handle the overflow by calling mpfr_pow_z. ++ Alternatively, we could call mpfr_pow_ui; this would ++ need a bit shorter code below, but mpfr_pow_ui handles ++ the overflow by calling mpfr_pow_z, so that calling ++ mpfr_pow_z directly should be a bit more efficient. */ ++ ++ MPFR_ZIV_FREE (loop); ++ mpfr_clear (res); ++ for (size_k = 0, m = k; m != 0; size_k++, m >>= 1) ++ ; ++ mpfr_init2 (kf, size_k); ++ inexact = mpfr_set_ui (kf, k, MPFR_RNDN); ++ MPFR_ASSERTD (inexact == 0); ++ mpz_init (z); ++ mpz_set_ui (z, n); ++ MPFR_BLOCK (flags, inexact = mpfr_pow_z (x, kf, z, rnd);); ++ mpz_clear (z); ++ mpfr_clear (kf); ++ MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, flags); ++ goto end; ++ } ++ + /* since the loop is executed floor(log2(n)) times, + we have err = 1+floor(log2(n)). + Since prec >= MPFR_PREC(x) + 4 + floor(log2(n)), prec > err */ + err = prec - err; + +- if (MPFR_LIKELY (inexact == 0 ++ MPFR_LOG_VAR (res); ++ if (MPFR_LIKELY (!inex_res + || MPFR_CAN_ROUND (res, err, MPFR_PREC (x), rnd))) + break; + +@@ -90,6 +128,7 @@ + + mpfr_clear (res); + ++ end: + MPFR_SAVE_EXPO_FREE (expo); + return mpfr_check_range (x, inexact, rnd); + } +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:17:39.792645218 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:00.512616059 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) { - mpfr_t x; -- long * r = dummy_new (); -+ mpfr_srcptr px; /* for compilation error checking */ -+ long *r = dummy_new (); - int i1, i2, i3, i4, i5; +- return "4.2.0-p1"; ++ return "4.2.0-p2"; + } +diff -Naurd mpfr-4.2.0-a/tests/tlog10.c mpfr-4.2.0-b/tests/tlog10.c +--- mpfr-4.2.0-a/tests/tlog10.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tlog10.c 2023-04-17 21:18:00.504616070 +0000 +@@ -49,6 +49,60 @@ + #define TEST_RANDOM_POS 8 + #include "tgeneric.c" - /* Check that the type "void *" can be used, like with the function. -@@ -405,7 +408,8 @@ - MPFR_ASSERTN (i5 == 1); ++/* On 2023-02-13, one gets an infinite loop in mpfr_log10 on both ++ 32-bit and 64-bit hosts when the precision is not large enough ++ (precision 12 and below). */ ++static void ++bug20230213 (void) ++{ ++ mpfr_exp_t old_emin, old_emax, e; ++ mpfr_t t, x, y0, y1, y2; ++ int prec; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ e = mpfr_get_emax () - 1; ++ ++ /* The precisions of t and y0 should be large enough to avoid ++ a hard-to-round case for the target precisions. */ ++ mpfr_inits2 (64, t, y0, (mpfr_ptr) 0); ++ mpfr_set_exp_t (y0, e, MPFR_RNDN); ++ mpfr_log_ui (t, 10, MPFR_RNDN); ++ mpfr_div (y0, y0, t, MPFR_RNDN); ++ mpfr_log_ui (t, 2, MPFR_RNDN); ++ mpfr_mul (y0, y0, t, MPFR_RNDN); ++ ++ for (prec = 16; prec >= MPFR_PREC_MIN; prec--) ++ { ++ mpfr_inits2 (prec, x, y1, y2, (mpfr_ptr) 0); ++ mpfr_set (y1, y0, MPFR_RNDN); ++ ++ mpfr_set_ui_2exp (x, 1, e, MPFR_RNDN); ++ mpfr_log10 (y2, x, MPFR_RNDN); ++ MPFR_ASSERTN (MPFR_IS_PURE_FP (y2)); ++ MPFR_ASSERTN (MPFR_IS_POS (y2)); ++ ++ if (! mpfr_equal_p (y1, y2)) ++ { ++ printf ("Error in bug20230213.\n"); ++ printf ("Expected "); ++ mpfr_dump (y1); ++ printf ("Got "); ++ mpfr_dump (y2); ++ exit (1); ++ } ++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); ++ } ++ ++ mpfr_clears (t, y0, (mpfr_ptr) 0); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -112,6 +166,8 @@ + mpfr_clear (x); + mpfr_clear (y); - mpfr_set_si (x, si, MPFR_RNDN); -- r[0] = mpfr_custom_get_kind (x); -+ px = x; -+ r[0] = mpfr_custom_get_kind (px); ++ bug20230213 (); ++ + data_check ("data/log10", mpfr_log10, "mpfr_log10"); - /* Check that the type "void *" can be used in C, like with the function - (forbidden in C++). Also check side effects. */ + tests_end_mpfr (); +diff -Naurd mpfr-4.2.0-a/tests/tui_pow.c mpfr-4.2.0-b/tests/tui_pow.c +--- mpfr-4.2.0-a/tests/tui_pow.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tui_pow.c 2023-04-17 21:18:00.504616070 +0000 +@@ -142,6 +142,37 @@ + mpfr_clear (t); + } + ++static void ++huge (void) ++{ ++ mpfr_exp_t old_emin, old_emax; ++ mpfr_t x; ++ ++ old_emin = mpfr_get_emin (); ++ old_emax = mpfr_get_emax (); ++ ++ set_emin (MPFR_EMIN_MIN); ++ set_emax (MPFR_EMAX_MAX); ++ ++ mpfr_init2 (x, 8); ++ ++ /* The purpose of this test is more to check that mpfr_ui_pow_ui ++ terminates (without taking much memory) rather than checking ++ the value of x. On 2023-02-13, the +Inf case was not handled ++ in the Ziv iteration, yielding an infinite loop, affecting ++ mpfr_log10 in particular. See ++ commit 90de094f0d9c309daca707aa227470d810866616 ++ */ ++ mpfr_ui_pow_ui (x, 5, ULONG_MAX, MPFR_RNDN); ++ if (MPFR_EMAX_MAX <= ULONG_MAX) /* true with default _MPFR_EXP_FORMAT */ ++ MPFR_ASSERTN (MPFR_IS_INF (x)); ++ ++ mpfr_clear (x); ++ ++ set_emin (old_emin); ++ set_emax (old_emax); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -180,6 +211,7 @@ + } + + test1 (); ++ huge (); + + { + mpfr_t z, t; +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:18:26.860579184 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:18:26.904579122 +0000 +@@ -0,0 +1 @@ ++multibyte-decimal_point +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:00.512616059 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:18:26.904579122 +0000 +@@ -1 +1 @@ +-4.2.0-p2 ++4.2.0-p3 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:00.508616065 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p2" ++#define MPFR_VERSION_STRING "4.2.0-p3" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:00.512616059 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:18:26.904579122 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p2"; ++ return "4.2.0-p3"; + } +diff -Naurd mpfr-4.2.0-a/tests/tfprintf.c mpfr-4.2.0-b/tests/tfprintf.c +--- mpfr-4.2.0-a/tests/tfprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tfprintf.c 2023-04-17 21:18:26.896579133 +0000 +@@ -61,6 +61,12 @@ + exit (1); \ + } + ++#if MPFR_LCONV_DPTS ++#define DPLEN ((int) strlen (localeconv()->decimal_point)) ++#else ++#define DPLEN 1 ++#endif ++ + /* limit for random precision in random() */ + const int prec_max_printf = 5000; + +@@ -195,12 +201,12 @@ + lo, &ulo); + check_length (2, ulo, 36, lu); + check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); +- check_length (3, ush, 46, hu); ++ check_length (3, ush, 45 + DPLEN, hu); + check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); +- check_length (4, i, 29, d); ++ check_length (4, i, 28 + DPLEN, d); + check_vfprintf (fout, "a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, + &sz); +- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier "%zu" in C90 */ ++ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier "%zu" in C90 */ + check_vfprintf (fout, "a. %Pu, b. %c, c. %Zi%Zn", prec, ch, mpz, &mpz); + check_length_with_cmp (6, mpz, 17, mpz_cmp_ui (mpz, 17), Zi); + check_vfprintf (fout, "%% a. %#.0RNg, b. %Qx%Rn, c. %p", mpfr, mpq, &mpfr, +@@ -224,7 +230,7 @@ + + #ifdef PRINTF_L + check_vfprintf (fout, "a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); +- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier "%zu" in C90 */ ++ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier "%zu" in C90 */ + #endif + + #ifndef NPRINTF_HH +diff -Naurd mpfr-4.2.0-a/tests/tprintf.c mpfr-4.2.0-b/tests/tprintf.c +--- mpfr-4.2.0-a/tests/tprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tprintf.c 2023-04-17 21:18:26.896579133 +0000 +@@ -68,6 +68,12 @@ + exit (1); \ + } + ++#if MPFR_LCONV_DPTS ++#define DPLEN ((int) strlen (localeconv()->decimal_point)) ++#else ++#define DPLEN 1 ++#endif ++ + /* limit for random precision in random() */ + const int prec_max_printf = 5000; + /* boolean: is stdout redirected to a file ? */ +@@ -316,11 +322,11 @@ + check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo); + check_length (2, ulo, 36, lu); + check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush); +- check_length (3, ush, 46, hu); ++ check_length (3, ush, 45 + DPLEN, hu); + check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i); +- check_length (4, i, 29, d); ++ check_length (4, i, 28 + DPLEN, d); + check_vprintf ("a. %R*A, b. %Fe, c. %i%zn", rnd, mpfr, mpf, sz, &sz); +- check_length (5, (unsigned long) sz, 34, lu); /* no format specifier '%zu' in C90 */ ++ check_length (5, (unsigned long) sz, 33 + DPLEN, lu); /* no format specifier '%zu' in C90 */ + check_vprintf ("a. %Pu, b. %c, c. %RUG, d. %Zi%Zn", prec, ch, mpfr, mpz, &mpz); + check_length_with_cmp (6, mpz, 24, mpz_cmp_ui (mpz, 24), Zi); + check_vprintf ("%% a. %#.0RNg, b. %Qx%Rn c. %p", +@@ -344,7 +350,7 @@ + + #ifdef PRINTF_L + check_vprintf ("a. %RA, b. %Lf, c. %QX%zn", mpfr, ld, mpq, &sz); +- check_length (9, (unsigned long) sz, 30, lu); /* no format specifier '%zu' in C90 */ ++ check_length (9, (unsigned long) sz, 29 + DPLEN, lu); /* no format specifier '%zu' in C90 */ + #endif + + #ifndef NPRINTF_HH +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-04-17 21:19:01.988530337 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-04-17 21:19:02.032530276 +0000 +@@ -0,0 +1 @@ ++rec_sqrt-zivloop +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:18:26.904579122 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-04-17 21:19:02.032530276 +0000 +@@ -1 +1 @@ +-4.2.0-p3 ++4.2.0-p4 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:18:26.900579128 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p3" ++#define MPFR_VERSION_STRING "4.2.0-p4" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/rec_sqrt.c mpfr-4.2.0-b/src/rec_sqrt.c +--- mpfr-4.2.0-a/src/rec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/rec_sqrt.c 2023-04-17 21:19:02.024530287 +0000 +@@ -463,6 +463,7 @@ + int s, cy, inex; + mpfr_limb_ptr x; + MPFR_TMP_DECL(marker); ++ MPFR_ZIV_DECL (loop); + + MPFR_LOG_FUNC + (("x[%Pu]=%.*Rg rnd=%d", mpfr_get_prec (u), mpfr_log_prec, u, rnd_mode), +@@ -530,6 +531,7 @@ + wp = rp + 11; + if (wp < rn * GMP_NUMB_BITS) + wp = rn * GMP_NUMB_BITS; ++ MPFR_ZIV_INIT (loop, wp); + for (;;) + { + MPFR_TMP_MARK (marker); +@@ -561,8 +563,9 @@ + } + MPFR_TMP_FREE(marker); + +- wp += GMP_NUMB_BITS; ++ MPFR_ZIV_NEXT (loop, wp); + } ++ MPFR_ZIV_FREE (loop); + cy = mpfr_round_raw (MPFR_MANT(r), x, wp, 0, rp, rnd_mode, &inex); + MPFR_EXP(r) = - (MPFR_EXP(u) - 1 - s) / 2; + if (MPFR_UNLIKELY(cy != 0)) +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:18:26.904579122 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-04-17 21:19:02.032530276 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p3"; ++ return "4.2.0-p4"; + } +diff -Naurd mpfr-4.2.0-a/tests/trec_sqrt.c mpfr-4.2.0-b/tests/trec_sqrt.c +--- mpfr-4.2.0-a/tests/trec_sqrt.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/trec_sqrt.c 2023-04-17 21:19:02.028530282 +0000 +@@ -242,6 +242,8 @@ + data_check ("data/rec_sqrt", mpfr_rec_sqrt, "mpfr_rec_sqrt"); + bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 4, 128, + 800, 50); ++ bad_cases (mpfr_rec_sqrt, pm2, "mpfr_rec_sqrt", 0, -256, 255, 9999, 9999, ++ 120000, 1); + + end: + tests_end_mpfr (); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:05:00.989811960 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:05:01.085811835 +0000 +@@ -0,0 +1 @@ ++reldiff +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:05:01.085811835 +0000 +@@ -1 +1 @@ +-4.2.0-p4 ++4.2.0-p5 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:05:01.077811846 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p4" ++#define MPFR_VERSION_STRING "4.2.0-p5" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/reldiff.c mpfr-4.2.0-b/src/reldiff.c +--- mpfr-4.2.0-a/src/reldiff.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/reldiff.c 2023-05-12 15:05:01.069811856 +0000 +@@ -30,31 +30,25 @@ + + if (MPFR_ARE_SINGULAR (b, c)) + { +- if (MPFR_IS_NAN(b) || MPFR_IS_NAN(c)) +- { +- MPFR_SET_NAN(a); +- return; +- } +- else if (MPFR_IS_INF(b)) ++ if (MPFR_IS_NAN (b) || MPFR_IS_INF (b) || MPFR_IS_NAN (c) || ++ (MPFR_IS_ZERO (b) && MPFR_IS_ZERO (c))) + { +- if (MPFR_IS_INF (c) && (MPFR_SIGN (c) == MPFR_SIGN (b))) +- MPFR_SET_ZERO(a); +- else +- MPFR_SET_NAN(a); ++ MPFR_SET_NAN (a); + return; + } +- else if (MPFR_IS_INF(c)) ++ if (MPFR_IS_ZERO (b) || MPFR_IS_INF (c)) + { + MPFR_SET_SAME_SIGN (a, b); + MPFR_SET_INF (a); + return; + } +- else if (MPFR_IS_ZERO(b)) /* reldiff = abs(c)/c = sign(c) */ +- { +- mpfr_set_si (a, MPFR_INT_SIGN (c), rnd_mode); +- return; +- } +- /* Fall through */ ++ /* The case c = 0 with b regular, which should give sign(b) exactly, ++ cannot be optimized here as it is documented in the MPFR manual ++ that this function just computes abs(b-c)/b using the precision ++ of a and the rounding mode rnd_mode for all operations. So let's ++ prefer the potentially "incorrect" result. Note that the correct ++ result is not necessarily better because if could break properties ++ (like monotonicity?) implied by the documentation. */ + } + + if (a == b) +@@ -64,8 +58,8 @@ + } + + mpfr_sub (a, b, c, rnd_mode); +- mpfr_abs (a, a, rnd_mode); /* for compatibility with MPF */ +- mpfr_div (a, a, (a == b) ? b_copy : b, rnd_mode); ++ MPFR_SET_SIGN (a, 1); ++ mpfr_div (a, a, a == b ? b_copy : b, rnd_mode); + + if (a == b) + mpfr_clear (b_copy); +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-04-17 21:19:02.032530276 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:05:01.081811839 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p4"; ++ return "4.2.0-p5"; + } +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-12 15:06:11.789722083 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-12 15:06:11.885721962 +0000 +@@ -0,0 +1 @@ ++tests-reuse +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-12 15:05:01.085811835 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-12 15:06:11.885721962 +0000 +@@ -1 +1 @@ +-4.2.0-p5 ++4.2.0-p6 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-12 15:05:01.077811846 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-12 15:06:11.877721972 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p5" ++#define MPFR_VERSION_STRING "4.2.0-p6" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:05:01.081811839 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:06:11.885721962 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p5"; ++ return "4.2.0-p6"; + } +diff -Naurd mpfr-4.2.0-a/tests/reuse.c mpfr-4.2.0-b/tests/reuse.c +--- mpfr-4.2.0-a/tests/reuse.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/reuse.c 2023-05-12 15:06:11.869721983 +0000 +@@ -78,22 +78,16 @@ + mpfr_const_pi (x, MPFR_RNDN); + MPFR_SET_EXP (x, MPFR_GET_EXP (x)-1); + break; +- default: ++ case 11: + mpfr_urandomb (x, RANDS); + if (RAND_BOOL ()) + mpfr_neg (x, x, MPFR_RNDN); + break; ++ default: ++ MPFR_ASSERTN (0); + } + } + +-/* same as mpfr_cmp, but returns 0 for both NaN's */ +-static int +-mpfr_compare (mpfr_srcptr a, mpfr_srcptr b) +-{ +- return (MPFR_IS_NAN(a)) ? !MPFR_IS_NAN(b) : +- (MPFR_IS_NAN(b) || mpfr_cmp(a, b)); +-} +- + static void + test3 (int (*testfunc)(mpfr_ptr, mpfr_srcptr, mpfr_srcptr, mpfr_rnd_t), + const char *foo, mpfr_prec_t prec, mpfr_rnd_t rnd) +@@ -112,10 +106,10 @@ + + /* for each variable, consider each of the following 6 possibilities: + NaN, +Infinity, -Infinity, +0, -0 or a random number */ +- for (i=0; i < SPECIAL_MAX*SPECIAL_MAX ; i++) ++ for (i = 0; i < SPECIAL_MAX * SPECIAL_MAX; i++) + { +- set_special (ref2, i%SPECIAL_MAX); +- set_special (ref3, i/SPECIAL_MAX); ++ set_special (ref2, i % SPECIAL_MAX); ++ set_special (ref3, i / SPECIAL_MAX); + + /* reference call: foo(a, b, c) */ + testfunc (ref1, ref2, ref3, rnd); +@@ -124,11 +118,11 @@ + mpfr_set (res1, ref2, rnd); /* exact operation */ + testfunc (res1, res1, ref3, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, c) with %s for ", foo, + mpfr_print_rnd_mode (rnd)); +- DISP("a=",ref2); DISP2(", c=",ref3); ++ DISP("a=", ref2); DISP2(", c=", ref3); + printf ("expected "); mpfr_dump (ref1); + printf ("got "); mpfr_dump (res1); + exit (1); +@@ -137,11 +131,12 @@ + /* foo(a, b, a) */ + mpfr_set (res1, ref3, rnd); + testfunc (res1, ref2, res1, rnd); +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, b, a) for ", foo); +- DISP("b=",ref2); DISP2(", a=", ref3); +- DISP("expected ", ref1); DISP2(", got ",res1); ++ DISP("b=", ref2); DISP2(", a=", ref3); ++ printf ("expected "); mpfr_dump (ref1); ++ printf ("got "); mpfr_dump (res1); + exit (1); + } + +@@ -151,11 +146,12 @@ + mpfr_set (res1, ref2, rnd); + testfunc (res1, res1, res1, rnd); + +- if (mpfr_compare (res1, ref1)) ++ if (! SAME_VAL (res1, ref1)) + { + printf ("Error for %s(a, a, a) for ", foo); +- DISP2("a=",ref2); +- DISP("expected ", ref1); DISP2(", got ", res1); ++ DISP2("a=", ref2); ++ printf ("expected "); mpfr_dump (ref1); ++ printf ("got "); mpfr_dump (res1); + exit (1); + } + } +@@ -187,13 +183,13 @@ + /* for each variable, consider each of the following 6 possibilities: + NaN, +Infinity, -Infinity, +0, -0 or a random number */ + +- for (i=0; i= -1, and <= 2 ulps for EXP(t) <= -2. ++ The error on t before the subtraction of k*log(2) is at most ++ 1/2 + 3*2^(EXP(t)+1) ulps, which is <= 2^(EXP(t)+3) for EXP(t) >= -1, ++ and <= 2 ulps for EXP(t) <= -2. + Additional error if k_no_zero: treal = t * errk, with + 1 - |k| * 2^(-Nt) <= exp(-|k| * 2^(-Nt)) <= errk <= 1, + i.e., additional absolute error <= 2^(EXP(k)+EXP(t)-Nt). +- Total error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1). */ +- err = MPFR_NOTZERO (t) && MPFR_GET_EXP (t) >= -1 ? +- MPFR_GET_EXP (t) + 3 : 1; ++ Total ulp error <= 2^err1 + 2^err2 <= 2^(max(err1,err2)+1), ++ where err1 = EXP(t)+3 for EXP(t) >= -1, and 1 otherwise, ++ and err2 = EXP(k). */ ++ err = MPFR_NOTZERO (t) && exp_t >= -1 ? exp_t + 3 : 1; + if (k_non_zero) + { + if (MPFR_GET_EXP (k) > err) +@@ -328,11 +331,17 @@ + */ + if (rnd_mode == MPFR_RNDN && inexact < 0 && lk < 0 && + MPFR_GET_EXP (z) == __gmpfr_emin - 1 - lk && mpfr_powerof2_raw (z)) +- /* Rounding to nearest, real result > z * 2^k = 2^(emin - 2), +- * underflow case: we will obtain the correct result and exceptions +- * by replacing z by nextabove(z). +- */ +- mpfr_nextabove (z); ++ /* Rounding to nearest, exact result > z * 2^k = 2^(emin - 2), ++ * and underflow case because the rounded result assuming an ++ * unbounded exponent range is 2^(emin - 2). We need to round ++ * to 2^(emin - 1), i.e. to round toward +inf. ++ * Note: the old code was using "mpfr_nextabove (z);" instead of ++ * setting rnd_mode to MPFR_RNDU for the call to mpfr_mul_2si, but ++ * this was incorrect in precision 1 because in this precision, ++ * mpfr_nextabove gave 2^(emin - 1), which is representable, ++ * so that mpfr_mul_2si did not generate the wanted underflow ++ * (the value was correct, but the underflow flag was missing). */ ++ rnd_mode = MPFR_RNDU; + MPFR_CLEAR_FLAGS (); + inex2 = mpfr_mul_2si (z, z, lk, rnd_mode); + if (inex2) /* underflow or overflow */ +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:06:11.885721962 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-12 15:08:39.325546612 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p6"; ++ return "4.2.0-p7"; + } +diff -Naurd mpfr-4.2.0-a/tests/texp10.c mpfr-4.2.0-b/tests/texp10.c +--- mpfr-4.2.0-a/tests/texp10.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/texp10.c 2023-05-12 15:08:39.309546630 +0000 +@@ -190,6 +190,187 @@ + mpfr_clear (y); + } + ++/* Bug in mpfr_pow_general found by ofuf_thresholds (on 2023-02-13 for ++ a 32-bit exponent, changed on 2023-03-06 for a 64-bit exponent too), ++ fixed in commit b62966df913f73f08b3c5252e1d0c702bc20442f. ++ With a 32-bit exponent, failure for i=0. ++ expected 0.1111E1073741823 ++ got @Inf@ ++ expected flags = inexact (8) ++ got flags = overflow inexact (10) ++ With a 64-bit exponent, failure for i=1. ++ expected 0.11111111111111111111111E4611686018427387903 ++ got @Inf@ ++ expected flags = inexact (8) ++ got flags = overflow inexact (10) ++ Note: ofuf_thresholds was added to the master branch, but for the ++ time being, there are issues with these tests. ++*/ ++static void ++bug20230213 (void) ++{ ++ const char *s[2] = { ++ "0x1.34413504b3ccdbd5dd8p+28", ++ "0x1.34413509f79fef2c4e0dd14a7ae0ecfbacdbp+60" ++ }; ++ mpfr_t x1, x2, y1, y2; ++ mpfr_prec_t px[2] = { 74, 147 }; ++ mpfr_prec_t py[2] = { 4, 23 }; ++ mpfr_exp_t old_emax, emax; ++ mpfr_flags_t flags1, flags2; ++ int i; ++ ++ old_emax = mpfr_get_emax (); ++ ++ for (i = 0; i < 2; i++) ++ { ++ if (i != 0) ++ set_emax (MPFR_EMAX_MAX); ++ ++ emax = mpfr_get_emax (); ++ ++ mpfr_inits2 (px[i], x1, x2, (mpfr_ptr) 0); ++ mpfr_inits2 (py[i], y1, y2, (mpfr_ptr) 0); ++ ++ mpfr_setmax (y1, emax); ++ mpfr_log10 (x1, y1, MPFR_RNDD); ++ mpfr_set_str (x2, s[i], 0, MPFR_RNDN); ++ /* For i == 0, emax == 2^30, so that the value can be checked. ++ For i != 0, check the value for the case emax == 2^62. ++ The "0UL" ensures that the shifts are valid. */ ++ if (i == 0 || (((0UL + MPFR_EMAX_MAX) >> 31) >> 30) == 1) ++ { ++ /* printf ("Checking x1 for i=%d\n", i); */ ++ MPFR_ASSERTN (mpfr_equal_p (x1, x2)); ++ } ++ ++ /* Let MAXF be the maximum finite value (y1 above). ++ Since x1 < log10(MAXF), one should have exp10(x1) < MAXF, and ++ therefore, y2 = RU(exp10(x1)) <= RU(MAXF) = MAXF (no overflow). */ ++ flags1 = MPFR_FLAGS_INEXACT; ++ mpfr_clear_flags (); ++ mpfr_exp10 (y2, x1, MPFR_RNDU); ++ flags2 = __gmpfr_flags; ++ ++ if (! (mpfr_lessequal_p (y2, y1) && flags2 == flags1)) ++ { ++ printf ("Error in bug20230213 for i=%d\n", i); ++ printf ("emax = %" MPFR_EXP_FSPEC "d\n", (mpfr_eexp_t) emax); ++ printf ("expected "); mpfr_dump (y1); ++ printf ("got "); mpfr_dump (y2); ++ printf ("expected flags ="); ++ flags_out (flags1); ++ printf ("got flags ="); ++ flags_out (flags2); ++ exit (1); ++ } ++ ++ mpfr_clears (x1, x2, y1, y2, (mpfr_ptr) 0); ++ } ++ ++ set_emax (old_emax); ++} ++ ++/* Bug in mpfr_pow_general in precision 1 in the particular case of ++ rounding to nearest, z * 2^k = 2^(emin - 2) and real result larger ++ than this value; fixed in ff5012b61d5e5fee5156c57b8aa8fc1739c2a771 ++ (which is simplified in 4f5de980be290687ac1409aa02873e9e0dd1a030); ++ initially found by ofuf_thresholds (though the test was incorrect). ++ With a 32-bit exponent, failure for i=0. ++ With a 64-bit exponent, failure for i=1. ++ The result was correct, but the underflow flag was missing. ++ Note: ofuf_thresholds was added to the master branch, but for the ++ time being, there are issues with these tests. ++*/ ++static void ++bug20230427 (void) ++{ ++ const char *s[2] = { ++ "-0.1001101000100000100110101000011E29", ++ "-0.100110100010000010011010100001001111101111001111111101111001101E61" ++ }; ++ mpfr_t x, y, z, t1, t2; ++ mpfr_exp_t old_emin; ++ mpfr_flags_t flags, ex_flags; ++ int i, inex; ++ ++ old_emin = mpfr_get_emin (); ++ ++ mpfr_init2 (x, 63); ++ mpfr_inits2 (1, y, z, (mpfr_ptr) 0); ++ mpfr_inits2 (128, t1, t2, (mpfr_ptr) 0); ++ ++ for (i = 0; i < 2; i++) ++ { ++ if (i == 0) ++ { ++ /* Basic check: the default emin should be -2^30 (exactly). */ ++ if (mpfr_get_emin () != -1073741823) ++ abort (); ++ } ++ else ++ { ++ /* This test assumes that MPFR_EMIN_MIN = -2^62 (exactly). ++ The "0UL" ensures that the shifts are valid. */ ++ if ((((0UL - MPFR_EMIN_MIN) >> 31) >> 30) != 1) ++ break; ++ ++ set_emin (MPFR_EMIN_MIN); ++ } ++ ++ mpfr_set_str_binary (x, s[i]); ++ ++ /* We will test 10^x rounded to nearest in precision 1. ++ Check that 2^(emin - 2) < 10^x < (3/2) * 2^(emin - 2). ++ This is approximate, but by outputting the values, one can check ++ that one is not too close to the boundaries: ++ emin - 2 = -4611686018427387905 ++ log2(10^x) ~= -4611686018427387904.598 ++ emin - 2 + log2(3/2) ~= -4611686018427387904.415 ++ Thus the result should be the smallest positive number 2^(emin - 1) ++ because 10^x is closer to this number than to 0, the midpoint being ++ 2^(emin - 2). And there should be an underflow in precision 1 because ++ the result rounded to nearest in an unbounded exponent range should ++ have been 2^(emin - 2), the midpoint being (3/2) * 2^(emin - 2). ++ */ ++ mpfr_set_ui (t1, 10, MPFR_RNDN); ++ mpfr_log2 (t2, t1, MPFR_RNDN); ++ mpfr_mul (t1, t2, x, MPFR_RNDN); ++ inex = mpfr_set_exp_t (t2, mpfr_get_emin () - 2, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ MPFR_ASSERTN (mpfr_greater_p (t1, t2)); /* log2(10^x) > emin - 2 */ ++ inex = mpfr_sub (t1, t1, t2, MPFR_RNDN); ++ MPFR_ASSERTN (inex == 0); ++ mpfr_set_ui (t2, 3, MPFR_RNDN); ++ mpfr_log2 (t2, t2, MPFR_RNDN); ++ mpfr_sub_ui (t2, t2, 1, MPFR_RNDN); /* log2(3/2) */ ++ MPFR_ASSERTN (mpfr_less_p (t1, t2)); ++ ++ mpfr_clear_flags (); ++ mpfr_exp10 (y, x, MPFR_RNDN); ++ flags = __gmpfr_flags; ++ ex_flags = MPFR_FLAGS_UNDERFLOW | MPFR_FLAGS_INEXACT; ++ ++ mpfr_setmin (z, mpfr_get_emin ()); /* z = 0.1@emin */ ++ if (! (mpfr_equal_p (y, z) && flags == ex_flags)) ++ { ++ printf ("Error in bug20230427 for i=%d\n", i); ++ printf ("expected "); mpfr_dump (z); ++ printf ("got "); mpfr_dump (y); ++ printf ("emin = %" MPFR_EXP_FSPEC "d\n", ++ (mpfr_eexp_t) mpfr_get_emin ()); ++ printf ("expected flags ="); ++ flags_out (ex_flags); ++ printf ("got flags ="); ++ flags_out (flags); ++ exit (1); ++ } ++ } ++ ++ mpfr_clears (x, y, z, t1, t2, (mpfr_ptr) 0); ++ set_emin (old_emin); ++} ++ + int + main (int argc, char *argv[]) + { +@@ -199,6 +380,9 @@ + + tests_start_mpfr (); + ++ bug20230213 (); ++ bug20230427 (); ++ + special_overflow (); + emax_m_eps (); + exp_range (); +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-17 17:17:28.512360351 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-17 17:17:28.600360192 +0000 +@@ -0,0 +1 @@ ++compound +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-12 15:08:39.325546612 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-17 17:17:28.600360192 +0000 +@@ -1 +1 @@ +-4.2.0-p7 ++4.2.0-p8 +diff -Naurd mpfr-4.2.0-a/src/compound.c mpfr-4.2.0-b/src/compound.c +--- mpfr-4.2.0-a/src/compound.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/compound.c 2023-05-17 17:17:28.588360213 +0000 +@@ -55,9 +55,9 @@ + mpfr_compound_si (mpfr_ptr y, mpfr_srcptr x, long n, mpfr_rnd_t rnd_mode) + { + int inexact, compared, k, nloop; +- mpfr_t t; +- mpfr_exp_t e; +- mpfr_prec_t prec; ++ mpfr_t t, u; ++ mpfr_prec_t py, prec, extra; ++ mpfr_rnd_t rnd1; + MPFR_ZIV_DECL (loop); + MPFR_SAVE_EXPO_DECL (expo); + +@@ -136,64 +136,185 @@ + + MPFR_SAVE_EXPO_MARK (expo); + +- prec = MPFR_PREC(y); +- prec += MPFR_INT_CEIL_LOG2 (prec) + 6; ++ py = MPFR_GET_PREC (y); ++ prec = py + MPFR_INT_CEIL_LOG2 (py) + 6; + + mpfr_init2 (t, prec); ++ mpfr_init2 (u, prec); + + k = MPFR_INT_CEIL_LOG2(SAFE_ABS (unsigned long, n)); /* thus |n| <= 2^k */ + ++ /* We compute u=log2p1(x) with prec+extra bits, since we lose some bits ++ in 2^u. */ ++ extra = 0; ++ rnd1 = VSIGN (n) == MPFR_SIGN (x) ? MPFR_RNDD : MPFR_RNDU; ++ + MPFR_ZIV_INIT (loop, prec); + for (nloop = 0; ; nloop++) + { +- /* we compute (1+x)^n as 2^(n*log2p1(x)) */ +- inexact = mpfr_log2p1 (t, x, MPFR_RNDN) != 0; +- e = MPFR_GET_EXP(t); +- /* |t - log2(1+x)| <= 1/2*ulp(t) = 2^(e-prec-1) */ +- inexact |= mpfr_mul_si (t, t, n, MPFR_RNDN) != 0; +- /* |t - n*log2(1+x)| <= 2^(e2-prec-1) + |n|*2^(e-prec-1) +- <= 2^(e2-prec-1) + 2^(e+k-prec-1) <= 2^(e+k-prec) +- where |n| <= 2^k, and e2 is the new exponent of t. */ +- MPFR_ASSERTD(MPFR_GET_EXP(t) <= e + k); +- e += k; +- /* |t - n*log2(1+x)| <= 2^(e-prec) */ +- /* detect overflow */ +- if (nloop == 0 && mpfr_cmp_si (t, __gmpfr_emax) >= 0) ++ unsigned int inex; ++ mpfr_exp_t e, e2, ex; ++ mpfr_prec_t precu = MPFR_ADD_PREC (prec, extra); ++ mpfr_prec_t new_extra; ++ mpfr_rnd_t rnd2; ++ ++ /* We compute (1+x)^n as 2^(n*log2p1(x)), ++ and we round toward 1, thus we round n*log2p1(x) toward 0, ++ thus for x*n > 0 we round log2p1(x) toward -Inf, and for x*n < 0 ++ we round log2p1(x) toward +Inf. */ ++ inex = mpfr_log2p1 (u, x, rnd1) != 0; ++ e = MPFR_GET_EXP (u); ++ /* |u - log2(1+x)| <= ulp(t) = 2^(e-precu) */ ++ inex |= mpfr_mul_si (u, u, n, MPFR_RNDZ) != 0; ++ e2 = MPFR_GET_EXP (u); ++ /* |u - n*log2(1+x)| <= 2^(e2-precu) + |n|*2^(e-precu) ++ <= 2^(e2-precu) + 2^(e+k-precu) <= 2^(e+k+1-precu) ++ where |n| <= 2^k, and e2 is the new exponent of u. */ ++ MPFR_ASSERTD (e2 <= e + k); ++ e += k + 1; ++ MPFR_ASSERTN (e2 <= MPFR_PREC_MAX); ++ new_extra = e2 > 0 ? e2 : 0; ++ /* |u - n*log2(1+x)| <= 2^(e-precu) */ ++ /* detect overflow: since we rounded n*log2p1(x) toward 0, ++ if n*log2p1(x) >= __gmpfr_emax, we are sure there is overflow. */ ++ if (mpfr_cmp_si (u, __gmpfr_emax) >= 0) + { + MPFR_ZIV_FREE (loop); + mpfr_clear (t); ++ mpfr_clear (u); + MPFR_SAVE_EXPO_FREE (expo); + return mpfr_overflow (y, rnd_mode, 1); + } +- /* detect underflow */ +- if (nloop == 0 && mpfr_cmp_si (t, __gmpfr_emin - 1) <= 0) ++ /* detect underflow: similarly, since we rounded n*log2p1(x) toward 0, ++ if n*log2p1(x) < __gmpfr_emin-1, we are sure there is underflow. */ ++ if (mpfr_cmp_si (u, __gmpfr_emin - 1) < 0) + { + MPFR_ZIV_FREE (loop); + mpfr_clear (t); ++ mpfr_clear (u); + MPFR_SAVE_EXPO_FREE (expo); + return mpfr_underflow (y, +- (rnd_mode == MPFR_RNDN) ? MPFR_RNDZ : rnd_mode, 1); ++ rnd_mode == MPFR_RNDN ? MPFR_RNDZ : rnd_mode, 1); + } + /* Detect cases where result is 1 or 1+ulp(1) or 1-1/2*ulp(1): +- |2^t - 1| = |exp(t*log(2)) - 1| <= |t|*log(2) < |t| */ +- if (nloop == 0 && MPFR_GET_EXP(t) < - (mpfr_exp_t) MPFR_PREC(y)) ++ |2^u - 1| = |exp(u*log(2)) - 1| <= |u|*log(2) < |u| */ ++ if (nloop == 0 && MPFR_GET_EXP(u) < - py) + { +- /* since ulp(1) = 2^(1-PREC(y)), we have |t| < 1/4*ulp(1) */ ++ /* since ulp(1) = 2^(1-py), we have |u| < 1/4*ulp(1) */ + /* mpfr_compound_near_one must be called in the extended + exponent range, so that 1 is representable. */ +- inexact = mpfr_compound_near_one (y, MPFR_SIGN (t), rnd_mode); ++ inexact = mpfr_compound_near_one (y, MPFR_SIGN (u), rnd_mode); + goto end; + } +- inexact |= mpfr_exp2 (t, t, MPFR_RNDA) != 0; +- /* |t - (1+x)^n| <= ulp(t) + |t|*log(2)*2^(e-prec) +- < 2^(EXP(t)-prec) + 2^(EXP(t)+e-prec) */ +- e = (e >= 0) ? e + 1 : 1; ++ /* FIXME: mpfr_exp2 could underflow to the smallest positive number ++ since MPFR_RNDA is used, and this case will not be detected by ++ MPFR_CAN_ROUND (see BUGS). Either fix that, or do early underflow ++ detection (which may be necessary). */ ++ /* round 2^u toward 1 */ ++ rnd2 = MPFR_IS_POS (u) ? MPFR_RNDD : MPFR_RNDU; ++ inex |= mpfr_exp2 (t, u, rnd2) != 0; ++ /* we had |u - n*log2(1+x)| < 2^(e-precu) ++ thus u = n*log2(1+x) + delta with |delta| < 2^(e-precu) ++ then 2^u = (1+x)^n * 2^delta with |delta| < 2^(e-precu). ++ For |delta| < 0.5, |2^delta - 1| <= |delta| thus ++ |t - (1+x)^n| <= ulp(t) + |t|*2^(e-precu) ++ < 2^(EXP(t)-prec) + 2^(EXP(t)+e-precu) */ ++ e = (precu - prec >= e) ? 1 : e + 1 - (precu - prec); + /* now |t - (1+x)^n| < 2^(EXP(t)+e-prec) */ + +- if (MPFR_LIKELY (inexact == 0 || +- MPFR_CAN_ROUND (t, prec - e, MPFR_PREC(y), rnd_mode))) ++ if (MPFR_LIKELY (!inex || MPFR_CAN_ROUND (t, prec - e, py, rnd_mode))) + break; + ++ /* If t fits in the target precision (or with 1 more bit), then we can ++ round, assuming the working precision is large enough, but the above ++ MPFR_CAN_ROUND() will fail because we cannot determine the ternary ++ value. However since we rounded t toward 1, we can determine it. ++ Since the error in the approximation t is at most 2^e ulp(t), ++ this error should be less than 1/2 ulp(y), thus we should have ++ prec - py >= e + 1. */ ++ if (mpfr_min_prec (t) <= py + 1 && prec - py >= e + 1) ++ { ++ /* we add/subtract one ulp to get the correct rounding */ ++ if (rnd2 == MPFR_RNDD) /* t was rounded downwards */ ++ mpfr_nextabove (t); ++ else ++ mpfr_nextbelow (t); ++ break; ++ } ++ ++ /* Detect particular cases where Ziv's strategy may take too much ++ memory and be too long, i.e. when x^n fits in the target precision ++ (+ 1 additional bit for rounding to nearest) and the exact result ++ (1+x)^n is very close to x^n. ++ Necessarily, x is a large even integer and n > 0 (thus n > 1). ++ Since this does not depend on the working precision, we only ++ check this at the first iteration (nloop == 0). ++ Hence the first "if" below and the kx < ex test of the second "if" ++ (x is an even integer iff its least bit 1 has exponent >= 1). ++ The second test of the second "if" corresponds to another simple ++ condition that implies that x^n fits in the target precision. ++ Here are the details: ++ Let k be the minimum length of the significand of x, and x' the odd ++ (integer) significand of x. This means that 2^(k-1) <= x' < 2^k. ++ Thus 2^(n*(k-1)) <= (x')^n < 2^(k*n), and x^n has between n*(k-1)+1 ++ and k*n bits. So x^n can fit into p bits only if p >= n*(k-1)+1, ++ i.e. n*(k-1) <= p-1. ++ Note that x >= 2^k, so that x^n >= 2^(k*n). Since raw overflow ++ has already been detected, k*n cannot overflow if computed with ++ the mpfr_exp_t type. Hence the second test of the second "if", ++ which cannot overflow. */ ++ MPFR_ASSERTD (n < 0 || n > 1); ++ if (nloop == 0 && n > 1 && (ex = MPFR_GET_EXP (x)) >= 17) ++ { ++ mpfr_prec_t kx = mpfr_min_prec (x); ++ mpfr_prec_t p = py + (rnd_mode == MPFR_RNDN); ++ ++ MPFR_LOG_MSG (("Check if x^n fits... n=%ld kx=%Pd p=%Pd\n", ++ n, kx, p)); ++ if (kx < ex && n * (mpfr_exp_t) (kx - 1) <= p - 1) ++ { ++ mpfr_t v; ++ ++ /* Check whether x^n really fits into p bits. */ ++ mpfr_init2 (v, p); ++ inexact = mpfr_pow_ui (v, x, n, MPFR_RNDZ); ++ if (inexact == 0) ++ { ++ MPFR_LOG_MSG (("x^n fits into p bits\n", 0)); ++ /* (x+1)^n = x^n * (1 + 1/x)^n ++ For directed rounding, we can round when (1 + 1/x)^n ++ < 1 + 2^-p, and then the result is x^n, ++ except for rounding up. Indeed, if (1 + 1/x)^n < 1 + 2^-p, ++ 1 <= (x+1)^n < x^n * (1 + 2^-p) = x^n + x^n/2^p ++ < x^n + ulp(x^n). ++ For rounding to nearest, we can round when (1 + 1/x)^n ++ < 1 + 2^-p, and then the result is x^n when x^n fits ++ into p-1 bits, and nextabove(x^n) otherwise. */ ++ mpfr_ui_div (t, 1, x, MPFR_RNDU); ++ mpfr_add_ui (t, t, 1, MPFR_RNDU); ++ mpfr_pow_ui (t, t, n, MPFR_RNDU); ++ mpfr_sub_ui (t, t, 1, MPFR_RNDU); ++ /* t cannot be zero */ ++ if (MPFR_GET_EXP(t) < - py) ++ { ++ mpfr_set (y, v, MPFR_RNDZ); ++ if ((rnd_mode == MPFR_RNDN && mpfr_min_prec (v) == p) ++ || rnd_mode == MPFR_RNDU || rnd_mode == MPFR_RNDA) ++ { ++ /* round up */ ++ mpfr_nextabove (y); ++ inexact = 1; ++ } ++ else ++ inexact = -1; ++ mpfr_clear (v); ++ goto end; ++ } ++ } ++ mpfr_clear (v); ++ } ++ } ++ + /* Exact cases like compound(0.5,2) = 9/4 must be detected, since + except for 1+x power of 2, the log2p1 above will be inexact, + so that in the Ziv test, inexact != 0 and MPFR_CAN_ROUND will +@@ -211,6 +332,8 @@ + + MPFR_ZIV_NEXT (loop, prec); + mpfr_set_prec (t, prec); ++ extra = new_extra; ++ mpfr_set_prec (u, MPFR_ADD_PREC (prec, extra)); + } + + inexact = mpfr_set (y, t, rnd_mode); +@@ -218,6 +341,7 @@ + end: + MPFR_ZIV_FREE (loop); + mpfr_clear (t); ++ mpfr_clear (u); + + MPFR_SAVE_EXPO_FREE (expo); + return mpfr_check_range (y, inexact, rnd_mode); +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-12 15:08:39.321546616 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-17 17:17:28.596360199 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p7" ++#define MPFR_VERSION_STRING "4.2.0-p8" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-12 15:08:39.325546612 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-17 17:17:28.600360192 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p7"; ++ return "4.2.0-p8"; + } +diff -Naurd mpfr-4.2.0-a/tests/tcompound.c mpfr-4.2.0-b/tests/tcompound.c +--- mpfr-4.2.0-a/tests/tcompound.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tcompound.c 2023-05-17 17:17:28.588360213 +0000 +@@ -238,18 +238,263 @@ + mpfr_clear (y); + } + +-static int +-mpfr_compound2 (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd_mode) ++/* Failure with mpfr_compound_si from 2021-02-15 due to ++ incorrect underflow detection. */ ++static void ++bug_20230206 (void) + { +- return mpfr_compound_si (y, x, 2, rnd_mode); ++ if (MPFR_PREC_MIN == 1) ++ { ++ mpfr_t x, y1, y2; ++ int inex1, inex2; ++ mpfr_flags_t flags1, flags2; ++#if MPFR_PREC_BITS >= 64 ++ mpfr_exp_t emin; ++#endif ++ ++ mpfr_inits2 (1, x, y1, y2, (mpfr_ptr) 0); ++ mpfr_set_ui_2exp (x, 1, -1, MPFR_RNDN); /* x = 1/2 */ ++ ++ /* This first test is useful mainly for a 32-bit mpfr_exp_t type ++ (no failure with a 64-bit mpfr_exp_t type since the underflow ++ threshold in the extended exponent range is much lower). */ ++ ++ mpfr_set_ui_2exp (y1, 1, -1072124363, MPFR_RNDN); ++ inex1 = -1; ++ flags1 = MPFR_FLAGS_INEXACT; ++ mpfr_clear_flags (); ++ /* -1832808704 ~= -2^30 / log2(3/2) */ ++ inex2 = mpfr_compound_si (y2, x, -1832808704, MPFR_RNDN); ++ flags2 = __gmpfr_flags; ++ if (!(mpfr_equal_p (y1, y2) && ++ SAME_SIGN (inex1, inex2) && ++ flags1 == flags2)) ++ { ++ printf ("Error in bug_20230206 (1):\n"); ++ printf ("Expected "); ++ mpfr_dump (y1); ++ printf (" with inex = %d, flags =", inex1); ++ flags_out (flags1); ++ printf ("Got "); ++ mpfr_dump (y2); ++ printf (" with inex = %d, flags =", inex2); ++ flags_out (flags2); ++ exit (1); ++ } ++ ++ /* This second test is for a 64-bit mpfr_exp_t type ++ (it is disabled with a 32-bit mpfr_exp_t type). */ ++ ++ /* The "#if" makes sure that 64-bit constants are supported, avoiding ++ a compilation failure. The "if" makes sure that the constant is ++ representable in a long (this would not be the case with 32-bit ++ unsigned long and 64-bit limb). It also ensures that mpfr_exp_t ++ has at least 64 bits. */ ++#if MPFR_PREC_BITS >= 64 ++ emin = mpfr_get_emin (); ++ set_emin (MPFR_EMIN_MIN); ++ mpfr_set_ui_2exp (y1, 1, -4611686018427366846, MPFR_RNDN); ++ inex1 = 1; ++ flags1 = MPFR_FLAGS_INEXACT; ++ mpfr_clear_flags (); ++ /* -7883729320669216768 ~= -2^62 / log2(3/2) */ ++ inex2 = mpfr_compound_si (y2, x, -7883729320669216768, MPFR_RNDN); ++ flags2 = __gmpfr_flags; ++ if (!(mpfr_equal_p (y1, y2) && ++ SAME_SIGN (inex1, inex2) && ++ flags1 == flags2)) ++ { ++ printf ("Error in bug_20230206 (2):\n"); ++ printf ("Expected "); ++ mpfr_dump (y1); ++ printf (" with inex = %d, flags =", inex1); ++ flags_out (flags1); ++ printf ("Got "); ++ mpfr_dump (y2); ++ printf (" with inex = %d, flags =", inex2); ++ flags_out (flags2); ++ exit (1); ++ } ++ set_emin (emin); ++#endif ++ ++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); ++ } + } + ++/* Reported by Patrick Pelissier on 2023-02-11 for the master branch ++ (tgeneric_ui.c with GMP_CHECK_RANDOMIZE=1412991715). ++ On a 32-bit host, one gets Inf (overflow) instead of 0.1E1071805703. ++*/ ++static void ++bug_20230211 (void) ++{ ++ mpfr_t x, y1, y2; ++ int inex1, inex2; ++ mpfr_flags_t flags1, flags2; ++ ++ mpfr_inits2 (1, x, y1, y2, (mpfr_ptr) 0); ++ mpfr_set_ui_2exp (x, 1, -1, MPFR_RNDN); /* x = 1/2 */ ++ mpfr_set_ui_2exp (y1, 1, 1071805702, MPFR_RNDN); ++ inex1 = 1; ++ flags1 = MPFR_FLAGS_INEXACT; ++ mpfr_clear_flags (); ++ inex2 = mpfr_compound_si (y2, x, 1832263949, MPFR_RNDN); ++ flags2 = __gmpfr_flags; ++ if (!(mpfr_equal_p (y1, y2) && ++ SAME_SIGN (inex1, inex2) && ++ flags1 == flags2)) ++ { ++ printf ("Error in bug_20230211:\n"); ++ printf ("Expected "); ++ mpfr_dump (y1); ++ printf (" with inex = %d, flags =", inex1); ++ flags_out (flags1); ++ printf ("Got "); ++ mpfr_dump (y2); ++ printf (" with inex = %d, flags =", inex2); ++ flags_out (flags2); ++ exit (1); ++ } ++ mpfr_clears (x, y1, y2, (mpfr_ptr) 0); ++} ++ ++/* Integer overflow with compound.c d04caeae04c6a83276916c4fbac1fe9b0cec3c8b ++ (2023-02-23) or 952fb0f5cc2df1fffde3eb54c462fdae5f123ea6 in the 4.2 branch ++ on "n * (kx - 1) + 1". Note: if the only effect is just a random value, ++ this probably doesn't affect the result (one might enter the "if" while ++ one shouldn't, but the real check is done inside the "if"). This test ++ fails if -fsanitize=undefined -fno-sanitize-recover is used or if the ++ processor emits a signal in case of integer overflow. ++ This test has been made obsolete by the "kx < ex" condition ++ in 2cb3123891dd46fe0258d4aec7f8655b8ec69aaf (master branch) ++ or f5cb40571bc3d1559f05b230cf4ffecaf0952852 (4.2 branch). */ ++static void ++bug_20230517 (void) ++{ ++ mpfr_exp_t old_emax; ++ mpfr_t x; ++ ++ old_emax = mpfr_get_emax (); ++ set_emax (MPFR_EMAX_MAX); ++ ++ mpfr_init2 (x, 123456); ++ mpfr_set_ui (x, 65536, MPFR_RNDN); ++ mpfr_nextabove (x); ++ mpfr_compound_si (x, x, LONG_MAX >> 16, MPFR_RNDN); ++ mpfr_clear (x); ++ ++ set_emax (old_emax); ++} ++ ++/* Inverse function on non-special cases... ++ One has x = (1+y)^n with y > -1 and x > 0. Thus y = x^(1/n) - 1. ++ The inverse function is useful ++ - to build and check hard-to-round cases (see bad_cases() in tests.c); ++ - to test the behavior close to the overflow and underflow thresholds. ++ The case x = 0 actually needs to be handled as it may occur with ++ bad_cases() due to rounding. ++*/ + static int +-mpfr_compound3 (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t rnd_mode) ++inv_compound (mpfr_ptr y, mpfr_srcptr x, long n, mpfr_rnd_t rnd_mode) + { +- return mpfr_compound_si (y, x, 3, rnd_mode); ++ mpfr_t t; ++ int inexact; ++ mpfr_prec_t precy, prect; ++ MPFR_ZIV_DECL (loop); ++ MPFR_SAVE_EXPO_DECL (expo); ++ ++ MPFR_ASSERTN (n != 0); ++ ++ if (MPFR_UNLIKELY (MPFR_IS_ZERO (x))) ++ { ++ if (n > 0) ++ return mpfr_set_si (y, -1, rnd_mode); ++ else ++ { ++ MPFR_SET_INF (y); ++ MPFR_SET_POS (y); ++ MPFR_RET (0); ++ } ++ } ++ ++ MPFR_SAVE_EXPO_MARK (expo); ++ ++ if (mpfr_equal_p (x, __gmpfr_one)) ++ { ++ MPFR_SAVE_EXPO_FREE (expo); ++ mpfr_set_zero (y, 1); ++ MPFR_RET (0); ++ } ++ ++ precy = MPFR_GET_PREC (y); ++ prect = precy + 20; ++ mpfr_init2 (t, prect); ++ ++ MPFR_ZIV_INIT (loop, prect); ++ for (;;) ++ { ++ mpfr_exp_t expt1, expt2, err; ++ unsigned int inext; ++ ++ if (mpfr_rootn_si (t, x, n, MPFR_RNDN) == 0) ++ { ++ /* With a huge t, this case would yield inext != 0 and a ++ MPFR_CAN_ROUND failure until a huge precision is reached ++ (as the result is very close to an exact point). Fortunately, ++ since t is exact, we can obtain the correctly rounded result ++ by doing the second operation to the target precision directly. ++ */ ++ inexact = mpfr_sub_ui (y, t, 1, rnd_mode); ++ goto end; ++ } ++ expt1 = MPFR_GET_EXP (t); ++ /* |error| <= 2^(expt1-prect-1) */ ++ inext = mpfr_sub_ui (t, t, 1, MPFR_RNDN); ++ if (MPFR_UNLIKELY (MPFR_IS_ZERO (t))) ++ goto cont; /* cannot round yet */ ++ expt2 = MPFR_GET_EXP (t); ++ err = 1; ++ if (expt2 < expt1) ++ err += expt1 - expt2; ++ /* |error(rootn)| <= 2^(err+expt2-prect-2) ++ and if mpfr_sub_ui is inexact: ++ |error| <= 2^(err+expt2-prect-2) + 2^(expt2-prect-1) ++ <= (2^(err-1) + 1) * 2^(expt2-prect-1) ++ <= 2^((err+1)+expt2-prect-2) */ ++ if (inext) ++ err++; ++ /* |error| <= 2^(err+expt2-prect-2) */ ++ if (MPFR_CAN_ROUND (t, prect + 2 - err, precy, rnd_mode)) ++ break; ++ ++ cont: ++ MPFR_ZIV_NEXT (loop, prect); ++ mpfr_set_prec (t, prect); ++ } ++ ++ inexact = mpfr_set (y, t, rnd_mode); ++ ++ end: ++ MPFR_ZIV_FREE (loop); ++ mpfr_clear (t); ++ MPFR_SAVE_EXPO_FREE (expo); ++ return mpfr_check_range (y, inexact, rnd_mode); + } + ++#define DEFN(N) \ ++ static int mpfr_compound##N (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t r) \ ++ { return mpfr_compound_si (y, x, N, r); } \ ++ static int inv_compound##N (mpfr_ptr y, mpfr_srcptr x, mpfr_rnd_t r) \ ++ { return inv_compound (y, x, N, r); } ++ ++DEFN(2) ++DEFN(3) ++DEFN(4) ++DEFN(5) ++DEFN(17) ++DEFN(120) ++ + #define TEST_FUNCTION mpfr_compound2 + #define test_generic test_generic_compound2 + #include "tgeneric.c" +@@ -258,17 +503,55 @@ + #define test_generic test_generic_compound3 + #include "tgeneric.c" + ++#define TEST_FUNCTION mpfr_compound4 ++#define test_generic test_generic_compound4 ++#include "tgeneric.c" ++ ++#define TEST_FUNCTION mpfr_compound5 ++#define test_generic test_generic_compound5 ++#include "tgeneric.c" ++ ++#define TEST_FUNCTION mpfr_compound17 ++#define test_generic test_generic_compound17 ++#include "tgeneric.c" ++ ++#define TEST_FUNCTION mpfr_compound120 ++#define test_generic test_generic_compound120 ++#include "tgeneric.c" ++ + int + main (void) + { + tests_start_mpfr (); + + check_ieee754 (); ++ bug_20230206 (); ++ bug_20230211 (); ++ bug_20230517 (); + + test_generic_si (MPFR_PREC_MIN, 100, 100); + + test_generic_compound2 (MPFR_PREC_MIN, 100, 100); + test_generic_compound3 (MPFR_PREC_MIN, 100, 100); ++ test_generic_compound4 (MPFR_PREC_MIN, 100, 100); ++ test_generic_compound5 (MPFR_PREC_MIN, 100, 100); ++ test_generic_compound17 (MPFR_PREC_MIN, 100, 100); ++ test_generic_compound120 (MPFR_PREC_MIN, 100, 100); ++ ++ /* Note: For small n, we need a psup high enough to avoid too many ++ "f exact while f^(-1) inexact" occurrences in bad_cases(). */ ++ bad_cases (mpfr_compound2, inv_compound2, "mpfr_compound2", ++ 0, -256, 255, 4, 128, 240, 40); ++ bad_cases (mpfr_compound3, inv_compound3, "mpfr_compound3", ++ 0, -256, 255, 4, 128, 120, 40); ++ bad_cases (mpfr_compound4, inv_compound4, "mpfr_compound4", ++ 0, -256, 255, 4, 128, 80, 40); ++ bad_cases (mpfr_compound5, inv_compound5, "mpfr_compound5", ++ 0, -256, 255, 4, 128, 80, 40); ++ bad_cases (mpfr_compound17, inv_compound17, "mpfr_compound17", ++ 0, -256, 255, 4, 128, 80, 40); ++ bad_cases (mpfr_compound120, inv_compound120, "mpfr_compound120", ++ 0, -256, 255, 4, 128, 80, 40); + + tests_end_mpfr (); + return 0; +diff -Naurd mpfr-4.2.0-a/tests/tests.c mpfr-4.2.0-b/tests/tests.c +--- mpfr-4.2.0-a/tests/tests.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tests.c 2023-05-17 17:17:28.588360213 +0000 +@@ -1086,10 +1086,9 @@ + } + if (inex_inv) + { +- printf ("bad_cases: f exact while f^(-1) inexact,\n" +- "due to a poor choice of the parameters.\n"); +- exit (1); +- /* alternatively, goto next_i */ ++ if (dbg) ++ printf ("bad_cases: f exact while f^(-1) inexact\n"); ++ goto does_not_match; + } + inex = 0; + break; +@@ -1112,6 +1111,10 @@ + if (mpfr_nanflag_p () || mpfr_overflow_p () || mpfr_underflow_p () + || ! mpfr_equal_p (z, y)) + { ++ /* This may occur when psup is not large enough: evaluating ++ x = (f^(-1))(y) then z = f(x) may not give back y if the ++ precision of x is too small. */ ++ does_not_match: + if (dbg) + { + printf ("bad_cases: inverse doesn't match for %s\ny = ", +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-05-17 17:19:35.484201703 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-05-17 17:19:35.596201603 +0000 +@@ -0,0 +1 @@ ++printf_large_prec_for_g +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-17 17:17:28.600360192 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-05-17 17:19:35.596201603 +0000 +@@ -1 +1 @@ +-4.2.0-p8 ++4.2.0-p9 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-17 17:17:28.596360199 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-05-17 17:19:35.592201606 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p8" ++#define MPFR_VERSION_STRING "4.2.0-p9" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/vasprintf.c mpfr-4.2.0-b/src/vasprintf.c +--- mpfr-4.2.0-a/src/vasprintf.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/vasprintf.c 2023-05-17 17:19:35.576201620 +0000 +@@ -1888,7 +1888,7 @@ + precision T-1. + where T is the threshold computed below and X is the exponent + that would be displayed with style 'e' and precision T-1. */ +- int threshold; ++ mpfr_intmax_t threshold; + mpfr_exp_t x, e, k; + struct decimal_info dec_info; + +@@ -1920,9 +1920,15 @@ + e = e <= 0 ? k : (e + 2) / 3 + (k <= 0 ? 0 : k); + MPFR_ASSERTD (e >= 1); + ++ if (e > threshold) ++ e = threshold; ++ ++ /* error if e does not fit in size_t (for mpfr_get_str) */ ++ if (e > (size_t) -1) ++ goto error; ++ + dec_info.str = mpfr_get_str (NULL, &dec_info.exp, 10, +- e < threshold ? e : threshold, +- p, spec.rnd_mode); ++ e, p, spec.rnd_mode); + register_string (np->sl, dec_info.str); + /* mpfr_get_str corresponds to a significand between 0.1 and 1, + whereas here we want a significand between 1 and 10. */ +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-17 17:17:28.600360192 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-05-17 17:19:35.592201606 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p8"; ++ return "4.2.0-p9"; + } +diff -Naurd mpfr-4.2.0-a/tests/tsprintf.c mpfr-4.2.0-b/tests/tsprintf.c +--- mpfr-4.2.0-a/tests/tsprintf.c 2023-04-17 21:17:39.784645229 +0000 ++++ mpfr-4.2.0-b/tests/tsprintf.c 2023-05-17 17:19:35.576201620 +0000 +@@ -1620,6 +1620,30 @@ + mpfr_clear (x); + } + ++/* On 2023-03-22, on a 64-bit Linux machine (thus with 32-bit int), ++ the case %.2147483648Rg yields an incorrect size computation and ++ MPFR wants to allocate 18446744071562070545 bytes. With assertion ++ checking (--enable-assert), one gets: ++ vasprintf.c:1908: MPFR assertion failed: threshold >= 1 ++ ++ This case should either succeed or fail as reaching an environmental limit ++ like with glibc (note that the precision does not fit in an int). ++*/ ++static void ++large_prec_for_g (void) ++{ ++ mpfr_t x; ++ int r; ++ ++ mpfr_init2 (x, 128); ++ mpfr_set_ui (x, 1, MPFR_RNDN); ++ r = mpfr_snprintf (NULL, 0, "%.2147483647Rg\n", x); ++ MPFR_ASSERTN (r == 2); ++ r = mpfr_snprintf (NULL, 0, "%.2147483648Rg\n", x); ++ MPFR_ASSERTN (r == 2 || r < 0); ++ mpfr_clear (x); ++} ++ + #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) + + /* The following tests should be equivalent to those from test_locale() +@@ -1793,6 +1817,7 @@ + percent_n (); + mixed (); + check_length_overflow (); ++ large_prec_for_g (); + test_locale (); + + if (getenv ("MPFR_CHECK_LIBC_PRINTF")) diff --git a/mpfr.spec b/mpfr.spec index a858eac..c9bd94f 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr -Version: 4.1.1 -Release: 3%{?dist} +Version: 4.2.0 +Release: 1%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -13,7 +13,15 @@ BuildRequires: texinfo Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # Upstream post-release patches. This currently contains: -# - mpfr_custom_get_kind.patch +# - tsprintf-thousands.patch +# - ui_pow_ui-overflow.patch +# - multibyte-decimal_point.patch +# - rec_sqrt-zivloop.patch +# - reldiff.patch +# - tests-reuse.patch +# - pow_general.patch +# - compound.patch +# - printf_large_prec_for_g.patch Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches %description @@ -74,10 +82,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %files %license COPYING COPYING.LESSER -%{_pkgdocdir}/BUGS -%{_pkgdocdir}/ChangeLog %{_pkgdocdir}/NEWS -%{_pkgdocdir}/PATCHES %{_pkgdocdir}/README %{_libdir}/libmpfr.so.6* @@ -88,13 +93,20 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_libdir}/pkgconfig/mpfr.pc %files doc +%license COPYING COPYING.LESSER %{_pkgdocdir}/AUTHORS -%{_pkgdocdir}/examples +%{_pkgdocdir}/BUGS +%{_pkgdocdir}/ChangeLog %{_pkgdocdir}/FAQ.html +%{_pkgdocdir}/PATCHES %{_pkgdocdir}/TODO +%{_pkgdocdir}/examples %{_infodir}/mpfr.info* %changelog +* Wed Jul 12 2023 Jerry James - 4.2.0-1 +- Update to MPFR 4.2.0-p9 + * Thu Jan 19 2023 Fedora Release Engineering - 4.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index a05ee6e..19c885c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpfr-4.1.1.tar.xz) = be468749bd88870dec37be35e544983a8fb7bda638eb9414c37334b9d553099ea2aa067045f51ae2c8ab86d852ef833e18161d173e414af0928e9a438c9b91f1 +SHA512 (mpfr-4.2.0.tar.xz) = 58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c From 1d54b0b669031493b37fc623674f2d90d681a3b2 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 18 Jul 2023 15:09:15 -0600 Subject: [PATCH 32/43] Update to MPFR 4.2.0-p12 --- allpatches | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++ mpfr.spec | 8 ++- 2 files changed, 155 insertions(+), 1 deletion(-) diff --git a/allpatches b/allpatches index 07fcf25..7530495 100644 --- a/allpatches +++ b/allpatches @@ -2044,3 +2044,151 @@ diff -Naurd mpfr-4.2.0-a/tests/tsprintf.c mpfr-4.2.0-b/tests/tsprintf.c test_locale (); if (getenv ("MPFR_CHECK_LIBC_PRINTF")) +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-07-17 13:54:11.126789510 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-07-17 13:54:11.170788387 +0000 +@@ -0,0 +1 @@ ++gcc-pr106155-workaround +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-05-17 17:19:35.596201603 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-07-17 13:54:11.170788387 +0000 +@@ -1 +1 @@ +-4.2.0-p9 ++4.2.0-p10 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-05-17 17:19:35.592201606 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-07-17 13:54:11.170788387 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p9" ++#define MPFR_VERSION_STRING "4.2.0-p10" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-05-17 17:19:35.592201606 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-07-17 13:54:11.170788387 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p9"; ++ return "4.2.0-p10"; + } +diff -Naurd mpfr-4.2.0-a/tests/tfpif.c mpfr-4.2.0-b/tests/tfpif.c +--- mpfr-4.2.0-a/tests/tfpif.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/tests/tfpif.c 2023-07-17 13:54:11.162788591 +0000 +@@ -277,7 +277,10 @@ + + for (i = 0; i < BAD; i++) + { +- mpfr_exp_t emax; ++ mpfr_exp_t INITIALIZED(emax); ++ /* The INITIALIZED() is a workaround for GCC bug 106155: ++ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=106155 */ ++ + /* For i == 6, mpfr_prec_t needs at least a 65-bit precision + (64 value bits + 1 sign bit) to avoid a failure. */ + if (i == 6 && MPFR_PREC_BITS > 64) +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-07-17 13:56:17.375566485 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-07-17 13:56:17.415565464 +0000 +@@ -0,0 +1 @@ ++inp_str-nullchar +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-07-17 13:54:11.170788387 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-07-17 13:56:17.415565464 +0000 +@@ -1 +1 @@ +-4.2.0-p10 ++4.2.0-p11 +diff -Naurd mpfr-4.2.0-a/src/inp_str.c mpfr-4.2.0-b/src/inp_str.c +--- mpfr-4.2.0-a/src/inp_str.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/inp_str.c 2023-07-17 13:56:17.407565669 +0000 +@@ -69,6 +69,15 @@ + if (c == EOF || isspace (c)) + break; + str[str_size++] = (unsigned char) c; ++ /* If c is '\0' (while not being a whitespace character), the word will ++ not have a valid format. But in the context of a string in memory, ++ '\0' is a terminating null character. So, to avoid ending with a ++ valid string format (like "1" with ignored characters after the ++ terminating null character), we need to make sure that the string ++ does not have a valid format; so let's start it with '*'. Note ++ that we should read the full word, so we cannot break. */ ++ if (MPFR_UNLIKELY (c == '\0')) ++ str[0] = '*'; + if (str_size == (size_t) -1) + break; + c = getc (stream); +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-07-17 13:54:11.170788387 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-07-17 13:56:17.411565566 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p10" ++#define MPFR_VERSION_STRING "4.2.0-p11" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-07-17 13:54:11.170788387 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-07-17 13:56:17.415565464 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p10"; ++ return "4.2.0-p11"; + } +diff -Naurd mpfr-4.2.0-a/PATCHES mpfr-4.2.0-b/PATCHES +--- mpfr-4.2.0-a/PATCHES 2023-07-17 13:57:28.913739912 +0000 ++++ mpfr-4.2.0-b/PATCHES 2023-07-17 13:57:28.961738687 +0000 +@@ -0,0 +1 @@ ++strtofr-nullchar +diff -Naurd mpfr-4.2.0-a/VERSION mpfr-4.2.0-b/VERSION +--- mpfr-4.2.0-a/VERSION 2023-07-17 13:56:17.415565464 +0000 ++++ mpfr-4.2.0-b/VERSION 2023-07-17 13:57:28.961738687 +0000 +@@ -1 +1 @@ +-4.2.0-p11 ++4.2.0-p12 +diff -Naurd mpfr-4.2.0-a/src/mpfr.h mpfr-4.2.0-b/src/mpfr.h +--- mpfr-4.2.0-a/src/mpfr.h 2023-07-17 13:56:17.411565566 +0000 ++++ mpfr-4.2.0-b/src/mpfr.h 2023-07-17 13:57:28.957738789 +0000 +@@ -27,7 +27,7 @@ + #define MPFR_VERSION_MAJOR 4 + #define MPFR_VERSION_MINOR 2 + #define MPFR_VERSION_PATCHLEVEL 0 +-#define MPFR_VERSION_STRING "4.2.0-p11" ++#define MPFR_VERSION_STRING "4.2.0-p12" + + /* User macros: + MPFR_USE_FILE: Define it to make MPFR define functions dealing +diff -Naurd mpfr-4.2.0-a/src/strtofr.c mpfr-4.2.0-b/src/strtofr.c +--- mpfr-4.2.0-a/src/strtofr.c 2023-01-05 17:09:48.000000000 +0000 ++++ mpfr-4.2.0-b/src/strtofr.c 2023-07-17 13:57:28.949738993 +0000 +@@ -242,7 +242,10 @@ + pstr->mantissa = NULL; + + /* Optional leading whitespace */ +- while (isspace((unsigned char) *str)) str++; ++ /* For non-"C" locales, the ISO C standard allows isspace(0) to ++ return true. So we need to stop explicitly on '\0'. */ ++ while (*str != '\0' && isspace ((unsigned char) *str)) ++ str++; + + /* An optional sign `+' or `-' */ + pstr->negative = (*str == '-'); +diff -Naurd mpfr-4.2.0-a/src/version.c mpfr-4.2.0-b/src/version.c +--- mpfr-4.2.0-a/src/version.c 2023-07-17 13:56:17.415565464 +0000 ++++ mpfr-4.2.0-b/src/version.c 2023-07-17 13:57:28.961738687 +0000 +@@ -25,5 +25,5 @@ + const char * + mpfr_get_version (void) + { +- return "4.2.0-p11"; ++ return "4.2.0-p12"; + } diff --git a/mpfr.spec b/mpfr.spec index c9bd94f..616289e 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -22,6 +22,9 @@ Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # - pow_general.patch # - compound.patch # - printf_large_prec_for_g.patch +# - gcc-pr106155-workaround.patch +# - inp_str-nullchar.patch +# - strtofr-nullchar.patch Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches %description @@ -104,6 +107,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Tue Jul 18 2023 Jerry James - 4.2.0-2 +- Update to MPFR 4.2.0-p12 + * Wed Jul 12 2023 Jerry James - 4.2.0-1 - Update to MPFR 4.2.0-p9 From af7310239ede6a3b7e7b9cd6a77aa673c6c0751e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:53:43 +0000 Subject: [PATCH 33/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 616289e..f6313d0 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -107,6 +107,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 4.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 18 2023 Jerry James - 4.2.0-2 - Update to MPFR 4.2.0-p12 From c7d501bb84df408dca0477ead9f9f2e3611fbeb0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 4 Oct 2023 20:32:47 -0600 Subject: [PATCH 34/43] Update to MPFR 4.2.1 --- mpfr.spec | 21 ++++++--------------- sources | 2 +- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/mpfr.spec b/mpfr.spec index f6313d0..fbb5da5 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr -Version: 4.2.0 -Release: 3%{?dist} +Version: 4.2.1 +Release: 1%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -13,19 +13,7 @@ BuildRequires: texinfo Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # Upstream post-release patches. This currently contains: -# - tsprintf-thousands.patch -# - ui_pow_ui-overflow.patch -# - multibyte-decimal_point.patch -# - rec_sqrt-zivloop.patch -# - reldiff.patch -# - tests-reuse.patch -# - pow_general.patch -# - compound.patch -# - printf_large_prec_for_g.patch -# - gcc-pr106155-workaround.patch -# - inp_str-nullchar.patch -# - strtofr-nullchar.patch -Patch0: https://www.mpfr.org/%{name}-%{version}/allpatches +#Patch0: https://www.mpfr.org/%%{name}-%%{version}/allpatches %description The MPFR library is a C library for multiple-precision floating-point @@ -107,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Wed Oct 4 2023 Jerry James - 4.2.1-1 +- Update to MPFR 4.2.1 + * Thu Jul 20 2023 Fedora Release Engineering - 4.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 19c885c..3e69b9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpfr-4.2.0.tar.xz) = 58e843125884ca58837ae5159cd4092af09e8f21931a2efd19c15de057c9d1dc0753ae95c592e2ce59a727fbc491af776db8b00a055320413cdcf2033b90505c +SHA512 (mpfr-4.2.1.tar.xz) = bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475 From d1f3ce8df483a3fa4a7e6ca6597b35c860bb000f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:44:44 +0000 Subject: [PATCH 35/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index fbb5da5..841ba86 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -95,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 4.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Oct 4 2023 Jerry James - 4.2.1-1 - Update to MPFR 4.2.1 From 5922b52bac87b4daa294fa5898ec79ee67b17d28 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:11:28 +0000 Subject: [PATCH 36/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 841ba86..c6018a6 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.1 -Release: 2%{?dist} +Release: 3%{?dist} URL: https://www.mpfr.org/ License: LGPL-3.0-or-later @@ -95,6 +95,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 4.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 4.2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 45cb3e8d14427f36952a17f37ecd153c1830da7c Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 May 2024 09:25:19 -0600 Subject: [PATCH 37/43] Own the documentation directory (bz 2279758) --- mpfr.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index c6018a6..6fac8d9 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,8 +1,9 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.1 -Release: 3%{?dist} +Release: 4%{?dist} URL: https://www.mpfr.org/ +VCS: https://gitlab.inria.fr/mpfr/mpfr License: LGPL-3.0-or-later BuildRequires: gcc @@ -73,6 +74,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %files %license COPYING COPYING.LESSER +%dir %{_pkgdocdir} %{_pkgdocdir}/NEWS %{_pkgdocdir}/README %{_libdir}/libmpfr.so.6* @@ -95,6 +97,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu May 9 2024 Jerry James - 4.2.1-4 +- Own the documentation directory (bz 2279758) + * Thu Jan 25 2024 Fedora Release Engineering - 4.2.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0cf369ae90fac1f2751c493b6c32c960d65c893f Mon Sep 17 00:00:00 2001 From: Jerry James Date: Wed, 17 Jul 2024 09:55:08 -0600 Subject: [PATCH 38/43] Fix the VCS field - Fix doc subpackage directory ownership issue --- mpfr.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mpfr.spec b/mpfr.spec index 6fac8d9..feb8980 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -3,7 +3,7 @@ Name: mpfr Version: 4.2.1 Release: 4%{?dist} URL: https://www.mpfr.org/ -VCS: https://gitlab.inria.fr/mpfr/mpfr +VCS: git:https://gitlab.inria.fr/mpfr/mpfr.git License: LGPL-3.0-or-later BuildRequires: gcc @@ -11,7 +11,7 @@ BuildRequires: gmp-devel BuildRequires: make BuildRequires: texinfo -Source0: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz +Source: https://www.mpfr.org/%{name}-%{version}/%{name}-%{version}.tar.xz # Upstream post-release patches. This currently contains: #Patch0: https://www.mpfr.org/%%{name}-%%{version}/allpatches @@ -87,6 +87,7 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %files doc %license COPYING COPYING.LESSER +%dir %{_pkgdocdir} %{_pkgdocdir}/AUTHORS %{_pkgdocdir}/BUGS %{_pkgdocdir}/ChangeLog From 62bd2cdcc23b1a355ddcb839a66eaf8955585547 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:45:32 +0000 Subject: [PATCH 39/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index feb8980..4ab4009 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.1 -Release: 4%{?dist} +Release: 5%{?dist} URL: https://www.mpfr.org/ VCS: git:https://gitlab.inria.fr/mpfr/mpfr.git @@ -98,6 +98,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 4.2.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu May 9 2024 Jerry James - 4.2.1-4 - Own the documentation directory (bz 2279758) From ec4720d961ff13ed28be63a607ffe252919b46f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:13:16 +0000 Subject: [PATCH 40/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 4ab4009..b82c547 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.1 -Release: 5%{?dist} +Release: 6%{?dist} URL: https://www.mpfr.org/ VCS: git:https://gitlab.inria.fr/mpfr/mpfr.git @@ -98,6 +98,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 4.2.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 4.2.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d9e96fd5fb057d5f894d5e5eddf0e59e18f032e0 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 20 Mar 2025 11:24:02 -0600 Subject: [PATCH 41/43] Update to MPFR 4.2.2 --- mpfr.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mpfr.spec b/mpfr.spec index b82c547..87247b8 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr -Version: 4.2.1 -Release: 6%{?dist} +Version: 4.2.2 +Release: 1%{?dist} URL: https://www.mpfr.org/ VCS: git:https://gitlab.inria.fr/mpfr/mpfr.git @@ -98,6 +98,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Mar 20 2025 Jerry James - 4.2.2-1 +- Update to MPFR 4.2.2 + * Fri Jan 17 2025 Fedora Release Engineering - 4.2.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 3e69b9e..9786c30 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mpfr-4.2.1.tar.xz) = bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475 +SHA512 (mpfr-4.2.2.tar.xz) = eb9e7f51b5385fb349cc4fba3a45ffdf0dd53be6dfc74932dc01258158a10514667960c530c47dd9dfc5aa18be2bd94859d80499844c5713710581e6ac6259a9 From 830dbbe0e00a3bce4fb88469b8afb0046bb9163f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Zaoral?= Date: Tue, 24 Jun 2025 15:09:24 +0200 Subject: [PATCH 42/43] tests: migrate STI tests to TMT --- .fmf/version | 1 + plans/ci.fmf | 5 ++++ tests/silvester-number/main.fmf | 6 +++++ tests/silvester-number/test.sh | 10 +++++++ tests/tests.yml | 46 --------------------------------- 5 files changed, 22 insertions(+), 46 deletions(-) create mode 100644 .fmf/version create mode 100644 plans/ci.fmf create mode 100644 tests/silvester-number/main.fmf create mode 100755 tests/silvester-number/test.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/ci.fmf b/plans/ci.fmf new file mode 100644 index 0000000..c1627f9 --- /dev/null +++ b/plans/ci.fmf @@ -0,0 +1,5 @@ +summary: Basic smoke test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/silvester-number/main.fmf b/tests/silvester-number/main.fmf new file mode 100644 index 0000000..919dffd --- /dev/null +++ b/tests/silvester-number/main.fmf @@ -0,0 +1,6 @@ +summary: Calculate Silvester Number +framework: shell +test: ./test.sh +component: mpfr +recommends: + - gawk diff --git a/tests/silvester-number/test.sh b/tests/silvester-number/test.sh new file mode 100755 index 0000000..d46c907 --- /dev/null +++ b/tests/silvester-number/test.sh @@ -0,0 +1,10 @@ +#!/bin/sh -eux + +OUT="$(gawk -M 'BEGIN { + s = 2 + for (i = 1; i <= 7; i++) + s = s * (s - 1) + 1 + print s +}')" + +test "$OUT" = "113423713055421844361000443" diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index dd32ccf..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,46 +0,0 @@ -- hosts: all - vars: - - ansible_python_interpreter: /usr/bin/python3 - - artifacts: ./artifacts - tags: - - classic - - container - - atomic - tasks: - - name: create artifacts - file: - path: "{{ artifacts }}" - state: directory - delegate_to: localhost - - - name: do it all - block: - - name: calculate Silvester number - command: | - gawk -M 'BEGIN { - s = 2 - for (i = 1; i <= 7; i++) - s = s * (s - 1) + 1 - print s - }' - register: silvester - - - name: verify Silvester number - fail: - when: silvester.stdout != '113423713055421844361000443' - - always: - - name: write log - copy: - content: | - stderr: - {{ silvester.stderr }} - stdout: - {{ silvester.stdout }} - dest: "{{ artifacts }}/test.log" - delegate_to: localhost - -# fetch: -# dest: "{{ artifacts }}/" -# src: "/tmp/test.log" -# flat: yes From ebdaaedf86e2a22913d26995ac27c9d1e45cd406 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:24:07 +0000 Subject: [PATCH 43/43] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mpfr.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mpfr.spec b/mpfr.spec index 87247b8..68ad652 100644 --- a/mpfr.spec +++ b/mpfr.spec @@ -1,7 +1,7 @@ Summary: C library for multiple-precision floating-point computations Name: mpfr Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://www.mpfr.org/ VCS: git:https://gitlab.inria.fr/mpfr/mpfr.git @@ -98,6 +98,9 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir} %{_infodir}/mpfr.info* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 4.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Mar 20 2025 Jerry James - 4.2.2-1 - Update to MPFR 4.2.2