Update.

2002-09-09  Jakub Jelinek  <jakub@redhat.com>

	* include/math.h (__finite_internal, __finitef_internal,
	__finitel_internal, __isinf_internal, __isnan_internal): Remove.
	(isfinite): Remove.
	(__finite, __isinf, __isnan, __finitef, __isinff, __isnanf, __finitel,
	__isinfl, __isnanl): Add hidden_proto.
	(__fpclassify, __fpclassifyf, __fpclassifyl, __expm1l): Add
	libm_hidden_proto.
	* math/Makefile (libm-calls): Add s_isinf and s_isnan.
	* stdio-common/printf_fp.c (__printf_fp): Remove INTUSE from
	__is{inf,nan} calls.
	* stdio-common/printf_size.c (printf_size): Likewise.
	* sysdeps/generic/printf_fphex.c (__printf_fphex): Likewise.
	* sysdeps/generic/s_ldexp.c (__ldexp): Likewise.
	* sysdeps/generic/s_ldexpf.c (__ldexpf): Likewise.
	* sysdeps/generic/s_ldexpl.c (__ldexpl): Likewise.
	* sysdeps/generic/s_expm1l.c (__expm1l): Add libm_hidden_def.
	* sysdeps/i386/fpu/s_finite.S (__finite_internal): Remove alias.
	(__finite): Add hidden_def.
	* sysdeps/i386/fpu/s_finitef.S (__finitef_internal): Remove alias.
	(__finitef): Add hidden_def.
	* sysdeps/i386/fpu/s_finitel.S (__finitel_internal): Remove alias.
	(__finitel): Add hidden_def.
	* sysdeps/i386/fpu/s_isinfl.c (__isinfl): Remove INTDEF.  Add
	hidden_def.
	* sysdeps/i386/fpu/s_isnanl.c (__isnanl): Likewise.
	* sysdeps/i386/fpu/s_fpclassifyl.c (__fpclassifyl): Add
	libm_hidden_def.
	* sysdeps/i386/fpu/s_expm1l.S (__expm1l): Likewise.
	* sysdeps/ieee754/dbl-64/s_finite.c (__finite): Remove INTDEF.  Add
	hidden_def.
	* sysdeps/ieee754/dbl-64/s_isinf.c (__isinf): Likewise.
	(__isinfl): Remove INTDEF.
	* sysdeps/ieee754/dbl-64/s_isnan.c (__isnan): Remove INTDEF.  Add
	hidden_def.
	(__isnanl): Remove INTDEF.
	* sysdeps/ieee754/dbl-64/s_fpclassify.c (__fpclassify): Add
	libm_hidden_def.
	* sysdeps/ieee754/dbl-64/e_lgamma_r.c (sin_pi): Use __sin and __cos
	instead of sin and cos.
	* sysdeps/ieee754/flt-32/s_finitef.c (__finitef): Remove INTDEF.
	Add hidden_def.
	* sysdeps/ieee754/flt-32/s_isinff.c (__isinff): Likewise.
	* sysdeps/ieee754/flt-32/s_isnanf.c (__isnanf): Likewise.
	* sysdeps/ieee754/flt-32/s_fpclassifyf.c (__fpclassifyf): Add
	libm_hidden_def.
	* sysdeps/ieee754/ldbl-128/s_finitel.c (__finitel): Remove INTDEF.
	Add hidden_def.
	* sysdeps/ieee754/ldbl-128/s_isinfl.c (__isinfl): Likewise.
	* sysdeps/ieee754/ldbl-128/s_isnanl.c (__isnanl): Likewise.
	* sysdeps/ieee754/ldbl-128/s_fpclassifyl.c (__fpclassifyl): Add
	libm_hidden_def.
	* sysdeps/ieee754/ldbl-128/s_expm1l.c (__expm1l): Add
	libm_hidden_def.
	* sysdeps/ieee754/ldbl-96/s_finitel.c (__finitel): Remove INTDEF.
	Add hidden_def.
	* sysdeps/ieee754/ldbl-96/s_isinfl.c (__isinfl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_isnanl.c (__isnanl): Likewise.
	* sysdeps/ieee754/ldbl-96/s_fpclassifyl.c (__fpclassifyl): Add
	libm_hidden_def.
	* sysdeps/ia64/fpu/s_finite.S (__finite_internal, __finitef_internal,
	__finitel_internal): Remove aliases.
	(__finite, __finitef, __finitel): Add hidden_def.
	* sysdeps/ia64/fpu/s_isnan.S (__isnan_internal, __isnanf_internal,
	__isnanl_internal): Remove aliases.
	(__isnan, __isnanf, __isnanl): Add hidden_def.
	* sysdeps/ia64/fpu/s_isinf.S (__isinf_internal, __isinff_internal,
	__isinfl_internal): Remove aliases.
	(__isinf, __isinff, __isinfl): Add hidden_def.
	* sysdeps/ia64/fpu/s_fpclassify.S (__fpclassify, __fpclassifyf,
	__fpclassifyl): Add libm_hidden_def.
	* sysdeps/ia64/fpu/s_expm1l.S (__expm1l): Likewise.
	* sysdeps/m68k/s_isinfl.c (__isinfl): Remove INTDEF.  Add hidden_def.
	* sysdeps/m68k/fpu/s_isinf.c (INTDEFX): Remove.
	(hidden_defx): Define and use.
	* sysdeps/m68k/fpu/s_fpclassifyl.c (__fpclassifyl): Add
	libm_hidden_def.
	* sysdeps/m68k/fpu/s_expm1l.c (__expm1l): Likewise.
	* sysdeps/m68k/s_isnanl.c (__isnanl): Add hidden_def.
	* sysdeps/powerpc/fpu/s_isnan.c (__isnan, __isnanf, __isnanl):
	Remove INTDEF.
	(__isnan, __isnanf): Add hidden_def.
	* sysdeps/x86_64/fpu/s_finitel.S (__finitel_internal): Remove alias.
	(__finitel): Add libm_hidden_def.
	* sysdeps/x86_64/fpu/s_expm1l.S (__expm1l): Likewise.

	* include/fenv.h (feraiseexcept, fesetenv): Add libm_hidden_proto.
	* sysdeps/alpha/fpu/fesetenv.c (fesetenv): Add libm_hidden_ver.
	* sysdeps/alpha/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/arm/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/arm/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/generic/fesetenv.c (fesetenv): Likewise.
	* sysdeps/generic/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/i386/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/i386/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/m68k/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/mips/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/mips/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/powerpc/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/powerpc/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/sparc/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/sparc/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/hppa/fpu/fesetenv.c (fesetenv): Add libm_hidden_def.
	* sysdeps/hppa/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/ia64/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/sh/sh4/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/sh/sh4/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/s390/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/s390/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
	* sysdeps/x86_64/fpu/fesetenv.c (fesetenv): Likewise.
	* sysdeps/x86_64/fpu/fraiseexcpt.c (feraiseexcept): Likewise.

75 files changed, 280 insertions, 146 deletions

diff --git a/ChangeLog b/ChangeLog
index 49472e0..424a83b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,118 @@
+2002-09-09  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/math.h (__finite_internal, __finitef_internal,
+	__finitel_internal, __isinf_internal, __isnan_internal): Remove.
+	(isfinite): Remove.
+	(__finite, __isinf, __isnan, __finitef, __isinff, __isnanf, __finitel,
+	__isinfl, __isnanl): Add hidden_proto.
+	(__fpclassify, __fpclassifyf, __fpclassifyl, __expm1l): Add
+	libm_hidden_proto.
+	* math/Makefile (libm-calls): Add s_isinf and s_isnan.
+	* stdio-common/printf_fp.c (__printf_fp): Remove INTUSE from
+	__is{inf,nan} calls.
+	* stdio-common/printf_size.c (printf_size): Likewise.
+	* sysdeps/generic/printf_fphex.c (__printf_fphex): Likewise.
+	* sysdeps/generic/s_ldexp.c (__ldexp): Likewise.
+	* sysdeps/generic/s_ldexpf.c (__ldexpf): Likewise.
+	* sysdeps/generic/s_ldexpl.c (__ldexpl): Likewise.
+	* sysdeps/generic/s_expm1l.c (__expm1l): Add libm_hidden_def.
+	* sysdeps/i386/fpu/s_finite.S (__finite_internal): Remove alias.
+	(__finite): Add hidden_def.
+	* sysdeps/i386/fpu/s_finitef.S (__finitef_internal): Remove alias.
+	(__finitef): Add hidden_def.
+	* sysdeps/i386/fpu/s_finitel.S (__finitel_internal): Remove alias.
+	(__finitel): Add hidden_def.
+	* sysdeps/i386/fpu/s_isinfl.c (__isinfl): Remove INTDEF.  Add
+	hidden_def.
+	* sysdeps/i386/fpu/s_isnanl.c (__isnanl): Likewise.
+	* sysdeps/i386/fpu/s_fpclassifyl.c (__fpclassifyl): Add
+	libm_hidden_def.
+	* sysdeps/i386/fpu/s_expm1l.S (__expm1l): Likewise.
+	* sysdeps/ieee754/dbl-64/s_finite.c (__finite): Remove INTDEF.  Add
+	hidden_def.
+	* sysdeps/ieee754/dbl-64/s_isinf.c (__isinf): Likewise.
+	(__isinfl): Remove INTDEF.
+	* sysdeps/ieee754/dbl-64/s_isnan.c (__isnan): Remove INTDEF.  Add
+	hidden_def.
+	(__isnanl): Remove INTDEF.
+	* sysdeps/ieee754/dbl-64/s_fpclassify.c (__fpclassify): Add
+	libm_hidden_def.
+	* sysdeps/ieee754/dbl-64/e_lgamma_r.c (sin_pi): Use __sin and __cos
+	instead of sin and cos.
+	* sysdeps/ieee754/flt-32/s_finitef.c (__finitef): Remove INTDEF.
+	Add hidden_def.
+	* sysdeps/ieee754/flt-32/s_isinff.c (__isinff): Likewise.
+	* sysdeps/ieee754/flt-32/s_isnanf.c (__isnanf): Likewise.
+	* sysdeps/ieee754/flt-32/s_fpclassifyf.c (__fpclassifyf): Add
+	libm_hidden_def.
+	* sysdeps/ieee754/ldbl-128/s_finitel.c (__finitel): Remove INTDEF.
+	Add hidden_def.
+	* sysdeps/ieee754/ldbl-128/s_isinfl.c (__isinfl): Likewise.
+	* sysdeps/ieee754/ldbl-128/s_isnanl.c (__isnanl): Likewise.
+	* sysdeps/ieee754/ldbl-128/s_fpclassifyl.c (__fpclassifyl): Add
+	libm_hidden_def.
+	* sysdeps/ieee754/ldbl-128/s_expm1l.c (__expm1l): Add
+	libm_hidden_def.
+	* sysdeps/ieee754/ldbl-96/s_finitel.c (__finitel): Remove INTDEF.
+	Add hidden_def.
+	* sysdeps/ieee754/ldbl-96/s_isinfl.c (__isinfl): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_isnanl.c (__isnanl): Likewise.
+	* sysdeps/ieee754/ldbl-96/s_fpclassifyl.c (__fpclassifyl): Add
+	libm_hidden_def.
+	* sysdeps/ia64/fpu/s_finite.S (__finite_internal, __finitef_internal,
+	__finitel_internal): Remove aliases.
+	(__finite, __finitef, __finitel): Add hidden_def.
+	* sysdeps/ia64/fpu/s_isnan.S (__isnan_internal, __isnanf_internal,
+	__isnanl_internal): Remove aliases.
+	(__isnan, __isnanf, __isnanl): Add hidden_def.
+	* sysdeps/ia64/fpu/s_isinf.S (__isinf_internal, __isinff_internal,
+	__isinfl_internal): Remove aliases.
+	(__isinf, __isinff, __isinfl): Add hidden_def.
+	* sysdeps/ia64/fpu/s_fpclassify.S (__fpclassify, __fpclassifyf,
+	__fpclassifyl): Add libm_hidden_def.
+	* sysdeps/ia64/fpu/s_expm1l.S (__expm1l): Likewise.
+	* sysdeps/m68k/s_isinfl.c (__isinfl): Remove INTDEF.  Add hidden_def.
+	* sysdeps/m68k/fpu/s_isinf.c (INTDEFX): Remove.
+	(hidden_defx): Define and use.
+	* sysdeps/m68k/fpu/s_fpclassifyl.c (__fpclassifyl): Add
+	libm_hidden_def.
+	* sysdeps/m68k/fpu/s_expm1l.c (__expm1l): Likewise.
+	* sysdeps/m68k/s_isnanl.c (__isnanl): Add hidden_def.
+	* sysdeps/powerpc/fpu/s_isnan.c (__isnan, __isnanf, __isnanl):
+	Remove INTDEF.
+	(__isnan, __isnanf): Add hidden_def.
+	* sysdeps/x86_64/fpu/s_finitel.S (__finitel_internal): Remove alias.
+	(__finitel): Add libm_hidden_def.
+	* sysdeps/x86_64/fpu/s_expm1l.S (__expm1l): Likewise.
+
+	* include/fenv.h (feraiseexcept, fesetenv): Add libm_hidden_proto.
+	* sysdeps/alpha/fpu/fesetenv.c (fesetenv): Add libm_hidden_ver.
+	* sysdeps/alpha/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/arm/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/arm/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/generic/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/generic/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/i386/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/i386/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/m68k/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/m68k/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/mips/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/mips/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/powerpc/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/powerpc/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/sparc/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/sparc/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/hppa/fpu/fesetenv.c (fesetenv): Add libm_hidden_def.
+	* sysdeps/hppa/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/ia64/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/sh/sh4/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/sh/sh4/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/s390/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/s390/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+	* sysdeps/x86_64/fpu/fesetenv.c (fesetenv): Likewise.
+	* sysdeps/x86_64/fpu/fraiseexcpt.c (feraiseexcept): Likewise.
+
 2002-09-09  Steven Munroe  <sjmunroe@us.ibm.com>
 
 	* elf/elf.h: Add powerpc64 specific elf relocation and dynamic types.
diff --git a/include/fenv.h b/include/fenv.h
index b7db444..2063091 100644
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -11,4 +11,7 @@ extern int __fegetenv (fenv_t *__envp);
 extern int __fesetenv (__const fenv_t *__envp);
 extern int __feupdateenv (__const fenv_t *__envp);
 
+libm_hidden_proto (feraiseexcept)
+libm_hidden_proto (fesetenv)
+
 #endif
diff --git a/include/math.h b/include/math.h
index 1dd1a14..1005804 100644
--- a/include/math.h
+++ b/include/math.h
@@ -5,40 +5,27 @@
 /* Now define the internal interfaces.  */
 extern int __matherr (struct exception *__exc);
 
-extern int __finite_internal (double __value)
-     __attribute__ ((__const__)) attribute_hidden;
-extern int __finitef_internal (float __value)
-     __attribute__ ((__const__)) attribute_hidden;
-
-extern int __isinf_internal (double __value)
-     __attribute__ ((__const__)) attribute_hidden;
-extern int __isnan_internal (double __value)
-     __attribute__ ((__const__)) attribute_hidden;
-
-#ifndef __NO_LONG_DOUBLE_MATH
-extern int __finitel_internal (long double __value)
-     __attribute__ ((__const__)) attribute_hidden;
+# if !defined NOT_IN_libc || defined IS_IN_libm
+hidden_proto (__finite)
+hidden_proto (__isinf)
+hidden_proto (__isnan)
+hidden_proto (__finitef)
+hidden_proto (__isinff)
+hidden_proto (__isnanf)
+
+#  ifndef __NO_LONG_DOUBLE_MATH
+hidden_proto (__finitel)
+hidden_proto (__isinfl)
+hidden_proto (__isnanl)
+#  endif
+# endif
 
-extern int __isinfl_internal (long double __value)
-     __attribute__ ((__const__)) attribute_hidden;
-extern int __isnanl_internal (long double __value)
-     __attribute__ ((__const__)) attribute_hidden;
-#endif
+libm_hidden_proto (__fpclassify)
+libm_hidden_proto (__fpclassifyf)
 
-#if !defined NOT_IN_libc || defined IS_IN_libm
-# undef isfinite
-# ifdef __NO_LONG_DOUBLE_MATH
-#  define isfinite(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? INTUSE(__finitef) (x) : INTUSE(__finite) (x))
-# else
-#  define isfinite(x) \
-     (sizeof (x) == sizeof (float)					      \
-      ? INTUSE(__finitef) (x)						      \
-      : sizeof (x) == sizeof (double)					      \
-      ? INTUSE(__finite) (x) : INTUSE(__finitel) (x))
+# ifndef __NO_LONG_DOUBLE_MATH
+libm_hidden_proto (__fpclassifyl)
+libm_hidden_proto (__expm1l)
 # endif
-#endif
-
 
 #endif
diff --git a/math/Makefile b/math/Makefile
index d59b054..045cdb2 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -57,7 +57,8 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod	\
 	     conj cimag creal cabs carg s_cexp s_csinh s_ccosh s_clog	\
 	     s_catan s_casin s_ccos s_csin s_ctan s_ctanh s_cacos	\
 	     s_casinh s_cacosh s_catanh s_csqrt s_cpow s_cproj s_clog10 \
-	     s_fma s_lrint s_llrint s_lround s_llround e_exp10 w_log2
+	     s_fma s_lrint s_llrint s_lround s_llround e_exp10 w_log2	\
+	     s_isinf s_isnan
 dbl-only-routines := branred doasin dosincos halfulp mpa mpatan2	\
 		     mpatan mpexp mplog mpsqrt mptan sincos32 slowexp	\
 		     slowpow
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index de51136..b8813aa 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -318,7 +318,7 @@ __printf_fp (FILE *fp,
       fpnum.ldbl = *(const long double *) args[0];
 
       /* Check for special values: not a number or infinity.  */
-      if (INTUSE(__isnanl) (fpnum.ldbl))
+      if (__isnanl (fpnum.ldbl))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -332,7 +332,7 @@ __printf_fp (FILE *fp,
 	      }
 	  is_neg = 0;
 	}
-      else if (INTUSE(__isinfl) (fpnum.ldbl))
+      else if (__isinfl (fpnum.ldbl))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -362,7 +362,7 @@ __printf_fp (FILE *fp,
       fpnum.dbl = *(const double *) args[0];
 
       /* Check for special values: not a number or infinity.  */
-      if (INTUSE(__isnan) (fpnum.dbl))
+      if (__isnan (fpnum.dbl))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -376,7 +376,7 @@ __printf_fp (FILE *fp,
 	    }
 	  is_neg = 0;
 	}
-      else if (INTUSE(__isinf) (fpnum.dbl))
+      else if (__isinf (fpnum.dbl))
 	{
 	  if (isupper (info->spec))
 	    {
diff --git a/stdio-common/printf_size.c b/stdio-common/printf_size.c
index cfb2c94..4f2807b 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 (INTUSE(__isnanl) (fpnum.ldbl.d))
+      if (__isnanl (fpnum.ldbl.d))
 	{
 	  special = "nan";
 	  wspecial = L"nan";
 	  negative = 0;
 	}
-      else if (INTUSE(__isinfl) (fpnum.ldbl.d))
+      else if (__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 (INTUSE(__isnan) (fpnum.dbl.d))
+      if (__isnan (fpnum.dbl.d))
 	{
 	  special = "nan";
 	  wspecial = L"nan";
 	  negative = 0;
 	}
-      else if (INTUSE(__isinf) (fpnum.dbl.d))
+      else if (__isinf (fpnum.dbl.d))
 	{
 	  special = "inf";
 	  wspecial = L"inf";
diff --git a/sysdeps/alpha/fpu/fesetenv.c b/sysdeps/alpha/fpu/fesetenv.c
index 63b7240..c76e882 100644
--- a/sysdeps/alpha/fpu/fesetenv.c
+++ b/sysdeps/alpha/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <rth@tamu.edu>, 1997
 
@@ -53,4 +53,5 @@ strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
diff --git a/sysdeps/alpha/fpu/fraiseexcpt.c b/sysdeps/alpha/fpu/fraiseexcpt.c
index 7f18f39..7a589e4 100644
--- a/sysdeps/alpha/fpu/fraiseexcpt.c
+++ b/sysdeps/alpha/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997,98,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Richard Henderson <rth@tamu.edu>, 1997.
 
@@ -44,4 +44,5 @@ strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
diff --git a/sysdeps/arm/fpu/fesetenv.c b/sysdeps/arm/fpu/fesetenv.c
index 5bc1978..bb8812a 100644
--- a/sysdeps/arm/fpu/fesetenv.c
+++ b/sysdeps/arm/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997,98,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,01,02 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
@@ -41,4 +41,5 @@ strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
diff --git a/sysdeps/arm/fpu/fraiseexcpt.c b/sysdeps/arm/fpu/fraiseexcpt.c
index 75cd1ba..f7dede2 100644
--- a/sysdeps/arm/fpu/fraiseexcpt.c
+++ b/sysdeps/arm/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997,98,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,01,02 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
@@ -40,4 +40,5 @@ strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
diff --git a/sysdeps/generic/fesetenv.c b/sysdeps/generic/fesetenv.c
index 8727b40..936d6c1 100644
--- a/sysdeps/generic/fesetenv.c
+++ b/sysdeps/generic/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -31,6 +31,7 @@ __fesetenv (const fenv_t *envp)
 strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
 #endif
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
 
 stub_warning (fesetenv)
diff --git a/sysdeps/generic/fraiseexcpt.c b/sysdeps/generic/fraiseexcpt.c
index ca3aa7b..764634a 100644
--- a/sysdeps/generic/fraiseexcpt.c
+++ b/sysdeps/generic/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -31,6 +31,7 @@ __feraiseexcept (int excepts)
 strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
 
 stub_warning (feraiseexcept)
diff --git a/sysdeps/generic/printf_fphex.c b/sysdeps/generic/printf_fphex.c
index 794a1ab..7dfb116 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 (INTUSE(__isnanl) (fpnum.ldbl.d))
+      if (__isnanl (fpnum.ldbl.d))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -186,7 +186,7 @@ __printf_fphex (FILE *fp,
 	}
       else
 	{
-	  if (INTUSE(__isinfl) (fpnum.ldbl.d))
+	  if (__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 (INTUSE(__isnan) (fpnum.dbl.d))
+      if (__isnan (fpnum.dbl.d))
 	{
 	  if (isupper (info->spec))
 	    {
@@ -225,7 +225,7 @@ __printf_fphex (FILE *fp,
 	}
       else
 	{
-	  if (INTUSE(__isinf) (fpnum.dbl.d))
+	  if (__isinf (fpnum.dbl.d))
 	    {
 	      if (isupper (info->spec))
 		{
diff --git a/sysdeps/generic/s_expm1l.c b/sysdeps/generic/s_expm1l.c
index d49c68a..b69d6ae 100644
--- a/sysdeps/generic/s_expm1l.c
+++ b/sysdeps/generic/s_expm1l.c
@@ -9,6 +9,7 @@ __expm1l (long double x)
   __set_errno (ENOSYS);
   return 0.0;
 }
+libm_hidden_def (__expm1l)
 weak_alias (__expm1l, expm1l)
 
 stub_warning (expm1l)
diff --git a/sysdeps/generic/s_ldexp.c b/sysdeps/generic/s_ldexp.c
index 20c444f..12c336f 100644
--- a/sysdeps/generic/s_ldexp.c
+++ b/sysdeps/generic/s_ldexp.c
@@ -25,9 +25,9 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
 	double value; int exp;
 #endif
 {
-	if(!INTUSE(__finite)(value)||value==0.0) return value;
+	if(!__finite(value)||value==0.0) return value;
 	value = __scalbn(value,exp);
-	if(!INTUSE(__finite)(value)||value==0.0) __set_errno (ERANGE);
+	if(!__finite(value)||value==0.0) __set_errno (ERANGE);
 	return value;
 }
 weak_alias (__ldexp, ldexp)
diff --git a/sysdeps/generic/s_ldexpf.c b/sysdeps/generic/s_ldexpf.c
index 07f0c9e..631db42 100644
--- a/sysdeps/generic/s_ldexpf.c
+++ b/sysdeps/generic/s_ldexpf.c
@@ -28,9 +28,9 @@ static char rcsid[] = "$NetBSD: s_ldexpf.c,v 1.3 1995/05/10 20:47:42 jtc Exp $";
 	float value; int exp;
 #endif
 {
-	if(!INTUSE(__finitef)(value)||value==(float)0.0) return value;
+	if(!__finitef(value)||value==(float)0.0) return value;
 	value = __scalbnf(value,exp);
-	if(!INTUSE(__finitef)(value)||value==(float)0.0) __set_errno (ERANGE);
+	if(!__finitef(value)||value==(float)0.0) __set_errno (ERANGE);
 	return value;
 }
 INTDEF(__ldexpf)
diff --git a/sysdeps/generic/s_ldexpl.c b/sysdeps/generic/s_ldexpl.c
index a560398..123a6b3 100644
--- a/sysdeps/generic/s_ldexpl.c
+++ b/sysdeps/generic/s_ldexpl.c
@@ -29,9 +29,9 @@ static char rcsid[] = "$NetBSD: $";
 	long double value; int exp;
 #endif
 {
-	if(!INTUSE(__finitel)(value)||value==0.0) return value;
+	if(!__finitel(value)||value==0.0) return value;
 	value = __scalbnl(value,exp);
-	if(!INTUSE(__finitel)(value)||value==0.0) __set_errno (ERANGE);
+	if(!__finitel(value)||value==0.0) __set_errno (ERANGE);
 	return value;
 }
 weak_alias (__ldexpl, ldexpl)
diff --git a/sysdeps/hppa/fpu/fesetenv.c b/sysdeps/hppa/fpu/fesetenv.c
index f0c6856..2c79869 100644
--- a/sysdeps/hppa/fpu/fesetenv.c
+++ b/sysdeps/hppa/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Huggins-Daines <dhd@debian.org>, 2000
    Based on the m68k version by
@@ -68,3 +68,4 @@ fesetenv (const fenv_t *envp)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (fesetenv)
diff --git a/sysdeps/hppa/fpu/fraiseexcpt.c b/sysdeps/hppa/fpu/fraiseexcpt.c
index 5164bc4..a13668f 100644
--- a/sysdeps/hppa/fpu/fraiseexcpt.c
+++ b/sysdeps/hppa/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Huggins-Daines <dhd@debian.org>
 
@@ -88,3 +88,4 @@ feraiseexcept (int excepts)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (feraiseexcept)
diff --git a/sysdeps/i386/fpu/fesetenv.c b/sysdeps/i386/fpu/fesetenv.c
index 4dc0d91..667d508 100644
--- a/sysdeps/i386/fpu/fesetenv.c
+++ b/sysdeps/i386/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997,98,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -84,4 +84,5 @@ strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2);
diff --git a/sysdeps/i386/fpu/fraiseexcpt.c b/sysdeps/i386/fpu/fraiseexcpt.c
index ef5b0d2..be50e5e 100644
--- a/sysdeps/i386/fpu/fraiseexcpt.c
+++ b/sysdeps/i386/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -120,4 +120,5 @@ strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
diff --git a/sysdeps/i386/fpu/s_expm1l.S b/sysdeps/i386/fpu/s_expm1l.S
index c9e40fb..4d491c0 100644
--- a/sysdeps/i386/fpu/s_expm1l.S
+++ b/sysdeps/i386/fpu/s_expm1l.S
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of exp(x)-1.
-   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.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
    Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>.
@@ -85,4 +85,5 @@ ENTRY(__expm1l)
 	fldl	MO(minus1)	// Set result to -1.0.
 3:	ret
 END(__expm1l)
+libm_hidden_def (__expm1l)
 weak_alias (__expm1l, expm1l)
diff --git a/sysdeps/i386/fpu/s_finite.S b/sysdeps/i386/fpu/s_finite.S
index 52359ac..1ae4aed 100644
--- a/sysdeps/i386/fpu/s_finite.S
+++ b/sysdeps/i386/fpu/s_finite.S
@@ -12,5 +12,6 @@ ENTRY(__finite)
 	shrl	$31, %eax
 	ret
 END (__finite)
-strong_alias(__finite, __finite_internal)
 weak_alias (__finite, finite)
+hidden_def (__finite)
+
diff --git a/sysdeps/i386/fpu/s_finitef.S b/sysdeps/i386/fpu/s_finitef.S
index 98c6c59..69e72fa 100644
--- a/sysdeps/i386/fpu/s_finitef.S
+++ b/sysdeps/i386/fpu/s_finitef.S
@@ -12,5 +12,5 @@ ENTRY(__finitef)
 	shrl    $31,%eax
 	ret
 END (__finitef)
-strong_alias(__finitef, __finitef_internal)
 weak_alias (__finitef, finitef)
+hidden_def (__finitef)
diff --git a/sysdeps/i386/fpu/s_finitel.S b/sysdeps/i386/fpu/s_finitel.S
index b473443..cce90e1 100644
--- a/sysdeps/i386/fpu/s_finitel.S
+++ b/sysdeps/i386/fpu/s_finitel.S
@@ -11,5 +11,5 @@ ENTRY(__finitel)
 	shrl	$31, %eax
 	ret
 END (__finitel)
-strong_alias(__finitel, __finitel_internal)
 weak_alias (__finitel, finitel)
+hidden_def (__finitel)
diff --git a/sysdeps/i386/fpu/s_fpclassifyl.c b/sysdeps/i386/fpu/s_fpclassifyl.c
index 4ce06fd..679e721 100644
--- a/sysdeps/i386/fpu/s_fpclassifyl.c
+++ b/sysdeps/i386/fpu/s_fpclassifyl.c
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.
-   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.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -40,3 +40,4 @@ __fpclassifyl (long double x)
 
   return retval;
 }
+libm_hidden_def (__fpclassifyl)
diff --git a/sysdeps/i386/fpu/s_isinfl.c b/sysdeps/i386/fpu/s_isinfl.c
index 29b3aef..72e4ae8 100644
--- a/sysdeps/i386/fpu/s_isinfl.c
+++ b/sysdeps/i386/fpu/s_isinfl.c
@@ -33,5 +33,5 @@ static char rcsid[] = "$NetBSD: $";
 	se &= 0x8000;
 	return ~(lx >> 31) & (1 - (se >> 14));
 }
-INTDEF(__isinfl)
+hidden_def (__isinfl)
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/i386/fpu/s_isnanl.c b/sysdeps/i386/fpu/s_isnanl.c
index ac034a6..aa45995 100644
--- a/sysdeps/i386/fpu/s_isnanl.c
+++ b/sysdeps/i386/fpu/s_isnanl.c
@@ -44,5 +44,5 @@ static char rcsid[] = "$NetBSD: $";
 	se = 0xfffe - se;
 	return (int)((u_int32_t)(se))>>16;
 }
-INTDEF(__isnanl)
+hidden_def (__isnanl)
 weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/ia64/fpu/fesetenv.c b/sysdeps/ia64/fpu/fesetenv.c
index 51d053f..4c5c2ed 100644
--- a/sysdeps/ia64/fpu/fesetenv.c
+++ b/sysdeps/ia64/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jes Sorensen <Jes.Sorensen@cern.ch>, 2000
 
@@ -39,3 +39,4 @@ fesetenv (const fenv_t *envp)
 
   return 0;
 }
+libm_hidden_def (fesetenv)
diff --git a/sysdeps/ia64/fpu/fraiseexcpt.c b/sysdeps/ia64/fpu/fraiseexcpt.c
index 08510be..862b2b8 100644
--- a/sysdeps/ia64/fpu/fraiseexcpt.c
+++ b/sysdeps/ia64/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jes Sorensen <Jes.Sorensen@cern.ch>, 2000.
 
@@ -77,3 +77,4 @@ feraiseexcept (int excepts)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (feraiseexcept)
diff --git a/sysdeps/ia64/fpu/s_expm1l.S b/sysdeps/ia64/fpu/s_expm1l.S
index 1c220c4..e53d3c8 100644
--- a/sysdeps/ia64/fpu/s_expm1l.S
+++ b/sysdeps/ia64/fpu/s_expm1l.S
@@ -565,6 +565,10 @@ alloc r32 = ar.pfs,0,30,4,0
 .endp expm1l
 ASM_SIZE_DIRECTIVE(expm1l)
 
+#ifdef _LIBC
+libm_hidden_def (__expm1l)
+#endif
+
 .section .text
 .proc expl#
 .global expl#
diff --git a/sysdeps/ia64/fpu/s_finite.S b/sysdeps/ia64/fpu/s_finite.S
index 5ec7e8e..78d3db5 100644
--- a/sysdeps/ia64/fpu/s_finite.S
+++ b/sysdeps/ia64/fpu/s_finite.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.
+/* Copyright (C) 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
@@ -33,12 +33,13 @@ ENTRY (__finite)
 }	
 END (__finite)
 
-strong_alias (__finite, __finite_internal)
 strong_alias (__finite, __finitef)
-strong_alias (__finitef, __finitef_internal)
 strong_alias (__finite, __finitel)
-strong_alias (__finitel, __finitel_internal)
 
 weak_alias (__finite, finite)
 weak_alias (__finitef, finitef)
 weak_alias (__finitel, finitel)
+
+hidden_def (__finite)
+hidden_def (__finitef)
+hidden_def (__finitel)
diff --git a/sysdeps/ia64/fpu/s_fpclassify.S b/sysdeps/ia64/fpu/s_fpclassify.S
index 3538d37..a9df24a 100644
--- a/sysdeps/ia64/fpu/s_fpclassify.S
+++ b/sysdeps/ia64/fpu/s_fpclassify.S
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -57,3 +57,6 @@ END (__fpclassify)
 
 strong_alias (__fpclassify, __fpclassifyf)
 strong_alias (__fpclassify, __fpclassifyl)
+libm_hidden_def (__fpclassify)
+libm_hidden_def (__fpclassifyf)
+libm_hidden_def (__fpclassifyl)
diff --git a/sysdeps/ia64/fpu/s_isinf.S b/sysdeps/ia64/fpu/s_isinf.S
index 1045d5d..e435edf 100644
--- a/sysdeps/ia64/fpu/s_isinf.S
+++ b/sysdeps/ia64/fpu/s_isinf.S
@@ -46,12 +46,13 @@ ENTRY (__isinf)
 }
 END (__isinf)
 
-strong_alias (__isinf, __isinf_internal)
 strong_alias (__isinf, __isinff)
-strong_alias (__isinff, __isinff_internal)
 strong_alias (__isinf, __isinfl)
-strong_alias (__isinfl, __isinfl_internal)
 
 weak_alias (__isinf, isinf)
 weak_alias (__isinff, isinff)
 weak_alias (__isinfl, isinfl)
+
+hidden_def (__isinf)
+hidden_def (__isinff)
+hidden_def (__isinfl)
diff --git a/sysdeps/ia64/fpu/s_isnan.S b/sysdeps/ia64/fpu/s_isnan.S
index 2a9c3dd..83fd54f 100644
--- a/sysdeps/ia64/fpu/s_isnan.S
+++ b/sysdeps/ia64/fpu/s_isnan.S
@@ -39,12 +39,13 @@ ENTRY (__isnan)
 }
 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)
 weak_alias (__isnanl, isnanl)
+
+hidden_def (__isnan)
+hidden_def (__isnanf)
+hidden_def (__isnanl)
diff --git a/sysdeps/ieee754/dbl-64/e_lgamma_r.c b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
index 863eaa4..cc44b04 100644
--- a/sysdeps/ieee754/dbl-64/e_lgamma_r.c
+++ b/sysdeps/ieee754/dbl-64/e_lgamma_r.c
@@ -175,7 +175,7 @@ static double zero=  0.00000000000000000000e+00;
 	GET_HIGH_WORD(ix,x);
 	ix &= 0x7fffffff;
 
-	if(ix<0x3fd00000) return sin(pi*x);
+	if(ix<0x3fd00000) return __sin(pi*x);
 	y = -x;		/* x is assume negative */
 
     /*
@@ -199,14 +199,14 @@ static double zero=  0.00000000000000000000e+00;
             }
         }
 	switch (n) {
-	    case 0:   y =  sin(pi*y); break;
+	    case 0:   y =  __sin(pi*y); break;
 	    case 1:
-	    case 2:   y =  cos(pi*(0.5-y)); break;
+	    case 2:   y =  __cos(pi*(0.5-y)); break;
 	    case 3:
-	    case 4:   y =  sin(pi*(one-y)); break;
+	    case 4:   y =  __sin(pi*(one-y)); break;
 	    case 5:
-	    case 6:   y = -cos(pi*(y-1.5)); break;
-	    default:  y =  sin(pi*(y-2.0)); break;
+	    case 6:   y = -__cos(pi*(y-1.5)); break;
+	    default:  y =  __sin(pi*(y-2.0)); break;
 	    }
 	return -y;
 }
diff --git a/sysdeps/ieee754/dbl-64/s_finite.c b/sysdeps/ieee754/dbl-64/s_finite.c
index 2317f4a..90de0f9 100644
--- a/sysdeps/ieee754/dbl-64/s_finite.c
+++ b/sysdeps/ieee754/dbl-64/s_finite.c
@@ -22,8 +22,6 @@ static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $";
 #include "math.h"
 #include "math_private.h"
 
-#undef __finite
-
 #ifdef __STDC__
 	int __finite(double x)
 #else
@@ -35,7 +33,7 @@ static char rcsid[] = "$NetBSD: s_finite.c,v 1.8 1995/05/10 20:47:17 jtc Exp $";
 	GET_HIGH_WORD(hx,x);
 	return (int)((u_int32_t)((hx&0x7fffffff)-0x7ff00000)>>31);
 }
-INTDEF(__finite)
+hidden_def (__finite)
 weak_alias (__finite, finite)
 #ifdef NO_LONG_DOUBLE
 strong_alias (__finite, __finitel)
diff --git a/sysdeps/ieee754/dbl-64/s_fpclassify.c b/sysdeps/ieee754/dbl-64/s_fpclassify.c
index 8368ba4..b3a723e 100644
--- a/sysdeps/ieee754/dbl-64/s_fpclassify.c
+++ b/sysdeps/ieee754/dbl-64/s_fpclassify.c
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -41,3 +41,4 @@ __fpclassify (double x)
 
   return retval;
 }
+libm_hidden_def (__fpclassify)
diff --git a/sysdeps/ieee754/dbl-64/s_isinf.c b/sysdeps/ieee754/dbl-64/s_isinf.c
index ab509a0..24b29ae 100644
--- a/sysdeps/ieee754/dbl-64/s_isinf.c
+++ b/sysdeps/ieee754/dbl-64/s_isinf.c
@@ -25,10 +25,9 @@ __isinf (double x)
 	lx |= -lx;
 	return ~(lx >> 31) & (hx >> 30);
 }
-INTDEF(__isinf)
+hidden_def (__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 27f8565..3a089e9 100644
--- a/sysdeps/ieee754/dbl-64/s_isnan.c
+++ b/sysdeps/ieee754/dbl-64/s_isnan.c
@@ -36,10 +36,9 @@ 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)
+hidden_def (__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_finitef.c b/sysdeps/ieee754/flt-32/s_finitef.c
index 74019c7..65767f8 100644
--- a/sysdeps/ieee754/flt-32/s_finitef.c
+++ b/sysdeps/ieee754/flt-32/s_finitef.c
@@ -25,8 +25,6 @@ static char rcsid[] = "$NetBSD: s_finitef.c,v 1.4 1995/05/10 20:47:18 jtc Exp $"
 #include "math.h"
 #include "math_private.h"
 
-#undef __finitef
-
 #ifdef __STDC__
 	int __finitef(float x)
 #else
@@ -38,5 +36,5 @@ static char rcsid[] = "$NetBSD: s_finitef.c,v 1.4 1995/05/10 20:47:18 jtc Exp $"
 	GET_FLOAT_WORD(ix,x);
 	return (int)((u_int32_t)((ix&0x7fffffff)-0x7f800000)>>31);
 }
-INTDEF(__finitef)
+hidden_def (__finitef)
 weak_alias (__finitef, finitef)
diff --git a/sysdeps/ieee754/flt-32/s_fpclassifyf.c b/sysdeps/ieee754/flt-32/s_fpclassifyf.c
index f7f3b52..709bc2b 100644
--- a/sysdeps/ieee754/flt-32/s_fpclassifyf.c
+++ b/sysdeps/ieee754/flt-32/s_fpclassifyf.c
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.
-   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.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -40,3 +40,4 @@ __fpclassifyf (float x)
 
   return retval;
 }
+libm_hidden_def (__fpclassifyf)
diff --git a/sysdeps/ieee754/flt-32/s_isinff.c b/sysdeps/ieee754/flt-32/s_isinff.c
index 2bf2364..03a95fc 100644
--- a/sysdeps/ieee754/flt-32/s_isinff.c
+++ b/sysdeps/ieee754/flt-32/s_isinff.c
@@ -25,5 +25,5 @@ __isinff (float x)
 	t |= -t;
 	return ~(t >> 31) & (ix >> 30);
 }
-INTDEF(__isinff)
+hidden_def (__isinff)
 weak_alias (__isinff, isinff)
diff --git a/sysdeps/ieee754/flt-32/s_isnanf.c b/sysdeps/ieee754/flt-32/s_isnanf.c
index 93a3c3f..4ac16c2 100644
--- a/sysdeps/ieee754/flt-32/s_isnanf.c
+++ b/sysdeps/ieee754/flt-32/s_isnanf.c
@@ -38,5 +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)
+hidden_def (__isnanf)
 weak_alias (__isnanf, isnanf)
diff --git a/sysdeps/ieee754/ldbl-128/s_expm1l.c b/sysdeps/ieee754/ldbl-128/s_expm1l.c
index d3d85a4..f373e1e 100644
--- a/sysdeps/ieee754/ldbl-128/s_expm1l.c
+++ b/sysdeps/ieee754/ldbl-128/s_expm1l.c
@@ -157,5 +157,5 @@ __expm1l (long double x)
   x = px * qx + (px - 1.0);
   return x;
 }
-
+libm_hidden_def (__expm1l)
 weak_alias (__expm1l, expm1l)
diff --git a/sysdeps/ieee754/ldbl-128/s_finitel.c b/sysdeps/ieee754/ldbl-128/s_finitel.c
index a2372dc..e3b0a2b 100644
--- a/sysdeps/ieee754/ldbl-128/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-128/s_finitel.c
@@ -25,8 +25,6 @@ static char rcsid[] = "$NetBSD: $";
 #include "math.h"
 #include "math_private.h"
 
-#undef __finitel
-
 #ifdef __STDC__
 	int __finitel(long double x)
 #else
@@ -39,5 +37,5 @@ static char rcsid[] = "$NetBSD: $";
 	return (int)((u_int64_t)((hx&0x7fffffffffffffffLL)
 				 -0x7fff000000000000LL)>>63);
 }
-INTDEF(__finitel)
+hidden_def (__finitel)
 weak_alias (__finitel, finitel)
diff --git a/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c b/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c
index eacfba9..c66a2cb 100644
--- a/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c
+++ b/sysdeps/ieee754/ldbl-128/s_fpclassifyl.c
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997 and
    		  Jakub Jelinek <jj@ultra.linux.cz>, 1999.
@@ -42,3 +42,4 @@ __fpclassifyl (long double x)
 
   return retval;
 }
+libm_hidden_def (__fpclassifyl)
diff --git a/sysdeps/ieee754/ldbl-128/s_isinfl.c b/sysdeps/ieee754/ldbl-128/s_isinfl.c
index 2867e90..0b3526b 100644
--- a/sysdeps/ieee754/ldbl-128/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-128/s_isinfl.c
@@ -25,5 +25,5 @@ __isinfl (long double x)
 	lx |= -lx;
 	return ~(lx >> 63) & (hx >> 62);
 }
-INTDEF(__isinfl)
+hidden_def (__isinfl)
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/ieee754/ldbl-128/s_isnanl.c b/sysdeps/ieee754/ldbl-128/s_isnanl.c
index ea701fe..267ec8d 100644
--- a/sysdeps/ieee754/ldbl-128/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-128/s_isnanl.c
@@ -39,5 +39,5 @@ static char rcsid[] = "$NetBSD: $";
 	hx = 0x7fff000000000000LL - hx;
 	return (int)((u_int64_t)hx>>63);
 }
-INTDEF(__isnanl)
+hidden_def (__isnanl)
 weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/ieee754/ldbl-96/s_finitel.c b/sysdeps/ieee754/ldbl-96/s_finitel.c
index 3bbb21a..437ea87 100644
--- a/sysdeps/ieee754/ldbl-96/s_finitel.c
+++ b/sysdeps/ieee754/ldbl-96/s_finitel.c
@@ -26,8 +26,6 @@ static char rcsid[] = "$NetBSD: $";
 #include "math.h"
 #include "math_private.h"
 
-#undef __finitel
-
 #ifdef __STDC__
 	int __finitel(long double x)
 #else
@@ -39,5 +37,5 @@ static char rcsid[] = "$NetBSD: $";
 	GET_LDOUBLE_EXP(exp,x);
 	return (int)((u_int32_t)((exp&0x7fff)-0x7fff)>>31);
 }
-INTDEF(__finitel)
+hidden_def (__finitel)
 weak_alias (__finitel, finitel)
diff --git a/sysdeps/ieee754/ldbl-96/s_fpclassifyl.c b/sysdeps/ieee754/ldbl-96/s_fpclassifyl.c
index bd25748..7851c9a 100644
--- a/sysdeps/ieee754/ldbl-96/s_fpclassifyl.c
+++ b/sysdeps/ieee754/ldbl-96/s_fpclassifyl.c
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
    Fixed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>.
@@ -42,3 +42,4 @@ __fpclassifyl (long double x)
 
   return retval;
 }
+libm_hidden_def (__fpclassifyl)
diff --git a/sysdeps/ieee754/ldbl-96/s_isinfl.c b/sysdeps/ieee754/ldbl-96/s_isinfl.c
index 919c2ff..9583234 100644
--- a/sysdeps/ieee754/ldbl-96/s_isinfl.c
+++ b/sysdeps/ieee754/ldbl-96/s_isinfl.c
@@ -26,5 +26,5 @@ __isinfl (long double x)
 	se &= 0x8000;
 	return ~(lx >> 31) & (1 - (se >> 14));
 }
-INTDEF(__isinfl)
+hidden_def (__isinfl)
 weak_alias (__isinfl, isinfl)
diff --git a/sysdeps/ieee754/ldbl-96/s_isnanl.c b/sysdeps/ieee754/ldbl-96/s_isnanl.c
index 0a7ff38..5aa9414 100644
--- a/sysdeps/ieee754/ldbl-96/s_isnanl.c
+++ b/sysdeps/ieee754/ldbl-96/s_isnanl.c
@@ -41,4 +41,5 @@ static char rcsid[] = "$NetBSD: $";
 	se = 0xfffe - se;
 	return (int)(((u_int32_t)(se))>>31);
 }
+hidden_def (__isnanl)
 weak_alias (__isnanl, isnanl)
diff --git a/sysdeps/m68k/fpu/fesetenv.c b/sysdeps/m68k/fpu/fesetenv.c
index d3cac1c..20653f0 100644
--- a/sysdeps/m68k/fpu/fesetenv.c
+++ b/sysdeps/m68k/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 
@@ -56,4 +56,5 @@ strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
diff --git a/sysdeps/m68k/fpu/fraiseexcpt.c b/sysdeps/m68k/fpu/fraiseexcpt.c
index d410fde..69f746c 100644
--- a/sysdeps/m68k/fpu/fraiseexcpt.c
+++ b/sysdeps/m68k/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
 
@@ -79,4 +79,5 @@ strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
diff --git a/sysdeps/m68k/fpu/s_expm1l.c b/sysdeps/m68k/fpu/s_expm1l.c
index cd62cb3..feee07a 100644
--- a/sysdeps/m68k/fpu/s_expm1l.c
+++ b/sysdeps/m68k/fpu/s_expm1l.c
@@ -1,2 +1,3 @@
 #define FUNC expm1l
 #include <s_atanl.c>
+libm_hidden_def (__expm1l)
diff --git a/sysdeps/m68k/fpu/s_fpclassifyl.c b/sysdeps/m68k/fpu/s_fpclassifyl.c
index 9a38900..a8cb099 100644
--- a/sysdeps/m68k/fpu/s_fpclassifyl.c
+++ b/sysdeps/m68k/fpu/s_fpclassifyl.c
@@ -1,5 +1,5 @@
 /* Return classification value corresponding to argument.  m68k version.
-   Copyright (C) 1997,2001 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
    Fixed for m68k by Andreas Schwab <schwab@suse.de>.
@@ -41,3 +41,4 @@ __fpclassifyl (long double x)
 
   return retval;
 }
+libm_hidden_def (__fpclassifyl)
diff --git a/sysdeps/m68k/fpu/s_isinf.c b/sysdeps/m68k/fpu/s_isinf.c
index d87a231..5fb43ea 100644
--- a/sysdeps/m68k/fpu/s_isinf.c
+++ b/sysdeps/m68k/fpu/s_isinf.c
@@ -34,7 +34,7 @@ __CONCATX(__,FUNC) (x)
   return __m81_u(__CONCATX(__,FUNC))(x);
 }
 
-#define INTDEFX(a) INTDEF(a)
-INTDEFX(__CONCATX(__,FUNC))
+#define hidden_defx(a) hidden_def(a)
+hidden_defx(__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 89880bc..2502039 100644
--- a/sysdeps/m68k/s_isinfl.c
+++ b/sysdeps/m68k/s_isinfl.c
@@ -19,10 +19,6 @@
 #include <math.h>
 #include "ieee754.h"
 
-#undef __isinfl
-#undef isinfl
-
-
 /* Return 0 if VALUE is finite or NaN, +1 if it
    is +Infinity, -1 if it is -Infinity.  */
 int
@@ -42,5 +38,5 @@ __isinfl (long double value)
   return 0;
 }
 
-INTDEF(__isinfl)
+hidden_def (__isinfl)
 weak_alias (__isinfl, isinfl);
diff --git a/sysdeps/m68k/s_isnanl.c b/sysdeps/m68k/s_isnanl.c
index 0a9ddf9..999746f 100644
--- a/sysdeps/m68k/s_isnanl.c
+++ b/sysdeps/m68k/s_isnanl.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
@@ -19,10 +19,6 @@
 #include <math.h>
 #include "ieee754.h"
 
-#undef __isnanl
-#undef isnanl
-
-
 /* Return nonzero if VALUE is not a number.  */
 int
 __isnanl (long double value)
@@ -38,4 +34,5 @@ __isnanl (long double value)
 	  ((u.ieee.mantissa0 & 0x7fffffff) != 0 || u.ieee.mantissa1 != 0));
 }
 
+hidden_def (__isnanl)
 weak_alias (__isnanl, isnanl);
diff --git a/sysdeps/mips/fpu/fesetenv.c b/sysdeps/mips/fpu/fesetenv.c
index 6bd894a..197db5e 100644
--- a/sysdeps/mips/fpu/fesetenv.c
+++ b/sysdeps/mips/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1998.
 
@@ -45,4 +45,5 @@ __fesetenv (const fenv_t *envp)
 strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
 #endif
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
diff --git a/sysdeps/mips/fpu/fraiseexcpt.c b/sysdeps/mips/fpu/fraiseexcpt.c
index e2472e3..e3323dd 100644
--- a/sysdeps/mips/fpu/fraiseexcpt.c
+++ b/sysdeps/mips/fpu/fraiseexcpt.c
@@ -49,4 +49,5 @@ __feraiseexcept (int excepts)
 strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
diff --git a/sysdeps/powerpc/fpu/fesetenv.c b/sysdeps/powerpc/fpu/fesetenv.c
index 82464ae..ff82dfd 100644
--- a/sysdeps/powerpc/fpu/fesetenv.c
+++ b/sysdeps/powerpc/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,02 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
@@ -35,4 +35,5 @@ strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, BP_SYM (__old_fesetenv), BP_SYM (fesetenv), GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, BP_SYM (__fesetenv), BP_SYM (fesetenv), GLIBC_2_2);
diff --git a/sysdeps/powerpc/fpu/fraiseexcpt.c b/sysdeps/powerpc/fpu/fraiseexcpt.c
index d5a353e..dbe36c3 100644
--- a/sysdeps/powerpc/fpu/fraiseexcpt.c
+++ b/sysdeps/powerpc/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,99,2000,01,02 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
@@ -62,4 +62,5 @@ strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, BP_SYM (__old_feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, BP_SYM (__feraiseexcept), BP_SYM (feraiseexcept), GLIBC_2_2);
diff --git a/sysdeps/powerpc/fpu/s_isnan.c b/sysdeps/powerpc/fpu/s_isnan.c
index 14d586d..ad1d617 100644
--- a/sysdeps/powerpc/fpu/s_isnan.c
+++ b/sysdeps/powerpc/fpu/s_isnan.c
@@ -36,19 +36,16 @@ __isnan (x)
   fesetenv_register (savedstate);
   return result;
 }
-INTDEF(__isnan)
+hidden_def (__isnan)
 weak_alias (__isnan, isnan)
 
 /* It turns out that the 'double' version will also always work for
    single-precision.  */
-#undef __isnanf
-#undef isnanf
 strong_alias (__isnan, __isnanf)
-INTDEF(__isnanf)
+hidden_def (__isnanf)
 weak_alias (__isnanf, isnanf)
 
 #ifdef NO_LONG_DOUBLE
 strong_alias (__isnan, __isnanl)
-INTDEF(__isnanl)
 weak_alias (__isnan, isnanl)
 #endif
diff --git a/sysdeps/s390/fpu/fesetenv.c b/sysdeps/s390/fpu/fesetenv.c
index 6f2d0c5..bb71c95 100644
--- a/sysdeps/s390/fpu/fesetenv.c
+++ b/sysdeps/s390/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   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 Denis Joseph Barrow (djbarrow@de.ibm.com).
 
@@ -54,3 +54,4 @@ fesetenv (const fenv_t *envp)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (fesetenv)
diff --git a/sysdeps/s390/fpu/fraiseexcpt.c b/sysdeps/s390/fpu/fraiseexcpt.c
index 70ac619..4ceb5ce 100644
--- a/sysdeps/s390/fpu/fraiseexcpt.c
+++ b/sysdeps/s390/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   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 Denis Joseph Barrow (djbarrow@de.ibm.com) and
    Martin Schwidefsky (schwidefsky@de.ibm.com).
@@ -70,3 +70,4 @@ feraiseexcept (int excepts)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (feraiseexcept)
diff --git a/sysdeps/sh/sh4/fpu/fesetenv.c b/sysdeps/sh/sh4/fpu/fesetenv.c
index fd27c77..b66ed7f 100644
--- a/sysdeps/sh/sh4/fpu/fesetenv.c
+++ b/sysdeps/sh/sh4/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 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
@@ -32,3 +32,4 @@ fesetenv (const fenv_t *envp)
     }
   return 0;
 }
