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.

16 files changed, 38 insertions, 13 deletions

diff --git a/sysdeps/generic/fxstat.c b/sysdeps/generic/fxstat.c
index 978b40a338..6bff431dee 100644
--- a/sysdeps/generic/fxstat.c
+++ b/sysdeps/generic/fxstat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996, 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -20,6 +20,8 @@
 #include <stddef.h>
 #include <sys/stat.h>
 
+#undef __fxstat
+
 /* Get information about the file descriptor FD in BUF.  */
 int
 __fxstat (int vers, int fd, struct stat *buf)
@@ -46,5 +48,6 @@ __fxstat (int vers, int fd, struct stat *buf)
 }
 stub_warning (fstat)
 
+INTDEF(__fxstat)
 weak_alias (__fxstat, _fxstat)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/printf_fphex.c b/sysdeps/generic/printf_fphex.c
index 7dfb116aee..794a1ab23c 100644
--- a/sysdeps/generic/printf_fphex.c
+++ b/sysdeps/generic/printf_fphex.c
@@ -170,7 +170,7 @@ __printf_fphex (FILE *fp,
       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))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -186,7 +186,7 @@ __printf_fphex (FILE *fp,
 	}
       else
 	{
-	  if (__isinfl (fpnum.ldbl.d))
+	  if (INTUSE(__isinfl) (fpnum.ldbl.d))
 	    {
 	      if (isupper (info->spec))
 		{
@@ -209,7 +209,7 @@ __printf_fphex (FILE *fp,
       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))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -225,7 +225,7 @@ __printf_fphex (FILE *fp,
 	}
       else
 	{
-	  if (__isinf (fpnum.dbl.d))
+	  if (INTUSE(__isinf) (fpnum.dbl.d))
 	    {
 	      if (isupper (info->spec))
 		{
diff --git a/sysdeps/i386/fpu/s_isinfl.c b/sysdeps/i386/fpu/s_isinfl.c
index f07898fd1b..29b3aeffc3 100644
--- a/sysdeps/i386/fpu/s_isinfl.c
+++ b/sysdeps/i386/fpu/s_isinfl.c
@@ -33,4 +33,5 @@ static char rcsid[] = "$NetBSD: $";
 	se &= 0x8000;
 	return ~(lx >> 31) & (1 - (se >> 14));
 }
+INTDEF(__isinfl)
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/i386/fpu/s_isnanl.c b/sysdeps/i386/fpu/s_isnanl.c
index 6a74b956cc..ac034a6c3d 100644
--- a/sysdeps/i386/fpu/s_isnanl.c
+++ b/sysdeps/i386/fpu/s_isnanl.c
@@ -44,4 +44,5 @@ static char rcsid[] = "$NetBSD: $";
 	se = 0xfffe - se;
 	return (int)((u_int32_t)(se))>>16;
 }
+INTDEF(__isnanl)
 weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/ia64/fpu/s_isinf.S b/sysdeps/ia64/fpu/s_isinf.S
index b51fb91904..801446ad73 100644
--- a/sysdeps/ia64/fpu/s_isinf.S
+++ b/sysdeps/ia64/fpu/s_isinf.S
@@ -1,5 +1,5 @@
 /* Test for inf/-inf
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jes Sorensen <jes@linuxcare.com>, October 2000.
 
@@ -43,11 +43,14 @@ ENTRY (__isinf)
 (p7)	mov ret0 = -1
 (p8)	mov ret0 = 0
 	br.ret.sptk.many rp
-}	
+}
 END (__isinf)
 
+strong_alias (__isinf)
 strong_alias (__isinf, __isinff)
+strong_alias (__isinff)
 strong_alias (__isinf, __isinfl)
+strong_alias (__isinfl)
 
 weak_alias (__isinf, isinf)
 weak_alias (__isinff, isinff)
diff --git a/sysdeps/ia64/fpu/s_isnan.S b/sysdeps/ia64/fpu/s_isnan.S
index 1d4eb69a6d..2a9c3dd8d7 100644
--- a/sysdeps/ia64/fpu/s_isnan.S
+++ b/sysdeps/ia64/fpu/s_isnan.S
@@ -1,5 +1,5 @@
 /* Test for NaN
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jes Sorensen <jes@linuxcare.com>, October 2000.
 
@@ -36,11 +36,14 @@ ENTRY (__isnan)
 (p6)	mov ret0 = 1
 (p7)	mov ret0 = 0
 	br.ret.sptk.many rp
-}	
+}
 END (__isnan)
 
+strong_alias (__isnan, __isnan_internal)
 strong_alias (__isnan, __isnanf)
+strong_alias (__isnanf, __isnanf_internal)
 strong_alias (__isnan, __isnanl)
+strong_alias (__isnanl, __isnanl_internal)
 
 weak_alias (__isnan, isnan)
 weak_alias (__isnanf, isnanf)
diff --git a/sysdeps/ieee754/dbl-64/s_isinf.c b/sysdeps/ieee754/dbl-64/s_isinf.c
index 4f063d09c5..ab509a00ae 100644
--- a/sysdeps/ieee754/dbl-64/s_isinf.c
+++ b/sysdeps/ieee754/dbl-64/s_isinf.c
@@ -25,8 +25,10 @@ __isinf (double x)
 	lx |= -lx;
 	return ~(lx >> 31) & (hx >> 30);
 }
+INTDEF(__isinf)
 weak_alias (__isinf, isinf)
 #ifdef NO_LONG_DOUBLE
 strong_alias (__isinf, __isinfl)
+INTDEF(__isinfl)
 weak_alias (__isinf, isinfl)
 #endif
diff --git a/sysdeps/ieee754/dbl-64/s_isnan.c b/sysdeps/ieee754/dbl-64/s_isnan.c
index 86301e1531..27f8565457 100644
--- a/sysdeps/ieee754/dbl-64/s_isnan.c
+++ b/sysdeps/ieee754/dbl-64/s_isnan.c
@@ -36,8 +36,10 @@ static char rcsid[] = "$NetBSD: s_isnan.c,v 1.8 1995/05/10 20:47:36 jtc Exp $";
 	hx = 0x7ff00000 - hx;
 	return (int)(((u_int32_t)hx)>>31);
 }
+INTDEF(__isnan)
 weak_alias (__isnan, isnan)
 #ifdef NO_LONG_DOUBLE
 strong_alias (__isnan, __isnanl)
+INTDEF(__isnanl)
 weak_alias (__isnan, isnanl)
 #endif
diff --git a/sysdeps/ieee754/flt-32/s_isinff.c b/sysdeps/ieee754/flt-32/s_isinff.c
index efc0935251..2bf2364426 100644
--- a/sysdeps/ieee754/flt-32/s_isinff.c
+++ b/sysdeps/ieee754/flt-32/s_isinff.c
@@ -25,4 +25,5 @@ __isinff (float x)
 	t |= -t;
 	return ~(t >> 31) & (ix >> 30);
 }
+INTDEF(__isinff)
 weak_alias (__isinff, isinff)
diff --git a/sysdeps/ieee754/flt-32/s_isnanf.c b/sysdeps/ieee754/flt-32/s_isnanf.c
index 9ec412fd66..93a3c3f200 100644
--- a/sysdeps/ieee754/flt-32/s_isnanf.c
+++ b/sysdeps/ieee754/flt-32/s_isnanf.c
@@ -8,7 +8,7 @@
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice 
+ * software is freely granted, provided that this notice
  * is preserved.
  * ====================================================
  */
@@ -38,4 +38,5 @@ static char rcsid[] = "$NetBSD: s_isnanf.c,v 1.4 1995/05/10 20:47:38 jtc Exp $";
 	ix = 0x7f800000 - ix;
 	return (int)(((u_int32_t)(ix))>>31);
 }
+INTDEF(__isnanf)
 weak_alias (__isnanf, isnanf)
diff --git a/sysdeps/ieee754/ldbl-128/s_isinfl.c b/sysdeps/ieee754/ldbl-128/s_isinfl.c
index 038c294c79..2867e903f5 100644
--- a/sysdeps/ieee754/ldbl-128/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-128/s_isinfl.c
@@ -25,4 +25,5 @@ __isinfl (long double x)
 	lx |= -lx;
 	return ~(lx >> 63) & (hx >> 62);
 }
+INTDEF(__isinfl)
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/ieee754/ldbl-128/s_isnanl.c b/sysdeps/ieee754/ldbl-128/s_isnanl.c
index d2fb4038ce..ea701fefb8 100644
--- a/sysdeps/ieee754/ldbl-128/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-128/s_isnanl.c
@@ -39,4 +39,5 @@ static char rcsid[] = "$NetBSD: $";
 	hx = 0x7fff000000000000LL - hx;
 	return (int)((u_int64_t)hx>>63);
 }
