Re: powerpc64le-linux long double math test failures

2014-05-30 Thread Pádraig Brady
On 04/29/2014 11:01 AM, Alan Modra wrote:
> Ping?
> https://lists.gnu.org/archive/html/bug-gnulib/2013-12/msg00107.html
> 

I slightly prefer Ulrich's more direct approach
which you linked above, so merged that.

http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=e962c07c0

sorry for the delay,

Pádraig.



Re: Bug#748361: m4: build tests are failing on ppc64el

2014-05-30 Thread Pádraig Brady
On 05/16/2014 05:00 PM, Eric Blake wrote:
> adding gnulib, as m4 merely borrows the content from gnulib.
> 
> On 05/16/2014 09:52 AM, Santiago Vila wrote:
>> Hello.
>>
>> I received the following report from the Debian bug system.
>> [ Please keep the Cc: lines when replying. Thanks ].
>>
>> - Forwarded message from Erwan Prioul  -
>>
>> Date: Fri, 16 May 2014 16:56:11 +0200
>> From: Erwan Prioul 
>> To: Debian Bug Tracking System 
>> Subject: Bug#748361: m4: build tests are failing on ppc64el
>>
>> Package: m4
>> Version: 1.4.17-2
>> Severity: normal
>> Tags: upstream patch
>>
>> Dear Maintainer,
>>
>> I've noticed build tests are failing on ppc64el.
>>
>> In Ubuntu, the attached patch was applied to fix the issue (Fix
>> detection of floating point endianness).
>>
>> Thanks for considering the patch.
>>
>> Erwan Prioul.
>>
>> -- System Information:
>> Debian Release: jessie/sid
>>   APT prefers unstable
>>   APT policy: (500, 'unstable')
>> Architecture: ppc64el (ppc64le)
>>
>> Kernel: Linux 3.13-1-powerpc64le (SMP w/1 CPU core)
>> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
>> Shell: /bin/sh linked to /bin/dash
>>
>> -- no debconf information
>>
>>
>> Description: Fix detection of floating point endianness
>>  See https://lists.gnu.org/archive/html/bug-gnulib/2013-12/msg00104.html
>> Author: Alan Modra 
>> Author: Colin Watson 
>> Forwarded: no
>> Last-Update: 2013-12-18
>>
>> Index: b/tests/test-isnanl.h
>> ===
>> --- a/tests/test-isnanl.h
>> +++ b/tests/test-isnanl.h
>> @@ -24,6 +24,12 @@
>>  #include "nan.h"
>>  #include "macros.h"
>>  
>> +#ifdef __FLOAT_WORD_ORDER__
>> +# define FLOAT_BIG_ENDIAN (__FLOAT_WORD_ORDER__ != __ORDER_LITTLE_ENDIAN__)
>> +#else
>> +# define FLOAT_BIG_ENDIAN (LDBL_EXPBIT0_WORD < NWORDS / 2)
>> +#endif
>> +
>>  int
>>  main ()
>>  {
>> @@ -56,10 +62,10 @@
>>  # if LDBL_EXPBIT0_BIT > 0
>>  m.word[LDBL_EXPBIT0_WORD] ^= (unsigned int) 1 << (LDBL_EXPBIT0_BIT - 1);
>>  # else
>> -m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)]
>> +m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)]
>>^= (unsigned int) 1 << (sizeof (unsigned int) * CHAR_BIT - 1);
>>  # endif
>> -m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)]
>> +m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)]
>>|= (unsigned int) 1 << LDBL_EXPBIT0_BIT;
>>  ASSERT (isnanl (m.value));
>>}
>> Index: b/tests/test-signbit.c
>> ===
>> --- a/tests/test-signbit.c
>> +++ b/tests/test-signbit.c
>> @@ -36,6 +36,12 @@
>>  double zerod = 0.0;
>>  long double zerol = 0.0L;
>>  
>> +#ifdef __FLOAT_WORD_ORDER__
>> +# define FLOAT_BIG_ENDIAN (__FLOAT_WORD_ORDER__ != __ORDER_LITTLE_ENDIAN__)
>> +#else
>> +# define FLOAT_BIG_ENDIAN (LDBL_EXPBIT0_WORD < NWORDS / 2)
>> +#endif
>> +
>>  static void
>>  test_signbitf ()
>>  {
>> @@ -156,10 +162,10 @@
>>  # if LDBL_EXPBIT0_BIT > 0
>>  m.word[LDBL_EXPBIT0_WORD] ^= (unsigned int) 1 << (LDBL_EXPBIT0_BIT - 1);
>>  # else
>> -m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)]
>> +m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)]
>>^= (unsigned int) 1 << (sizeof (unsigned int) * CHAR_BIT - 1);
>>  # endif
>> -m.word[LDBL_EXPBIT0_WORD + (LDBL_EXPBIT0_WORD < NWORDS / 2 ? 1 : - 1)]
>> +m.word[LDBL_EXPBIT0_WORD + (FLOAT_BIG_ENDIAN ? 1 : - 1)]
>>|= (unsigned int) 1 << LDBL_EXPBIT0_BIT;
>>  (void) signbit (m.value);
>>  #undef NWORDS
>>
>>
>>
>> - End forwarded message -

