[arch-commits] Commit in mpfr/repos (7 files)
Allan McRae
allan at archlinux.org
Fri Jan 6 04:11:07 UTC 2017
Date: Friday, January 6, 2017 @ 04:11:06
Author: allan
Revision: 285325
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
mpfr/repos/testing-i686/
mpfr/repos/testing-i686/PKGBUILD
(from rev 285324, mpfr/trunk/PKGBUILD)
mpfr/repos/testing-i686/mpfr-3.1.5-p2.patch
(from rev 285324, mpfr/trunk/mpfr-3.1.5-p2.patch)
mpfr/repos/testing-x86_64/PKGBUILD
(from rev 285324, mpfr/trunk/PKGBUILD)
mpfr/repos/testing-x86_64/mpfr-3.1.5-p2.patch
(from rev 285324, mpfr/trunk/mpfr-3.1.5-p2.patch)
Deleted:
mpfr/repos/testing-x86_64/PKGBUILD
mpfr/repos/testing-x86_64/mpfr-3.1.5-p2.patch
------------------------------------+
/PKGBUILD | 42 ++++++++
/mpfr-3.1.5-p2.patch | 174 +++++++++++++++++++++++++++++++++++
testing-i686/PKGBUILD | 42 ++++++++
testing-i686/mpfr-3.1.5-p2.patch | 174 +++++++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 42 --------
testing-x86_64/mpfr-3.1.5-p2.patch | 174 -----------------------------------
6 files changed, 432 insertions(+), 216 deletions(-)
Copied: mpfr/repos/testing-i686/PKGBUILD (from rev 285324, mpfr/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-01-06 04:11:06 UTC (rev 285325)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=mpfr
+_pkgver=3.1.5
+_patchlevel=p2
+pkgver=${_pkgver}.${_patchlevel}
+#pkgver=${_pkgver}
+pkgrel=1
+pkgdesc="Multiple-precision floating-point library"
+arch=('i686' '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)
+md5sums=('c4ac246cf9795a4491e7766002cd528f'
+ 'SKIP'
+ 'f388b7983bf69e2bfd3216426c89954c')
+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/testing-i686/mpfr-3.1.5-p2.patch (from rev 285324, mpfr/trunk/mpfr-3.1.5-p2.patch)
===================================================================
--- testing-i686/mpfr-3.1.5-p2.patch (rev 0)
+++ testing-i686/mpfr-3.1.5-p2.patch 2017-01-06 04:11:06 UTC (rev 285325)
@@ -0,0 +1,174 @@
+diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES
+--- mpfr-3.1.5-a/PATCHES 2016-12-15 08:35:46.476430238 +0000
++++ mpfr-3.1.5-b/PATCHES 2016-12-15 08:35:46.544430346 +0000
+@@ -0,0 +1 @@
++vasprintf
+diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION
+--- mpfr-3.1.5-a/VERSION 2016-09-27 07:58:14.000000000 +0000
++++ mpfr-3.1.5-b/VERSION 2016-12-15 08:35:46.544430346 +0000
+@@ -1 +1 @@
+-3.1.5
++3.1.5-p1
+diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h
+--- mpfr-3.1.5-a/src/mpfr.h 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 5
+-#define MPFR_VERSION_STRING "3.1.5"
++#define MPFR_VERSION_STRING "3.1.5-p1"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.5-a/src/vasprintf.c mpfr-3.1.5-b/src/vasprintf.c
+--- mpfr-3.1.5-a/src/vasprintf.c 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/vasprintf.c 2016-12-15 08:35:46.520430308 +0000
+@@ -1593,7 +1593,7 @@
+ }
+ else if (spec.spec == 'f' || spec.spec == 'F')
+ {
+- if (spec.prec == -1)
++ if (spec.prec < 0)
+ spec.prec = 6;
+ if (regular_fg (np, p, spec, NULL) == -1)
+ goto error;
+diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c
+--- mpfr-3.1.5-a/src/version.c 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/version.c 2016-12-15 08:35:46.544430346 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.5";
++ return "3.1.5-p1";
+ }
+diff -Naurd mpfr-3.1.5-a/tests/tsprintf.c mpfr-3.1.5-b/tests/tsprintf.c
+--- mpfr-3.1.5-a/tests/tsprintf.c 2016-09-27 07:58:14.000000000 +0000
++++ mpfr-3.1.5-b/tests/tsprintf.c 2016-12-15 08:35:46.520430308 +0000
+@@ -1251,6 +1251,25 @@
+ check_emin_aux (MPFR_EMIN_MIN);
+ }
+
++static void
++test20161214 (void)
++{
++ mpfr_t x;
++ char buf[32];
++ const char s[] = "0x0.fffffffffffff8p+1024";
++ int r;
++
++ mpfr_init2 (x, 64);
++ mpfr_set_str (x, s, 16, MPFR_RNDN);
++ r = mpfr_snprintf (buf, 32, "%.*RDf", -2, x);
++ MPFR_ASSERTN(r == 316);
++ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN + 1, x);
++ MPFR_ASSERTN(r == 316);
++ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN, x);
++ MPFR_ASSERTN(r == 316);
++ mpfr_clear (x);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -1271,6 +1290,7 @@
+ mixed ();
+ check_emax ();
+ check_emin ();
++ test20161214 ();
+
+ #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
+ #if MPFR_LCONV_DPTS
+diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES
+--- mpfr-3.1.5-a/PATCHES 2016-12-19 22:11:17.022676737 +0000
++++ mpfr-3.1.5-b/PATCHES 2016-12-19 22:11:17.094676820 +0000
+@@ -0,0 +1 @@
++strtofr
+diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION
+--- mpfr-3.1.5-a/VERSION 2016-12-15 08:35:46.544430346 +0000
++++ mpfr-3.1.5-b/VERSION 2016-12-19 22:11:17.094676820 +0000
+@@ -1 +1 @@
+-3.1.5-p1
++3.1.5-p2
+diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h
+--- mpfr-3.1.5-a/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000
++++ mpfr-3.1.5-b/src/mpfr.h 2016-12-19 22:11:17.090676815 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 5
+-#define MPFR_VERSION_STRING "3.1.5-p1"
++#define MPFR_VERSION_STRING "3.1.5-p2"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.5-a/src/strtofr.c mpfr-3.1.5-b/src/strtofr.c
+--- mpfr-3.1.5-a/src/strtofr.c 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/strtofr.c 2016-12-19 22:11:17.066676788 +0000
+@@ -743,11 +743,14 @@
+ of the pstr_size most significant digits of pstr->mant, with
+ equality in case exact is non-zero. */
+
+- /* test if rounding is possible, and if so exit the loop */
+- if (exact || mpfr_can_round_raw (result, ysize,
+- (pstr->negative) ? -1 : 1,
+- ysize_bits - err - 1,
+- MPFR_RNDN, rnd, MPFR_PREC(x)))
++ /* test if rounding is possible, and if so exit the loop.
++ Note: we also need to be able to determine the correct ternary value,
++ thus we use the MPFR_PREC(x) + (rnd == MPFR_RNDN) trick.
++ For example if result = xxx...xxx111...111 and rnd = RNDN,
++ then we know the correct rounding is xxx...xx(x+1), but we cannot know
++ the correct ternary value. */
++ if (exact || mpfr_round_p (result, ysize, ysize_bits - err - 1,
++ MPFR_PREC(x) + (rnd == MPFR_RNDN)))
+ break;
+
+ next_loop:
+diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c
+--- mpfr-3.1.5-a/src/version.c 2016-12-15 08:35:46.544430346 +0000
++++ mpfr-3.1.5-b/src/version.c 2016-12-19 22:11:17.094676820 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.5-p1";
++ return "3.1.5-p2";
+ }
+diff -Naurd mpfr-3.1.5-a/tests/tstrtofr.c mpfr-3.1.5-b/tests/tstrtofr.c
+--- mpfr-3.1.5-a/tests/tstrtofr.c 2016-09-27 07:58:14.000000000 +0000
++++ mpfr-3.1.5-b/tests/tstrtofr.c 2016-12-19 22:11:17.066676788 +0000
+@@ -1191,6 +1191,24 @@
+ mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
+ }
+
++/* Note: the number is 5^47/2^9. */
++static void
++bug20161217 (void)
++{
++ mpfr_t fp, z;
++ static const char * num = "0.1387778780781445675529539585113525390625e31";
++ int inex;
++
++ mpfr_init2 (fp, 110);
++ mpfr_init2 (z, 110);
++ inex = mpfr_strtofr (fp, num, NULL, 10, MPFR_RNDN);
++ MPFR_ASSERTN(inex == 0);
++ mpfr_set_str_binary (z, "10001100001000010011110110011101101001010000001011011110010001010100010100100110111101000010001011001100001101E-9");
++ MPFR_ASSERTN(mpfr_equal_p (fp, z));
++ mpfr_clear (fp);
++ mpfr_clear (z);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -1205,6 +1223,7 @@
+ test20100310 ();
+ bug20120814 ();
+ bug20120829 ();
++ bug20161217 ();
+
+ tests_end_mpfr ();
+ return 0;
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-01-06 04:05:49 UTC (rev 285324)
+++ testing-x86_64/PKGBUILD 2017-01-06 04:11:06 UTC (rev 285325)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=mpfr
-_pkgver=3.1.5
-_patchlevel=p2
-pkgver=${_pkgver}.${_patchlevel}
-#pkgver=${_pkgver}
-pkgrel=1
-pkgdesc="Multiple-precision floating-point library"
-arch=('i686' '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)
-md5sums=('c4ac246cf9795a4491e7766002cd528f'
- 'SKIP'
- 'f388b7983bf69e2bfd3216426c89954c')
-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/testing-x86_64/PKGBUILD (from rev 285324, mpfr/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-01-06 04:11:06 UTC (rev 285325)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=mpfr
+_pkgver=3.1.5
+_patchlevel=p2
+pkgver=${_pkgver}.${_patchlevel}
+#pkgver=${_pkgver}
+pkgrel=1
+pkgdesc="Multiple-precision floating-point library"
+arch=('i686' '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)
+md5sums=('c4ac246cf9795a4491e7766002cd528f'
+ 'SKIP'
+ 'f388b7983bf69e2bfd3216426c89954c')
+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
+}
Deleted: testing-x86_64/mpfr-3.1.5-p2.patch
===================================================================
--- testing-x86_64/mpfr-3.1.5-p2.patch 2017-01-06 04:05:49 UTC (rev 285324)
+++ testing-x86_64/mpfr-3.1.5-p2.patch 2017-01-06 04:11:06 UTC (rev 285325)
@@ -1,174 +0,0 @@
-diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES
---- mpfr-3.1.5-a/PATCHES 2016-12-15 08:35:46.476430238 +0000
-+++ mpfr-3.1.5-b/PATCHES 2016-12-15 08:35:46.544430346 +0000
-@@ -0,0 +1 @@
-+vasprintf
-diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION
---- mpfr-3.1.5-a/VERSION 2016-09-27 07:58:14.000000000 +0000
-+++ mpfr-3.1.5-b/VERSION 2016-12-15 08:35:46.544430346 +0000
-@@ -1 +1 @@
--3.1.5
-+3.1.5-p1
-diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h
---- mpfr-3.1.5-a/src/mpfr.h 2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5-b/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 5
--#define MPFR_VERSION_STRING "3.1.5"
-+#define MPFR_VERSION_STRING "3.1.5-p1"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.5-a/src/vasprintf.c mpfr-3.1.5-b/src/vasprintf.c
---- mpfr-3.1.5-a/src/vasprintf.c 2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5-b/src/vasprintf.c 2016-12-15 08:35:46.520430308 +0000
-@@ -1593,7 +1593,7 @@
- }
- else if (spec.spec == 'f' || spec.spec == 'F')
- {
-- if (spec.prec == -1)
-+ if (spec.prec < 0)
- spec.prec = 6;
- if (regular_fg (np, p, spec, NULL) == -1)
- goto error;
-diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c
---- mpfr-3.1.5-a/src/version.c 2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5-b/src/version.c 2016-12-15 08:35:46.544430346 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.5";
-+ return "3.1.5-p1";
- }
-diff -Naurd mpfr-3.1.5-a/tests/tsprintf.c mpfr-3.1.5-b/tests/tsprintf.c
---- mpfr-3.1.5-a/tests/tsprintf.c 2016-09-27 07:58:14.000000000 +0000
-+++ mpfr-3.1.5-b/tests/tsprintf.c 2016-12-15 08:35:46.520430308 +0000
-@@ -1251,6 +1251,25 @@
- check_emin_aux (MPFR_EMIN_MIN);
- }
-
-+static void
-+test20161214 (void)
-+{
-+ mpfr_t x;
-+ char buf[32];
-+ const char s[] = "0x0.fffffffffffff8p+1024";
-+ int r;
-+
-+ mpfr_init2 (x, 64);
-+ mpfr_set_str (x, s, 16, MPFR_RNDN);
-+ r = mpfr_snprintf (buf, 32, "%.*RDf", -2, x);
-+ MPFR_ASSERTN(r == 316);
-+ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN + 1, x);
-+ MPFR_ASSERTN(r == 316);
-+ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN, x);
-+ MPFR_ASSERTN(r == 316);
-+ mpfr_clear (x);
-+}
-+
- int
- main (int argc, char **argv)
- {
-@@ -1271,6 +1290,7 @@
- mixed ();
- check_emax ();
- check_emin ();
-+ test20161214 ();
-
- #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
- #if MPFR_LCONV_DPTS
-diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES
---- mpfr-3.1.5-a/PATCHES 2016-12-19 22:11:17.022676737 +0000
-+++ mpfr-3.1.5-b/PATCHES 2016-12-19 22:11:17.094676820 +0000
-@@ -0,0 +1 @@
-+strtofr
-diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION
---- mpfr-3.1.5-a/VERSION 2016-12-15 08:35:46.544430346 +0000
-+++ mpfr-3.1.5-b/VERSION 2016-12-19 22:11:17.094676820 +0000
-@@ -1 +1 @@
--3.1.5-p1
-+3.1.5-p2
-diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h
---- mpfr-3.1.5-a/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000
-+++ mpfr-3.1.5-b/src/mpfr.h 2016-12-19 22:11:17.090676815 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 3
- #define MPFR_VERSION_MINOR 1
- #define MPFR_VERSION_PATCHLEVEL 5
--#define MPFR_VERSION_STRING "3.1.5-p1"
-+#define MPFR_VERSION_STRING "3.1.5-p2"
-
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-3.1.5-a/src/strtofr.c mpfr-3.1.5-b/src/strtofr.c
---- mpfr-3.1.5-a/src/strtofr.c 2016-09-27 07:58:15.000000000 +0000
-+++ mpfr-3.1.5-b/src/strtofr.c 2016-12-19 22:11:17.066676788 +0000
-@@ -743,11 +743,14 @@
- of the pstr_size most significant digits of pstr->mant, with
- equality in case exact is non-zero. */
-
-- /* test if rounding is possible, and if so exit the loop */
-- if (exact || mpfr_can_round_raw (result, ysize,
-- (pstr->negative) ? -1 : 1,
-- ysize_bits - err - 1,
-- MPFR_RNDN, rnd, MPFR_PREC(x)))
-+ /* test if rounding is possible, and if so exit the loop.
-+ Note: we also need to be able to determine the correct ternary value,
-+ thus we use the MPFR_PREC(x) + (rnd == MPFR_RNDN) trick.
-+ For example if result = xxx...xxx111...111 and rnd = RNDN,
-+ then we know the correct rounding is xxx...xx(x+1), but we cannot know
-+ the correct ternary value. */
-+ if (exact || mpfr_round_p (result, ysize, ysize_bits - err - 1,
-+ MPFR_PREC(x) + (rnd == MPFR_RNDN)))
- break;
-
- next_loop:
-diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c
---- mpfr-3.1.5-a/src/version.c 2016-12-15 08:35:46.544430346 +0000
-+++ mpfr-3.1.5-b/src/version.c 2016-12-19 22:11:17.094676820 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
-- return "3.1.5-p1";
-+ return "3.1.5-p2";
- }
-diff -Naurd mpfr-3.1.5-a/tests/tstrtofr.c mpfr-3.1.5-b/tests/tstrtofr.c
---- mpfr-3.1.5-a/tests/tstrtofr.c 2016-09-27 07:58:14.000000000 +0000
-+++ mpfr-3.1.5-b/tests/tstrtofr.c 2016-12-19 22:11:17.066676788 +0000
-@@ -1191,6 +1191,24 @@
- mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
- }
-
-+/* Note: the number is 5^47/2^9. */
-+static void
-+bug20161217 (void)
-+{
-+ mpfr_t fp, z;
-+ static const char * num = "0.1387778780781445675529539585113525390625e31";
-+ int inex;
-+
-+ mpfr_init2 (fp, 110);
-+ mpfr_init2 (z, 110);
-+ inex = mpfr_strtofr (fp, num, NULL, 10, MPFR_RNDN);
-+ MPFR_ASSERTN(inex == 0);
-+ mpfr_set_str_binary (z, "10001100001000010011110110011101101001010000001011011110010001010100010100100110111101000010001011001100001101E-9");
-+ MPFR_ASSERTN(mpfr_equal_p (fp, z));
-+ mpfr_clear (fp);
-+ mpfr_clear (z);
-+}
-+
- int
- main (int argc, char *argv[])
- {
-@@ -1205,6 +1223,7 @@
- test20100310 ();
- bug20120814 ();
- bug20120829 ();
-+ bug20161217 ();
-
- tests_end_mpfr ();
- return 0;
Copied: mpfr/repos/testing-x86_64/mpfr-3.1.5-p2.patch (from rev 285324, mpfr/trunk/mpfr-3.1.5-p2.patch)
===================================================================
--- testing-x86_64/mpfr-3.1.5-p2.patch (rev 0)
+++ testing-x86_64/mpfr-3.1.5-p2.patch 2017-01-06 04:11:06 UTC (rev 285325)
@@ -0,0 +1,174 @@
+diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES
+--- mpfr-3.1.5-a/PATCHES 2016-12-15 08:35:46.476430238 +0000
++++ mpfr-3.1.5-b/PATCHES 2016-12-15 08:35:46.544430346 +0000
+@@ -0,0 +1 @@
++vasprintf
+diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION
+--- mpfr-3.1.5-a/VERSION 2016-09-27 07:58:14.000000000 +0000
++++ mpfr-3.1.5-b/VERSION 2016-12-15 08:35:46.544430346 +0000
+@@ -1 +1 @@
+-3.1.5
++3.1.5-p1
+diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h
+--- mpfr-3.1.5-a/src/mpfr.h 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 5
+-#define MPFR_VERSION_STRING "3.1.5"
++#define MPFR_VERSION_STRING "3.1.5-p1"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.5-a/src/vasprintf.c mpfr-3.1.5-b/src/vasprintf.c
+--- mpfr-3.1.5-a/src/vasprintf.c 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/vasprintf.c 2016-12-15 08:35:46.520430308 +0000
+@@ -1593,7 +1593,7 @@
+ }
+ else if (spec.spec == 'f' || spec.spec == 'F')
+ {
+- if (spec.prec == -1)
++ if (spec.prec < 0)
+ spec.prec = 6;
+ if (regular_fg (np, p, spec, NULL) == -1)
+ goto error;
+diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c
+--- mpfr-3.1.5-a/src/version.c 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/version.c 2016-12-15 08:35:46.544430346 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.5";
++ return "3.1.5-p1";
+ }
+diff -Naurd mpfr-3.1.5-a/tests/tsprintf.c mpfr-3.1.5-b/tests/tsprintf.c
+--- mpfr-3.1.5-a/tests/tsprintf.c 2016-09-27 07:58:14.000000000 +0000
++++ mpfr-3.1.5-b/tests/tsprintf.c 2016-12-15 08:35:46.520430308 +0000
+@@ -1251,6 +1251,25 @@
+ check_emin_aux (MPFR_EMIN_MIN);
+ }
+
++static void
++test20161214 (void)
++{
++ mpfr_t x;
++ char buf[32];
++ const char s[] = "0x0.fffffffffffff8p+1024";
++ int r;
++
++ mpfr_init2 (x, 64);
++ mpfr_set_str (x, s, 16, MPFR_RNDN);
++ r = mpfr_snprintf (buf, 32, "%.*RDf", -2, x);
++ MPFR_ASSERTN(r == 316);
++ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN + 1, x);
++ MPFR_ASSERTN(r == 316);
++ r = mpfr_snprintf (buf, 32, "%.*RDf", INT_MIN, x);
++ MPFR_ASSERTN(r == 316);
++ mpfr_clear (x);
++}
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -1271,6 +1290,7 @@
+ mixed ();
+ check_emax ();
+ check_emin ();
++ test20161214 ();
+
+ #if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE)
+ #if MPFR_LCONV_DPTS
+diff -Naurd mpfr-3.1.5-a/PATCHES mpfr-3.1.5-b/PATCHES
+--- mpfr-3.1.5-a/PATCHES 2016-12-19 22:11:17.022676737 +0000
++++ mpfr-3.1.5-b/PATCHES 2016-12-19 22:11:17.094676820 +0000
+@@ -0,0 +1 @@
++strtofr
+diff -Naurd mpfr-3.1.5-a/VERSION mpfr-3.1.5-b/VERSION
+--- mpfr-3.1.5-a/VERSION 2016-12-15 08:35:46.544430346 +0000
++++ mpfr-3.1.5-b/VERSION 2016-12-19 22:11:17.094676820 +0000
+@@ -1 +1 @@
+-3.1.5-p1
++3.1.5-p2
+diff -Naurd mpfr-3.1.5-a/src/mpfr.h mpfr-3.1.5-b/src/mpfr.h
+--- mpfr-3.1.5-a/src/mpfr.h 2016-12-15 08:35:46.540430340 +0000
++++ mpfr-3.1.5-b/src/mpfr.h 2016-12-19 22:11:17.090676815 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 5
+-#define MPFR_VERSION_STRING "3.1.5-p1"
++#define MPFR_VERSION_STRING "3.1.5-p2"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.5-a/src/strtofr.c mpfr-3.1.5-b/src/strtofr.c
+--- mpfr-3.1.5-a/src/strtofr.c 2016-09-27 07:58:15.000000000 +0000
++++ mpfr-3.1.5-b/src/strtofr.c 2016-12-19 22:11:17.066676788 +0000
+@@ -743,11 +743,14 @@
+ of the pstr_size most significant digits of pstr->mant, with
+ equality in case exact is non-zero. */
+
+- /* test if rounding is possible, and if so exit the loop */
+- if (exact || mpfr_can_round_raw (result, ysize,
+- (pstr->negative) ? -1 : 1,
+- ysize_bits - err - 1,
+- MPFR_RNDN, rnd, MPFR_PREC(x)))
++ /* test if rounding is possible, and if so exit the loop.
++ Note: we also need to be able to determine the correct ternary value,
++ thus we use the MPFR_PREC(x) + (rnd == MPFR_RNDN) trick.
++ For example if result = xxx...xxx111...111 and rnd = RNDN,
++ then we know the correct rounding is xxx...xx(x+1), but we cannot know
++ the correct ternary value. */
++ if (exact || mpfr_round_p (result, ysize, ysize_bits - err - 1,
++ MPFR_PREC(x) + (rnd == MPFR_RNDN)))
+ break;
+
+ next_loop:
+diff -Naurd mpfr-3.1.5-a/src/version.c mpfr-3.1.5-b/src/version.c
+--- mpfr-3.1.5-a/src/version.c 2016-12-15 08:35:46.544430346 +0000
++++ mpfr-3.1.5-b/src/version.c 2016-12-19 22:11:17.094676820 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.5-p1";
++ return "3.1.5-p2";
+ }
+diff -Naurd mpfr-3.1.5-a/tests/tstrtofr.c mpfr-3.1.5-b/tests/tstrtofr.c
+--- mpfr-3.1.5-a/tests/tstrtofr.c 2016-09-27 07:58:14.000000000 +0000
++++ mpfr-3.1.5-b/tests/tstrtofr.c 2016-12-19 22:11:17.066676788 +0000
+@@ -1191,6 +1191,24 @@
+ mpfr_clears (e, x1, x2, (mpfr_ptr) 0);
+ }
+
++/* Note: the number is 5^47/2^9. */
++static void
++bug20161217 (void)
++{
++ mpfr_t fp, z;
++ static const char * num = "0.1387778780781445675529539585113525390625e31";
++ int inex;
++
++ mpfr_init2 (fp, 110);
++ mpfr_init2 (z, 110);
++ inex = mpfr_strtofr (fp, num, NULL, 10, MPFR_RNDN);
++ MPFR_ASSERTN(inex == 0);
++ mpfr_set_str_binary (z, "10001100001000010011110110011101101001010000001011011110010001010100010100100110111101000010001011001100001101E-9");
++ MPFR_ASSERTN(mpfr_equal_p (fp, z));
++ mpfr_clear (fp);
++ mpfr_clear (z);
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -1205,6 +1223,7 @@
+ test20100310 ();
+ bug20120814 ();
+ bug20120829 ();
++ bug20161217 ();
+
+ tests_end_mpfr ();
+ return 0;
More information about the arch-commits
mailing list