+libm_hidden_def (fesetenv)
diff --git a/sysdeps/sh/sh4/fpu/fraiseexcpt.c b/sysdeps/sh/sh4/fpu/fraiseexcpt.c
index 13dab03..f67ec15 100644
--- a/sysdeps/sh/sh4/fpu/fraiseexcpt.c
+++ b/sysdeps/sh/sh4/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 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
@@ -33,3 +33,4 @@ feraiseexcept (int excepts)
 
   return 0;
 }
+libm_hidden_def (feraiseexcept)
diff --git a/sysdeps/sparc/fpu/fesetenv.c b/sysdeps/sparc/fpu/fesetenv.c
index 61e48fb..89e97a7 100644
--- a/sysdeps/sparc/fpu/fesetenv.c
+++ b/sysdeps/sparc/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 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
@@ -51,4 +51,5 @@ strong_alias (__fesetenv, __old_fesetenv)
 compat_symbol (libm, __old_fesetenv, fesetenv, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__fesetenv, fesetenv)
 versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2);
diff --git a/sysdeps/sparc/fpu/fraiseexcpt.c b/sysdeps/sparc/fpu/fraiseexcpt.c
index 2bdbd7b..0d45ec8 100644
--- a/sysdeps/sparc/fpu/fraiseexcpt.c
+++ b/sysdeps/sparc/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 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
@@ -67,4 +67,5 @@ strong_alias (__feraiseexcept, __old_feraiseexcept)
 compat_symbol (libm, __old_feraiseexcept, feraiseexcept, GLIBC_2_1);
 #endif
 