A different patch from Ulrich Weigand was just merged to address this:
http://git.sv.gnu.org/gitweb/?p=gnulib.git;a=commitdiff;h=e962c07c0

thanks,
Pádraig.



Re: [PATCH] valgrind-tests: fixed misleading help message.

2014-05-30 Thread Pádraig Brady
On 05/28/2014 04:53 PM, Kieran Colford wrote:
> The help message generated by a configure script using this module
> implied that valgrind was disabled by default, which it wasn't.
> Patched so that valgrind is in fact disabled in accordance with the
> documentation.

Note doc/valgrind-tests.texi doesn't mention the configure option,
so I'm thinking we should leave the auto enablement as is and
change the HELP_STRING like: s/enable/disable/ ?

thanks,
Pádraig.




Re: libiconv, libcharset, module localcharset and locale_charset()

2014-05-30 Thread Pádraig Brady
On 03/11/2014 10:22 PM, Дилян Палаузов wrote:
> Hello,
> 
> on some systems, the function locale_charset () is provided by libiconv, on 
> others by libcharset.  Why doesn't gnulib module localcharset try to find the 
> function there, before building its body in libgnu.a?
> 
> Kind regards
>   Дилян

This is a fair point. Now locale_charset() is not
usually separately available on GNU/Linux but it can be
on FreeBSD for example:

http://permalink.gmane.org/gmane.comp.version-control.git/243879

I'm guessing that gnulib was always updated with the
latest version, and so for this smallish function
it was simpler and arguably better for gnulib using
programs to consume it from there.

I'd accept a patch that favored the separated version.

thanks,
Pádraig.



Re: [PATCH] valgrind-tests: fixed misleading help message.

2014-05-30 Thread Kieran Colford


On 14-05-30 06:59 AM, Pádraig Brady wrote:
> On 05/28/2014 04:53 PM, Kieran Colford wrote:
>> The help message generated by a configure script using this module
>> implied that valgrind was disabled by default, which it wasn't.
>> Patched so that valgrind is in fact disabled in accordance with the
>> documentation.
> 
> Note doc/valgrind-tests.texi doesn't mention the configure option,
> so I'm thinking we should leave the auto enablement as is and
> change the HELP_STRING like: s/enable/disable/ ?
> 
> thanks,
> Pádraig.
> 

That sounds ok, I'll send out another patch with that soon.



signature.asc
Description: OpenPGP digital signature


[PATCH] valgrind-tests: fixed misleading help message

2014-05-30 Thread Kieran Colford
The help message generated by a configure script using this module
implied that valgrind was disabled by default, which it wasn't.
Left the auto enablement in and patched the help message like:
s/enable/disable/
---
 ChangeLog|8 
 m4/valgrind-tests.m4 |4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 13ea1a8..b9a4501 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-05-30  Kieran Colford  
