[arch-commits] Commit in mpfr/repos (3 files)
Jan Steffens
heftig at archlinux.org
Thu Jan 18 20:39:40 UTC 2018
Date: Thursday, January 18, 2018 @ 20:39:38
Author: heftig
Revision: 315101
archrelease: copy trunk to staging-x86_64
Added:
mpfr/repos/staging-x86_64/
mpfr/repos/staging-x86_64/PKGBUILD
(from rev 315100, mpfr/trunk/PKGBUILD)
mpfr/repos/staging-x86_64/mpfr-3.1.6-p1.patch
(from rev 315100, mpfr/trunk/mpfr-3.1.6-p1.patch)
---------------------+
PKGBUILD | 43 +++++++
mpfr-3.1.6-p1.patch | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 328 insertions(+)
Copied: mpfr/repos/staging-x86_64/PKGBUILD (from rev 315100, mpfr/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2018-01-18 20:39:38 UTC (rev 315101)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=mpfr
+_pkgver=4.0.0
+#_patchlevel=p1
+#pkgver=${_pkgver}.${_patchlevel}
+pkgver=${_pkgver}
+pkgrel=1
+pkgdesc="Multiple-precision floating-point library"
+arch=('x86_64')
+url="http://www.mpfr.org/"
+license=('LGPL')
+depends=('gmp>=5.0')
+source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
+ #mpfr-${_pkgver}-${_patchlevel}.patch
+ )
+
+sha256sums=('fbe2cd1418b321f5c899ce4f0f0f4e73f5ecc7d02145b0e1fd096f5c3afb8a1d'
+ 'SKIP')
+validpgpkeys=('07F3DBBECC1A39605078094D980C197698C3739D')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ #patch -p1 -i $srcdir/mpfr-${_pkgver}-${_patchlevel}.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ ./configure --prefix=/usr --enable-thread-safe --enable-shared
+ make
+}
+
+check() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ make check
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${_pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: mpfr/repos/staging-x86_64/mpfr-3.1.6-p1.patch (from rev 315100, mpfr/trunk/mpfr-3.1.6-p1.patch)
===================================================================
--- staging-x86_64/mpfr-3.1.6-p1.patch (rev 0)
+++ staging-x86_64/mpfr-3.1.6-p1.patch 2018-01-18 20:39:38 UTC (rev 315101)
@@ -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";
+ }
More information about the arch-commits
mailing list