Update.

	* include/math.h: Declare __isinf_internal, __isinfl_internal,
	__isnan_internal, and __isnanl_internal.
	* stdio-common/printf_fp.c: Use INTUSE for calls to __isinf, __isinfl,
	__isnan, and __isnanl.
	* stdio-common/printf_size.c: Likewise.
	* sysdeps/generic/printf_fphex.c: Likewise.
	* sysdeps/i386/fpu/s_isinfl.c: Also define _internal alias.
	* sysdeps/i386/fpu/s_isnanl.c: Likewise.
	* sysdeps/ia64/fpu/s_isinf.S: Likewise.
	* sysdeps/ia64/fpu/s_isnan.S: Likewise.
	* sysdeps/ieee754/dbl-64/s_isinf.c: Likewise.
	* sysdeps/ieee754/dbl-64/s_isnan.c: Likewise.
	* sysdeps/ieee754/flt-32/s_isinff.c: Likewise.
	* sysdeps/ieee754/flt-32/s_isnanf.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_isinfl.c: Likewise.
	* sysdeps/ieee754/ldbl-128/s_isnanl.c: Likewise.
	* sysdeps/ieee754/ldbl-96/s_isinfl.c: Likewise.
	* sysdeps/m68k/s_isinfl.c: Likewise.
	* sysdeps/m68k/fpu/s_isinf.c: Likewise.
	* sysdeps/powerpc/fpu/s_isnan.c: Likewise.

2 files changed, 10 insertions, 9 deletions

diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 746c5aac7e..974a1f09c0 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -120,7 +120,8 @@ ssize_t __printf_pad __P ((FILE *, char pad, int n)); /* In vfprintf.c.  */
 #define MPN_GE(u,v) \
   (u##size > v##size || (u##size == v##size && __mpn_cmp (u, v, u##size) >= 0))
 
-extern int __isinfl (long double), __isnanl (long double);
+extern int __isinfl_internal (long double) attribute_hidden;
+extern int __isnanl_internal (long double) attribute_hidden;
 
 extern mp_size_t __mpn_extract_double (mp_ptr res_ptr, mp_size_t size,
 				       int *expt, int *is_neg,
@@ -317,7 +318,7 @@ __printf_fp (FILE *fp,
       fpnum.ldbl = *(const long double *) args[0];
 
       /* Check for special values: not a number or infinity.  */
-      if (__isnanl (fpnum.ldbl))
+      if (INTUSE(__isnanl) (fpnum.ldbl))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -331,7 +332,7 @@ __printf_fp (FILE *fp,
 	      }
 	  is_neg = 0;
 	}
-      else if (__isinfl (fpnum.ldbl))
+      else if (INTUSE(__isinfl) (fpnum.ldbl))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -361,7 +362,7 @@ __printf_fp (FILE *fp,
       fpnum.dbl = *(const double *) args[0];
 
       /* Check for special values: not a number or infinity.  */
-      if (__isnan (fpnum.dbl))
+      if (INTUSE(__isnan) (fpnum.dbl))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -375,7 +376,7 @@ __printf_fp (FILE *fp,
 	    }
 	  is_neg = 0;
 	}
-      else if (__isinf (fpnum.dbl))
+      else if (INTUSE(__isinf) (fpnum.dbl))
 	{
 	  if (isupper (info->spec))
 	    {
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c
index 4f2807bf77..cfb2c94c02 100644
--- a/stdio-common/printf_size.c
+++ b/stdio-common/printf_size.c
@@ -136,13 +136,13 @@ printf_size (FILE *fp, const struct printf_info *info, const void *const *args)
       fpnum.ldbl.d = *(const long double *) args[0];
 
       /* Check for special values: not a number or infinity.  */
-      if (__isnanl (fpnum.ldbl.d))
+      if (INTUSE(__isnanl) (fpnum.ldbl.d))
 	{
 	  special = "nan";
 	  wspecial = L"nan";
 	  negative = 0;
 	}
-      else if (__isinfl (fpnum.ldbl.d))
+      else if (INTUSE(__isinfl) (fpnum.ldbl.d))
 	{
 	  special = "inf";
 	  wspecial = L"inf";
@@ -162,13 +162,13 @@ printf_size (FILE *fp, const struct printf_info *info, const void *const *args)
       fpnum.dbl.d = *(const double *) args[0];
 
       /* Check for special values: not a number or infinity.  */
-      if (__isnan (fpnum.dbl.d))
+      if (INTUSE(__isnan) (fpnum.dbl.d))
 	{
 	  special = "nan";
 	  wspecial = L"nan";
 	  negative = 0;
 	}
-      else if (__isinf (fpnum.dbl.d))
+      else if (INTUSE(__isinf) (fpnum.dbl.d))
 	{
 	  special = "inf";
 	  wspecial = L"inf";