+
+   valgrind-tests: fixed misleading help message
+   The help message generated by a configure script using this module
+   implied that valgrind was disabled by default, which it wasn't.
+   Left the auto enablement in and patched the help message like:
+   s/enable/disable/
+
 2014-05-30  Ulrich Weigand  
 
isfinite, isinf, isnan tests: fix for little-endian PowerPC
diff --git a/m4/valgrind-tests.m4 b/m4/valgrind-tests.m4
index 5191a5f..fb91d53 100644
--- a/m4/valgrind-tests.m4
+++ b/m4/valgrind-tests.m4
@@ -12,8 +12,8 @@ dnl From Simon Josefsson
 AC_DEFUN([gl_VALGRIND_TESTS],
 [
   AC_ARG_ENABLE(valgrind-tests,
-AS_HELP_STRING([--enable-valgrind-tests],
-   [run self tests under valgrind]),
+AS_HELP_STRING([--disable-valgrind-tests],
+   [don't try to run self tests under valgrind]),
 [opt_valgrind_tests=$enableval], [opt_valgrind_tests=yes])
 
   # Run self-tests under valgrind?
-- 
1.7.9.5




Re: [PATCH] valgrind-tests: fixed misleading help message

2014-05-30 Thread Pádraig Brady
On 05/30/2014 01:47 PM, Kieran Colford wrote:
> The help message generated by a configure script using this module
> implied that valgrind was disabled by default, which it wasn't.
> Left the auto enablement in and patched the help message like:
> s/enable/disable/
> ---
>  ChangeLog|8 
>  m4/valgrind-tests.m4 |4 ++--
>  2 files changed, 10 insertions(+), 2 deletions(-)

Pushed.

thanks,
Pádraig.




[PATCH] ftoastr: work around compiler bug in IBM xlc 12.1

2014-05-30 Thread Paul Eggert
* lib/ftoastr.h (_GL_FLT_PREC_BOUND, _GL_DBL_PREC_BOUND)
(_GL_LDBL_PREC_BOUND): Make these macros, not enums, to work
around a compiler bug in IBM xlc 12.1.0.0: it complains
'"ftoastr.c", line 80.37: 1506-045 (S) Undeclared identifier
_GL_FLT_PREC_BOUND.'
---
 ChangeLog |  9 +
 lib/ftoastr.h | 17 +
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b94234..5bb9d97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-05-30  Paul Eggert  
+
+   ftoastr: work around compiler bug in IBM xlc 12.1
+   * lib/ftoastr.h (_GL_FLT_PREC_BOUND, _GL_DBL_PREC_BOUND)
+   (_GL_LDBL_PREC_BOUND): Make these macros, not enums, to work
+   around a compiler bug in IBM xlc 12.1.0.0: it complains
+   '"ftoastr.c", line 80.37: 1506-045 (S) Undeclared identifier
+   _GL_FLT_PREC_BOUND.'
+
 2014-05-30  Kieran Colford  
 
valgrind-tests: fixed misleading help message
diff --git a/lib/ftoastr.h b/lib/ftoastr.h
index 6236292..26cad73 100644
--- a/lib/ftoastr.h
+++ b/lib/ftoastr.h
@@ -72,12 +72,13 @@ enum
 
 /* _GL_FLT_PREC_BOUND is an upper bound on the precision needed to
represent a float value without losing information.  Likewise for
-   _GL_DBL_PREC_BOUND and double, and _GL_LDBL_PREC_BOUND and long double.  */
+   _GL_DBL_PREC_BOUND and double, and _GL_LDBL_PREC_BOUND and long double.
+   These are macros, not enums, to work around a bug in IBM xlc 12.1.  */
 
 #if FLT_RADIX == 10 /* decimal floating point */
- enum {  _GL_FLT_PREC_BOUND =  FLT_MANT_DIG };
- enum {  _GL_DBL_PREC_BOUND =  DBL_MANT_DIG };
- enum { _GL_LDBL_PREC_BOUND = LDBL_MANT_DIG };
+# define  _GL_FLT_PREC_BOUND  FLT_MANT_DIG
+# define  _GL_DBL_PREC_BOUND  DBL_MANT_DIG
+# define _GL_LDBL_PREC_BOUND LDBL_MANT_DIG
 #else
 
 /* An upper bound on the number of bits needed to represent a single
@@ -95,13 +96,13 @@ enum
DIG digits.  For why the "+ 1" is needed, see "Binary to Decimal
Conversion" in David Goldberg's paper "What Every Computer
Scientist Should Know About Floating-Point Arithmetic"
-   .  */
+   .  */
 # define _GL_FLOAT_PREC_BOUND(dig) \
(INT_BITS_STRLEN_BOUND ((dig) * _GL_FLOAT_DIG_BITS_BOUND) + 1)
 
- enum {  _GL_FLT_PREC_BOUND = _GL_FLOAT_PREC_BOUND ( FLT_MANT_DIG) };
- enum {  _GL_DBL_PREC_BOUND = _GL_FLOAT_PREC_BOUND ( DBL_MANT_DIG) };
- enum { _GL_LDBL_PREC_BOUND = _GL_FLOAT_PREC_BOUND (LDBL_MANT_DIG) };
+# define  _GL_FLT_PREC_BOUND _GL_FLOAT_PREC_BOUND ( FLT_MANT_DIG)
+# define  _GL_DBL_PREC_BOUND _GL_FLOAT_PREC_BOUND ( DBL_MANT_DIG)
+# define _GL_LDBL_PREC_BOUND _GL_FLOAT_PREC_BOUND (LDBL_MANT_DIG)
 #endif
 
 
-- 
1.9.3




[PATCH] Restore FreeBSD 1.x support and fix support for Freebsd 1x.

2014-05-30 Thread Tijl Coosemans
* build-aux/config.libpath: Restore FreeBSD 1.x support,
revert 1bf9d10cc5e78c522b6e28a7dc43a10e6dcfaaed.
* build-aux/config.rpath: Restore FreeBSD 1.x support,
revert 4fc71678bebfe59aaa2681f4fa84fb9cf3c92db2 and treat
freebsd2.2* like freebsd*.
* m4/printf.m4: replace freebsd[1-4]* with freebsd[1-4].*.
* m4/unlinkdir.m4: Special case FreeBSD<2.2 instead of FreeBSD>=2.2.
---
 ChangeLog| 12 
 build-aux/config.libpath |  2 ++
 build-aux/config.rpath   | 11 ++-
 m4/printf.m4 | 16 
 m4/unlinkdir.m4  |  3 ++-
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bb9d97..a361e4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-05-30  Tijl Coosemans 
+
+   Restore FreeBSD 1.x support and fix support for Freebsd 1x.
+
+   * build-aux/config.libpath: Restore FreeBSD 1.x support,
+   revert 1bf9d10cc5e78c522b6e28a7dc43a10e6dcfaaed.
+   * build-aux/config.rpath: Restore FreeBSD 1.x support,
+   revert 4fc71678bebfe59aaa2681f4fa84fb9cf3c92db2 and treat
+   freebsd2.2* like freebsd*.
+   * m4/printf.m4: replace freebsd[1-4]* with freebsd[1-4].*.
+   * m4/unlinkdir.m4: Special case FreeBSD<2.2 instead of FreeBSD>=2.2.
+
 2014-05-30  Paul Eggert  
 
ftoastr: work around compiler bug in IBM xlc 12.1
diff --git a/build-aux/config.libpath b/build-aux/config.libpath
index 6900970..a8477df 100755
--- a/build-aux/config.libpath
+++ b/build-aux/config.libpath
@@ -66,6 +66,8 @@ case $host_os in
   dgux*)
 shlibpath_var=LD_LIBRARY_PATH
 ;;
+  freebsd1.*)
+;;
   freebsd* | dragonfly*)
 shlibpath_var=LD_LIBRARY_PATH
 ;;
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index ab6fd99..11d0c5d 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -367,11 +367,10 @@ else
 dgux*)
   hardcode_libdir_flag_spec='-L$libdir'
   ;;
