yann@1249: diff -Naurd mpfr-2.4.0-a/PATCHES mpfr-2.4.0-b/PATCHES
yann@1249: --- mpfr-2.4.0-a/PATCHES	2009-01-26 12:52:01.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/PATCHES	2009-02-20 17:27:44.000000000 +0000
yann@1249: @@ -0,0 +1 @@
yann@1249: +printf-hh-ll
yann@1249: diff -Naurd mpfr-2.4.0-a/VERSION mpfr-2.4.0-b/VERSION
yann@1249: --- mpfr-2.4.0-a/VERSION	2009-01-26 12:52:01.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/VERSION	2009-02-20 17:27:44.000000000 +0000
yann@1249: @@ -1 +1 @@
yann@1249: -2.4.0
yann@1249: +2.4.0-p1
yann@1249: diff -Naurd mpfr-2.4.0-a/acinclude.m4 mpfr-2.4.0-b/acinclude.m4
yann@1249: --- mpfr-2.4.0-a/acinclude.m4	2009-01-26 12:52:01.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/acinclude.m4	2009-01-26 12:52:01.000000000 +0000
yann@1249: @@ -722,6 +722,16 @@
yann@1249:           [AC_DEFINE([NPRINTF_J], 1, [gmp_printf cannot read intmax_t])])
yann@1249:  fi
yann@1249:  
yann@1249: +MPFR_FUNC_PRINTF_SPEC([%hhd], [char], [
yann@1249: +#include <gmp.h>
yann@1249: +         ], [gmp_],,
yann@1249: +         [AC_DEFINE([NPRINTF_HH], 1, [gmp_printf cannot use 'hh' length modifier])])
yann@1249: +
yann@1249: +MPFR_FUNC_PRINTF_SPEC([%lld], [long long int], [
yann@1249: +#include <gmp.h>
yann@1249: +         ], [gmp_],,
yann@1249: +         [AC_DEFINE([NPRINTF_LL], 1, [gmp_printf cannot read long long int])])
yann@1249: +
yann@1249:  MPFR_FUNC_PRINTF_SPEC([%.0Lf], [long double], [
yann@1249:  #include <gmp.h>
yann@1249:           ], [gmp_],,
yann@1249: diff -Naurd mpfr-2.4.0-a/configure mpfr-2.4.0-b/configure
yann@1249: --- mpfr-2.4.0-a/configure	2009-01-26 12:54:36.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/configure	2009-02-20 17:38:36.000000000 +0000
yann@1249: @@ -24874,6 +24874,170 @@
yann@1249:  fi
yann@1249:  
yann@1249:  
yann@1249: +{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%hhd\"" >&5
yann@1249: +$as_echo_n "checking if gmp_printf supports \"%hhd\"... " >&6; }
yann@1249: +if test "$cross_compiling" = yes; then
yann@1249: +  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
yann@1249: +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
yann@1249: +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
yann@1249: +See \`config.log' for more details." >&5
yann@1249: +$as_echo "$as_me: error: cannot run test program while cross compiling
yann@1249: +See \`config.log' for more details." >&2;}
yann@1249: +   { (exit 1); exit 1; }; }; }
yann@1249: +else
yann@1249: +  cat >conftest.$ac_ext <<_ACEOF
yann@1249: +/* confdefs.h.  */
yann@1249: +_ACEOF
yann@1249: +cat confdefs.h >>conftest.$ac_ext
yann@1249: +cat >>conftest.$ac_ext <<_ACEOF
yann@1249: +/* end confdefs.h.  */
yann@1249: +
yann@1249: +#include <stdio.h>
yann@1249: +
yann@1249: +#include <gmp.h>
yann@1249: +
yann@1249: +
yann@1249: +int
yann@1249: +main ()
yann@1249: +{
yann@1249: +
yann@1249: +  char s[256];
yann@1249: +  char a = 0;
yann@1249: +  return (gmp_sprintf (s, "%hhd", a) != 1) ? 1 : 0;
yann@1249: +
yann@1249: +  ;
yann@1249: +  return 0;
yann@1249: +}
yann@1249: +_ACEOF
yann@1249: +rm -f conftest$ac_exeext
yann@1249: +if { (ac_try="$ac_link"
yann@1249: +case "(($ac_try" in
yann@1249: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
yann@1249: +  *) ac_try_echo=$ac_try;;
yann@1249: +esac
yann@1249: +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
yann@1249: +$as_echo "$ac_try_echo") >&5
yann@1249: +  (eval "$ac_link") 2>&5
yann@1249: +  ac_status=$?
yann@1249: +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@1249: +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
yann@1249: +  { (case "(($ac_try" in
yann@1249: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
yann@1249: +  *) ac_try_echo=$ac_try;;
yann@1249: +esac
yann@1249: +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
yann@1249: +$as_echo "$ac_try_echo") >&5
yann@1249: +  (eval "$ac_try") 2>&5
yann@1249: +  ac_status=$?
yann@1249: +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@1249: +  (exit $ac_status); }; }; then
yann@1249: +  { $as_echo "$as_me:$LINENO: result: yes" >&5
yann@1249: +$as_echo "yes" >&6; }
yann@1249: +
yann@1249: +else
yann@1249: +  $as_echo "$as_me: program exited with status $ac_status" >&5
yann@1249: +$as_echo "$as_me: failed program was:" >&5
yann@1249: +sed 's/^/| /' conftest.$ac_ext >&5
yann@1249: +
yann@1249: +( exit $ac_status )
yann@1249: +{ $as_echo "$as_me:$LINENO: result: no" >&5
yann@1249: +$as_echo "no" >&6; }
yann@1249: +
yann@1249: +cat >>confdefs.h <<\_ACEOF
yann@1249: +#define NPRINTF_HH 1
yann@1249: +_ACEOF
yann@1249: +
yann@1249: +fi
yann@1249: +rm -rf conftest.dSYM
yann@1249: +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
yann@1249: +fi
yann@1249: +
yann@1249: +
yann@1249: +
yann@1249: +
yann@1249: +
yann@1249: +{ $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%lld\"" >&5
yann@1249: +$as_echo_n "checking if gmp_printf supports \"%lld\"... " >&6; }
yann@1249: +if test "$cross_compiling" = yes; then
yann@1249: +  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
yann@1249: +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
yann@1249: +{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
yann@1249: +See \`config.log' for more details." >&5
yann@1249: +$as_echo "$as_me: error: cannot run test program while cross compiling
yann@1249: +See \`config.log' for more details." >&2;}
yann@1249: +   { (exit 1); exit 1; }; }; }
yann@1249: +else
yann@1249: +  cat >conftest.$ac_ext <<_ACEOF
yann@1249: +/* confdefs.h.  */
yann@1249: +_ACEOF
yann@1249: +cat confdefs.h >>conftest.$ac_ext
yann@1249: +cat >>conftest.$ac_ext <<_ACEOF
yann@1249: +/* end confdefs.h.  */
yann@1249: +
yann@1249: +#include <stdio.h>
yann@1249: +
yann@1249: +#include <gmp.h>
yann@1249: +
yann@1249: +
yann@1249: +int
yann@1249: +main ()
yann@1249: +{
yann@1249: +
yann@1249: +  char s[256];
yann@1249: +  long long int a = 0;
yann@1249: +  return (gmp_sprintf (s, "%lld", a) != 1) ? 1 : 0;
yann@1249: +
yann@1249: +  ;
yann@1249: +  return 0;
yann@1249: +}
yann@1249: +_ACEOF
yann@1249: +rm -f conftest$ac_exeext
yann@1249: +if { (ac_try="$ac_link"
yann@1249: +case "(($ac_try" in
yann@1249: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
yann@1249: +  *) ac_try_echo=$ac_try;;
yann@1249: +esac
yann@1249: +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
yann@1249: +$as_echo "$ac_try_echo") >&5
yann@1249: +  (eval "$ac_link") 2>&5
yann@1249: +  ac_status=$?
yann@1249: +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@1249: +  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
yann@1249: +  { (case "(($ac_try" in
yann@1249: +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
yann@1249: +  *) ac_try_echo=$ac_try;;
yann@1249: +esac
yann@1249: +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
yann@1249: +$as_echo "$ac_try_echo") >&5
yann@1249: +  (eval "$ac_try") 2>&5
yann@1249: +  ac_status=$?
yann@1249: +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@1249: +  (exit $ac_status); }; }; then
yann@1249: +  { $as_echo "$as_me:$LINENO: result: yes" >&5
yann@1249: +$as_echo "yes" >&6; }
yann@1249: +
yann@1249: +else
yann@1249: +  $as_echo "$as_me: program exited with status $ac_status" >&5
yann@1249: +$as_echo "$as_me: failed program was:" >&5
yann@1249: +sed 's/^/| /' conftest.$ac_ext >&5
yann@1249: +
yann@1249: +( exit $ac_status )
yann@1249: +{ $as_echo "$as_me:$LINENO: result: no" >&5
yann@1249: +$as_echo "no" >&6; }
yann@1249: +
yann@1249: +cat >>confdefs.h <<\_ACEOF
yann@1249: +#define NPRINTF_LL 1
yann@1249: +_ACEOF
yann@1249: +
yann@1249: +fi
yann@1249: +rm -rf conftest.dSYM
yann@1249: +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
yann@1249: +fi
yann@1249: +
yann@1249: +
yann@1249: +
yann@1249: +
yann@1249: +
yann@1249:  { $as_echo "$as_me:$LINENO: checking if gmp_printf supports \"%.0Lf\"" >&5
yann@1249:  $as_echo_n "checking if gmp_printf supports \"%.0Lf\"... " >&6; }
yann@1249:  if test "$cross_compiling" = yes; then
yann@1249: diff -Naurd mpfr-2.4.0-a/mpfr.h mpfr-2.4.0-b/mpfr.h
yann@1249: --- mpfr-2.4.0-a/mpfr.h	2009-01-26 12:52:01.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/mpfr.h	2009-02-20 17:27:44.000000000 +0000
yann@1249: @@ -27,7 +27,7 @@
yann@1249:  #define MPFR_VERSION_MAJOR 2
yann@1249:  #define MPFR_VERSION_MINOR 4
yann@1249:  #define MPFR_VERSION_PATCHLEVEL 0
yann@1249: -#define MPFR_VERSION_STRING "2.4.0"
yann@1249: +#define MPFR_VERSION_STRING "2.4.0-p1"
yann@1249:  
yann@1249:  /* Macros dealing with MPFR VERSION */
yann@1249:  #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
yann@1249: diff -Naurd mpfr-2.4.0-a/tests/tfprintf.c mpfr-2.4.0-b/tests/tfprintf.c
yann@1249: --- mpfr-2.4.0-a/tests/tfprintf.c	2009-01-26 12:52:00.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/tests/tfprintf.c	2009-02-20 16:31:02.000000000 +0000
yann@1249: @@ -146,6 +146,7 @@
yann@1249:    short sh = -1;
yann@1249:    unsigned short ush = 1;
yann@1249:    int i = -1;
yann@1249: +  int j = 1;
yann@1249:    unsigned int ui = 1;
yann@1249:    long lo = -1;
yann@1249:    unsigned long ulo = 1;
yann@1249: @@ -179,12 +180,11 @@
yann@1249:  
yann@1249:    limb[0] = limb[1] = limb[2] = ~ (mp_limb_t) 0;
yann@1249:  
yann@1249: -  check_vfprintf (fout, "a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui,
yann@1249: -                  ulo, &uch);
yann@1249: -  check_length (1, uch, 28, hhu);
yann@1249: -  check_vfprintf (fout, "a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i,
yann@1249: +  check_vfprintf (fout, "a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
yann@1249: +  check_length (1, j, 22, d);
yann@1249: +  check_vfprintf (fout, "a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i,
yann@1249:                    lo, &ulo);
yann@1249: -  check_length (2, ulo, 37, lu);
yann@1249: +  check_length (2, ulo, 36, lu);
yann@1249:    check_vfprintf (fout, "a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
yann@1249:    check_length (3, ush, 29, hu);
yann@1249:    check_vfprintf (fout, "a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
yann@1249: @@ -208,13 +208,18 @@
yann@1249:    check_length (9, sz, 30, zu);
yann@1249:  #endif
yann@1249:  
yann@1249: +#ifndef NPRINTF_HH
yann@1249: +  check_vfprintf (fout, "a. %hhi, b.%RA, c. %hhu%hhn", sch, mpfr, uch, &uch);
yann@1249: +  check_length (10, uch, 21, hhu);
yann@1249: +#endif
yann@1249: +
yann@1249:  #if (__GNU_MP_VERSION * 10 + __GNU_MP_VERSION_MINOR) >= 42
yann@1249:    /* The 'M' specifier was added in gmp 4.2.0 */
yann@1249:    check_vfprintf (fout, "a. %Mx b. %Re%Mn", limb[0], mpfr, &limb[0]);
yann@1249:    if (limb[0] != 14 + BITS_PER_MP_LIMB / 4 || limb[1] != ~ (mp_limb_t) 0
yann@1249:        || limb[2] != ~ (mp_limb_t) 0)
yann@1249:      {
yann@1249: -      printf ("Error in test #10: mpfr_vfprintf did not print %d characters"
yann@1249: +      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
yann@1249:                " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
yann@1249:        exit (1);
yann@1249:      }
yann@1249: @@ -227,13 +232,13 @@
yann@1249:    if (limb[0] != 14 + 3 * BITS_PER_MP_LIMB / 4 || limb[1] != (mp_limb_t) 0
yann@1249:        || limb[2] != ~ (mp_limb_t) 0)
yann@1249:      {
yann@1249: -      printf ("Error in test #11: mpfr_vfprintf did not print %d characters"
yann@1249: +      printf ("Error in test #12: mpfr_vfprintf did not print %d characters"
yann@1249:                " as expected\n", 14 + (int) BITS_PER_MP_LIMB / 4);
yann@1249:        exit (1);
yann@1249:      }
yann@1249:  #endif
yann@1249:  
yann@1249: -#ifdef HAVE_LONG_LONG
yann@1249: +#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
yann@1249:    {
yann@1249:      long long llo = -1;
yann@1249:      unsigned long long ullo = 1;
yann@1249: diff -Naurd mpfr-2.4.0-a/tests/tprintf.c mpfr-2.4.0-b/tests/tprintf.c
yann@1249: --- mpfr-2.4.0-a/tests/tprintf.c	2009-01-26 12:52:00.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/tests/tprintf.c	2009-02-20 16:31:02.000000000 +0000
yann@1249: @@ -150,6 +150,7 @@
yann@1249:    short sh = -1;
yann@1249:    unsigned short ush = 1;
yann@1249:    int i = -1;
yann@1249: +  int j = 1;
yann@1249:    unsigned int ui = 1;
yann@1249:    long lo = -1;
yann@1249:    unsigned long ulo = 1;
yann@1249: @@ -178,11 +179,10 @@
yann@1249:    mpfr_set_f (mpfr, mpf, GMP_RNDN);
yann@1249:    prec = mpfr_get_prec (mpfr);
yann@1249:  
yann@1249: -  check_vprintf ("a. %Ra, b. %hhu, c. %u, d. %lx%hhn", mpfr, uch, ui, ulo,
yann@1249: -                 &uch);
yann@1249: -  check_length (1, uch, 28, hhu);
yann@1249: -  check_vprintf ("a. %hhi, b. %Rb, c. %u, d. %li%ln", sch, mpfr, i, lo, &ulo);
yann@1249: -  check_length (2, ulo, 37, lu);
yann@1249: +  check_vprintf ("a. %Ra, b. %u, c. %lx%n", mpfr, ui, ulo, &j);
yann@1249: +  check_length (1, j, 22, d);
yann@1249: +  check_vprintf ("a. %c, b. %Rb, c. %u, d. %li%ln", i, mpfr, i, lo, &ulo);
yann@1249: +  check_length (2, ulo, 36, lu);
yann@1249:    check_vprintf ("a. %hi, b. %*f, c. %Re%hn", ush, 3, f, mpfr, &ush);
yann@1249:    check_length (3, ush, 29, hu);
yann@1249:    check_vprintf ("a. %hi, b. %f, c. %#.2Rf%n", sh, d, mpfr, &i);
yann@1249: @@ -204,7 +204,12 @@
yann@1249:    check_length (9, sz, 30, zu);
yann@1249:  #endif
yann@1249:  
yann@1249: -#ifdef HAVE_LONG_LONG
yann@1249: +#ifndef NPRINTF_HH
yann@1249: +  check_vprintf ("a. %hhi, b. %Ra, c. %hhu%hhn", sch, mpfr, uch, &uch);
yann@1249: +  check_length (10, uch, 22, hhu);
yann@1249: +#endif
yann@1249: +
yann@1249: +#if defined(HAVE_LONG_LONG) && !defined(NPRINTF_LL)
yann@1249:    {
yann@1249:      long long llo = -1;
yann@1249:      unsigned long long ullo = 1;
yann@1249: diff -Naurd mpfr-2.4.0-a/vasprintf.c mpfr-2.4.0-b/vasprintf.c
yann@1249: --- mpfr-2.4.0-a/vasprintf.c	2009-01-26 12:52:01.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/vasprintf.c	2009-02-20 16:31:02.000000000 +0000
yann@1249: @@ -235,10 +235,14 @@
yann@1249:        break;
yann@1249:      case 'h':
yann@1249:        if (*++format == 'h')
yann@1249: +#ifndef NPRINTF_HH
yann@1249:          {
yann@1249:            ++format;
yann@1249:            specinfo->arg_type = CHAR_ARG;
yann@1249:          }
yann@1249: +#else
yann@1249: +        specinfo->arg_type = UNSUPPORTED;
yann@1249: +#endif
yann@1249:        else
yann@1249:          specinfo->arg_type = SHORT_ARG;
yann@1249:        break;
yann@1249: @@ -246,7 +250,7 @@
yann@1249:        if (*++format == 'l')
yann@1249:          {
yann@1249:            ++format;
yann@1249: -#ifdef HAVE_LONG_LONG
yann@1249: +#if defined (HAVE_LONG_LONG) && !defined(NPRINTF_LL)
yann@1249:            specinfo->arg_type = LONG_LONG_ARG;
yann@1249:  #else
yann@1249:            specinfo->arg_type = UNSUPPORTED;
yann@1249: diff -Naurd mpfr-2.4.0-a/version.c mpfr-2.4.0-b/version.c
yann@1249: --- mpfr-2.4.0-a/version.c	2009-01-26 12:52:01.000000000 +0000
yann@1249: +++ mpfr-2.4.0-b/version.c	2009-02-20 17:27:44.000000000 +0000
yann@1249: @@ -25,5 +25,5 @@
yann@1249:  const char *
yann@1249:  mpfr_get_version (void)
yann@1249:  {
yann@1249: -  return "2.4.0";
yann@1249: +  return "2.4.0-p1";
yann@1249:  }