+INTDEF(__isnanl)
 weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/ieee754/ldbl-96/s_isinfl.c b/sysdeps/ieee754/ldbl-96/s_isinfl.c
index 6f7c07c5af..919c2ff3f8 100644
--- a/sysdeps/ieee754/ldbl-96/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-96/s_isinfl.c
@@ -26,4 +26,5 @@ __isinfl (long double x)
 	se &= 0x8000;
 	return ~(lx >> 31) & (1 - (se >> 14));
 }
+INTDEF(__isinfl)
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/m68k/fpu/s_isinf.c b/sysdeps/m68k/fpu/s_isinf.c
index e654e880e3..98a7c62a91 100644
--- a/sysdeps/m68k/fpu/s_isinf.c
+++ b/sysdeps/m68k/fpu/s_isinf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -34,5 +34,6 @@ __CONCATX(__,FUNC) (x)
   return __m81_u(__CONCATX(__,FUNC))(x);
 }
 
+INTDEF(__CONCATX(__,FUNC))
 #define weak_aliasx(a,b) weak_alias(a,b)
 weak_aliasx (__CONCATX(__,FUNC), FUNC)
diff --git a/sysdeps/m68k/s_isinfl.c b/sysdeps/m68k/s_isinfl.c
index 40e0b791d5..89880bc4e4 100644
--- a/sysdeps/m68k/s_isinfl.c
+++ b/sysdeps/m68k/s_isinfl.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995, 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -42,4 +42,5 @@ __isinfl (long double value)
   return 0;
 }
 
+INTDEF(__isinfl)
 weak_alias (__isinfl, isinfl);
diff --git a/sysdeps/powerpc/fpu/s_isnan.c b/sysdeps/powerpc/fpu/s_isnan.c
index 038819b84e..14d586d6e4 100644
--- a/sysdeps/powerpc/fpu/s_isnan.c
+++ b/sysdeps/powerpc/fpu/s_isnan.c
@@ -1,5 +1,5 @@
 /* Return 1 if argument is a NaN, else 0.
-   Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,6 +36,7 @@ __isnan (x)
   fesetenv_register (savedstate);
   return result;
 }
+INTDEF(__isnan)
 weak_alias (__isnan, isnan)
 
 /* It turns out that the 'double' version will also always work for
@@ -43,9 +44,11 @@ weak_alias (__isnan, isnan)
 #undef __isnanf
 #undef isnanf
 strong_alias (__isnan, __isnanf)
+INTDEF(__isnanf)
 weak_alias (__isnanf, isnanf)
 
 #ifdef NO_LONG_DOUBLE
 strong_alias (__isnan, __isnanl)
+INTDEF(__isnanl)
 weak_alias (__isnan, isnanl)
 #endif