-freebsd2.2*)
-  hardcode_libdir_flag_spec='-R$libdir'
-  hardcode_direct=yes
+freebsd1.*)
+  ld_shlibs=no
   ;;
-freebsd2*)
+freebsd2.[01]*)
   hardcode_direct=yes
   hardcode_minus_L=yes
   ;;
@@ -548,9 +547,11 @@ case "$host_os" in
   dgux*)
 library_names_spec='$libname$shrext'
 ;;
+  freebsd1.*)
+;;
   freebsd* | dragonfly*)
 case "$host_os" in
-  freebsd[123]*)
+  freebsd[23].*)
 library_names_spec='$libname$shrext$versuffix' ;;
   *)
 library_names_spec='$libname$shrext' ;;
diff --git a/m4/printf.m4 b/m4/printf.m4
index 9346ab0..6f9c6cf 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -61,7 +61,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   gl_cv_func_printf_sizes_c99="guessing yes";;
  # Guess yes on FreeBSD >= 5.
-   freebsd[1-4]*)gl_cv_func_printf_sizes_c99="guessing no";;
+   freebsd[1-4].*)   gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
  # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*)gl_cv_func_printf_sizes_c99="guessing no";;
@@ -220,7 +220,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   gl_cv_func_printf_infinite="guessing yes";;
  # Guess yes on FreeBSD >= 6.