+libm_hidden_ver (__feraiseexcept, feraiseexcept)
 versioned_symbol (libm, __feraiseexcept, feraiseexcept, GLIBC_2_2);
diff --git a/sysdeps/x86_64/fpu/fesetenv.c b/sysdeps/x86_64/fpu/fesetenv.c
index 4527b16..68e0046 100644
--- a/sysdeps/x86_64/fpu/fesetenv.c
+++ b/sysdeps/x86_64/fpu/fesetenv.c
@@ -1,5 +1,5 @@
 /* Install given floating-point environment.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 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
@@ -87,3 +87,4 @@ fesetenv (const fenv_t *envp)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (fesetenv)
diff --git a/sysdeps/x86_64/fpu/fraiseexcpt.c b/sysdeps/x86_64/fpu/fraiseexcpt.c
index 96ebb6d..d1d3c03 100644
--- a/sysdeps/x86_64/fpu/fraiseexcpt.c
+++ b/sysdeps/x86_64/fpu/fraiseexcpt.c
@@ -1,5 +1,5 @@
 /* Raise given exceptions.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 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
@@ -117,3 +117,4 @@ feraiseexcept (int excepts)
   /* Success.  */
   return 0;
 }
+libm_hidden_def (feraiseexcept)
diff --git a/sysdeps/x86_64/fpu/s_expm1l.S b/sysdeps/x86_64/fpu/s_expm1l.S
index fa40e05..b4f5a3e 100644
--- a/sysdeps/x86_64/fpu/s_expm1l.S
+++ b/sysdeps/x86_64/fpu/s_expm1l.S
@@ -1,5 +1,5 @@
 /* ix87 specific implementation of exp(x)-1.
-   Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
    Based on code by John C. Bowman <bowman@ipp-garching.mpg.de>.
@@ -80,4 +80,5 @@ ENTRY(__expm1l)
 	fldl	MO(minus1)	// Set result to -1.0.
 3:	ret
 END(__expm1l)
+libm_hidden_def (__expm1l)
 weak_alias (__expm1l, expm1l)
diff --git a/sysdeps/x86_64/fpu/s_finitel.S b/sysdeps/x86_64/fpu/s_finitel.S
index 45b9886..9e49796 100644
--- a/sysdeps/x86_64/fpu/s_finitel.S
+++ b/sysdeps/x86_64/fpu/s_finitel.S
@@ -12,5 +12,5 @@ ENTRY(__finitel)
 	shrl	$31, %eax
 	ret
 END (__finitel)
-strong_alias(__finitel, __finitel_internal)
 weak_alias (__finitel, finitel)
+hidden_def (__finitel)