-   freebsd[1-5]*)gl_cv_func_printf_infinite="guessing no";;
+   freebsd[1-5].*)   gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
  # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*)gl_cv_func_printf_infinite="guessing no";;
@@ -442,7 +442,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   
gl_cv_func_printf_infinite_long_double="guessing yes";;
  # Guess yes on FreeBSD >= 6.
-   freebsd[1-5]*)
gl_cv_func_printf_infinite_long_double="guessing no";;
+   freebsd[1-5].*)   
gl_cv_func_printf_infinite_long_double="guessing no";;
freebsd* | kfreebsd*) 
gl_cv_func_printf_infinite_long_double="guessing yes";;
  # Guess yes on HP-UX >= 11.
hpux[7-9]* | hpux10*) 
gl_cv_func_printf_infinite_long_double="guessing no";;
@@ -588,7 +588,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   gl_cv_func_printf_directive_f="guessing yes";;
  # Guess yes on FreeBSD >= 6.
-   freebsd[1-5]*)gl_cv_func_printf_directive_f="guessing no";;
+   freebsd[1-5].*)   gl_cv_func_printf_direc

Re: [PATCH] Restore FreeBSD 1.x support and fix support for Freebsd 1x.

2014-05-30 Thread Paul Eggert
Thanks for the heads-up.  I don't think we need to worry about FreeBSD 
1.x any more as we don't support computer museums.  But we should fix 
the bugs with FreeBSD 10+ so I installed the attached patch.
From e965d3e22c01f7604f6ab9facaebec8086db914c Mon Sep 17 00:00:00 2001
From: Paul Eggert 
Date: Fri, 30 May 2014 16:15:27 -0700
Subject: [PATCH] printf, config.rpath: Port to FreeBSD 10.

Problem reported by Tijl Coosemans in:
http://lists.gnu.org/archive/html/bug-gnulib/2014-05/msg00078.html
* build-aux/config.rpath (hardcode_libdir_flag_spec)
(hardcode_direct): Simplify FreeBSD configuration.
(library_names_spec): Don't mishandle FreeBSD 10+.
* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_LONG_DOUBLE)
(gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_F)
(gl_SNPRINTF_TRUNCATION_C99, gl_SNPRINTF_RETVAL_C99)
(gl_SNPRINTF_DIRECTIVE_N, gl_VSNPRINTF_ZEROSIZE_C99):
Don't mishandle FreeBSD 10+ when cross-compiling.
---
 ChangeLog  | 12 
 build-aux/config.rpath | 16 +---
 m4/printf.m4   | 18 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bb9d97..30df129 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2014-05-30  Paul Eggert  
 
+   printf, config.rpath: Port to FreeBSD 10.
+   Problem reported by Tijl Coosemans in:
+   http://lists.gnu.org/archive/html/bug-gnulib/2014-05/msg00078.html
+   * build-aux/config.rpath (hardcode_libdir_flag_spec)
+   (hardcode_direct): Simplify FreeBSD configuration.
+   (library_names_spec): Don't mishandle FreeBSD 10+.
+   * m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_LONG_DOUBLE)
+   (gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_F)
+   (gl_SNPRINTF_TRUNCATION_C99, gl_SNPRINTF_RETVAL_C99)
+   (gl_SNPRINTF_DIRECTIVE_N, gl_VSNPRINTF_ZEROSIZE_C99):
+   Don't mishandle FreeBSD 10+ when cross-compiling.
+
ftoastr: work around compiler bug in IBM xlc 12.1
* lib/ftoastr.h (_GL_FLT_PREC_BOUND, _GL_DBL_PREC_BOUND)
(_GL_LDBL_PREC_BOUND): Make these macros, not enums, to work
diff --git a/build-aux/config.rpath b/build-aux/config.rpath
index ab6fd99..b625621 100755
--- a/build-aux/config.rpath
+++ b/build-aux/config.rpath
@@ -367,11 +367,7 @@ else
 dgux*)
   hardcode_libdir_flag_spec='-L$libdir'
   ;;
-freebsd2.2*)
-  hardcode_libdir_flag_spec='-R$libdir'
-  hardcode_direct=yes
-  ;;
-freebsd2*)
+freebsd2.[01]*)
   hardcode_direct=yes
   hardcode_minus_L=yes
   ;;
@@ -548,13 +544,11 @@ case "$host_os" in
   dgux*)
 library_names_spec='$libname$shrext'
 ;;
+  freebsd[23].*)
+library_names_spec='$libname$shrext$versuffix'
+;;
   freebsd* | dragonfly*)
-case "$host_os" in
-  freebsd[123]*)
-library_names_spec='$libname$shrext$versuffix' ;;
-  *)
-library_names_spec='$libname$shrext' ;;
-esac
+library_names_spec='$libname$shrext'
 ;;
   gnu*)
 library_names_spec='$libname$shrext'
diff --git a/m4/printf.m4 b/m4/printf.m4
index 9346ab0..3d7b381 100644
--- a/m4/printf.m4
+++ b/m4/printf.m4
@@ -1,4 +1,4 @@
-# printf.m4 serial 50
+# printf.m4 serial 51
 dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -61,7 +61,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   gl_cv_func_printf_sizes_c99="guessing yes";;
  # Guess yes on FreeBSD >= 5.
-   freebsd[1-4]*)gl_cv_func_printf_sizes_c99="guessing no";;
+   freebsd[1-4].*)   gl_cv_func_printf_sizes_c99="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
  # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*)gl_cv_func_printf_sizes_c99="guessing no";;
@@ -220,7 +220,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   gl_cv_func_printf_infinite="guessing yes";;
  # Guess yes on FreeBSD >= 6.
-   freebsd[1-5]*)gl_cv_func_printf_infinite="guessing no";;
+   freebsd[1-5].*)   gl_cv_func_printf_infinite="guessing no";;
freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
  # Guess yes on Mac OS X >= 10.3.
darwin[1-6].*)gl_cv_func_printf_infinite="guessing no";;
@@ -442,7 +442,7 @@ changequote(,)dnl
  # Guess yes on glibc systems.
*-gnu*)   
gl_cv_func_printf_infinite_long_double="guessing yes";;
  # Guess yes on FreeBSD >= 6.
-   freebsd[1-5]*)
gl_cv_func_printf_infinite_lon