Update.

	* misc/libgen.h: Don't take basename macro as taking arguments.

	* sysdeps/arm/bits/huge_val.h: Use hexadecimal floating-point constants
	for gcc >= 2.95.
	* sysdeps/i386/bits/huge_val.h: Likewise.
	* sysdeps/i386/bits/huge_val.h: Likewise.
	* sysdeps/ieee754/bits/huge_val.h: Likewise.
	* sysdeps/m68k/bits/huge_val.h: Likewise.
	* sysdeps/sparc/sparc32/fpu/bits/huge_val.h: Likewise.
	* sysdeps/sparc/sparc64/fpu/bits/huge_val.h: Likewise.

6 files changed, 174 insertions, 73 deletions

diff --git a/sysdeps/arm/bits/huge_val.h b/sysdeps/arm/bits/huge_val.h
index 0e07bd5..1b236c4 100644
--- a/sysdeps/arm/bits/huge_val.h
+++ b/sysdeps/arm/bits/huge_val.h
@@ -1,7 +1,7 @@
 /* `HUGE_VAL' constants for IEEE 754 machines (where it is infinity).
    Used by <stdlib.h> and <math.h> functions for overflow.
    ARM version.
-   Copyright (C) 1992, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1992, 95, 96, 97, 98, 99 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
@@ -29,11 +29,19 @@
 
 #ifdef	__GNUC__
 
-# define HUGE_VAL \
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VAL (0x1.0p2047)
+
+# else
+
+#  define HUGE_VAL \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; })   \
     { __l: 0x000000007ff00000ULL }).__d)
 
+# endif
+
 #else /* not GCC */
 
 # include <endian.h>
@@ -59,11 +67,19 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
 
 # ifdef __GNUC__
 
-#  define HUGE_VALF \
+#  if __GNUC_PREREQ(2,95)
+
+#   define HUGE_VALF (0x1.0p255f)
+
+#  else
+
+#   define HUGE_VALF \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })    \
     { __l: 0x7f800000UL }).__d)
 
+#  endif
+
 # else /* not GCC */
 
 typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
diff --git a/sysdeps/i386/bits/huge_val.h b/sysdeps/i386/bits/huge_val.h
index 23127b4..65e500b 100644
--- a/sysdeps/i386/bits/huge_val.h
+++ b/sysdeps/i386/bits/huge_val.h
@@ -1,6 +1,6 @@
 /* `HUGE_VAL' constants for ix86 (where it is infinity).
    Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1996, 1997, 1999 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
@@ -26,43 +26,56 @@
 
 /* IEEE positive infinity (-HUGE_VAL is negative infinity).  */
 
-#define	__HUGE_VAL_bytes	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
+#if __GNUC_PREREQ(2,95)
+# define HUGE_VAL	(0x1.0p2047)
+#else
+# define __HUGE_VAL_bytes	{ 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }
 
-#define __huge_val_t	union { unsigned char __c[8]; double __d; }
-#ifdef	__GNUC__
-# define HUGE_VAL	(__extension__ \
+# define __huge_val_t	union { unsigned char __c[8]; double __d; }
+# ifdef	__GNUC__
+#  define HUGE_VAL	(__extension__ \
 			 ((__huge_val_t) { __c: __HUGE_VAL_bytes }).__d)
-#else	/* Not GCC.  */
+# else	/* Not GCC.  */
 static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL	(__huge_val.__d)
-#endif	/* GCC.  */
+#  define HUGE_VAL	(__huge_val.__d)
+# endif	/* GCC.  */
+#endif /* GCC 2.95 */
 
 
 /* ISO C 9X extensions: (float) HUGE_VALF and (long double) HUGE_VALL.  */
 
 #ifdef __USE_ISOC9X
 
-# define __HUGE_VALF_bytes	{ 0, 0, 0x80, 0x7f }
+# if __GNUC_PREREQ(2,95)
 
-# define __huge_valf_t	union { unsigned char __c[4]; float __f; }
-# ifdef	__GNUC__
-#  define HUGE_VALF	(__extension__ \
+#  define HUGE_VALF (0x1.0p255f)
+#  define HUGE_VALL (0x1.0p32767L)
+
+# else
+
+#  define __HUGE_VALF_bytes	{ 0, 0, 0x80, 0x7f }
+
+#  define __huge_valf_t	union { unsigned char __c[4]; float __f; }
+#  ifdef	__GNUC__
+#   define HUGE_VALF	(__extension__ \
 			 ((__huge_valf_t) { __c: __HUGE_VALF_bytes }).__f)
-# else	/* Not GCC.  */
+#  else	/* Not GCC.  */
 static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-#  define HUGE_VALF	(__huge_valf.__f)
-# endif	/* GCC.  */
+#   define HUGE_VALF	(__huge_valf.__f)
+#  endif	/* GCC.  */
 
 
-# define __HUGE_VALL_bytes	{ 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0 }
+#  define __HUGE_VALL_bytes	{ 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0 }
 
-# define __huge_vall_t	union { unsigned char __c[12]; long double __ld; }
-# ifdef	__GNUC__
-#  define HUGE_VALL	(__extension__ \
+#  define __huge_vall_t	union { unsigned char __c[12]; long double __ld; }
+#  ifdef __GNUC__
+#   define HUGE_VALL	(__extension__ \
 			 ((__huge_vall_t) { __c: __HUGE_VALL_bytes }).__ld)
-# else	/* Not GCC.  */
+#  else	/* Not GCC.  */
 static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-#  define HUGE_VALL	(__huge_vall.__ld)
-# endif	/* GCC.  */
+#   define HUGE_VALL	(__huge_vall.__ld)
+#  endif /* GCC.  */
+
+# endif /* GCC 2.95 */
 
 #endif	/* __USE_ISOC9X.  */
diff --git a/sysdeps/ieee754/bits/huge_val.h b/sysdeps/ieee754/bits/huge_val.h
index f49d656..f42cb66 100644
--- a/sysdeps/ieee754/bits/huge_val.h
+++ b/sysdeps/ieee754/bits/huge_val.h
@@ -1,6 +1,6 @@
 /* `HUGE_VAL' constants for IEEE 754 machines (where it is infinity).
    Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1996, 1997, 1999 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
@@ -28,11 +28,19 @@
 
 #ifdef	__GNUC__
 
-# define HUGE_VAL \
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VAL (0x1.0p2047)
+
+# else
+
+#  define HUGE_VAL \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; })   \
     { __l: 0x7ff0000000000000ULL }).__d)
 
+# endif
+
 #else /* not GCC */
 
 # include <endian.h>
@@ -58,11 +66,19 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
 
 # ifdef __GNUC__
 
-#  define HUGE_VALF \
+#  if __GNUC_PREREQ(2,95)
+
+#   define HUGE_VALF (0x1.0p255f)
+
+#  else
+
+#   define HUGE_VALF \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })    \
     { __l: 0x7f800000UL }).__d)
 
+#  endif
+
 # else /* not GCC */
 
 typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
diff --git a/sysdeps/m68k/bits/huge_val.h b/sysdeps/m68k/bits/huge_val.h
index 822b829..14c0855 100644
--- a/sysdeps/m68k/bits/huge_val.h
+++ b/sysdeps/m68k/bits/huge_val.h
@@ -1,6 +1,6 @@
 /* `HUGE_VAL' constants for m68k (where it is infinity).
    Used by <stdlib.h> and <math.h> functions for overflow.
-   Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1996, 1997, 1999 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
@@ -30,11 +30,19 @@
 
 #ifdef	__GNUC__
 
-# define HUGE_VAL					\
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VAL (0x1.0p2047)
+
+# else
+
+#  define HUGE_VAL					\
   (__extension__					\
    ((union { unsigned long long __l; double __d; })	\
     { __l: 0x7ff0000000000000ULL }).__d)
 
+# endif
+
 #else /* not GCC */
 
 static union { unsigned char __c[8]; double __d; } __huge_val =
@@ -48,28 +56,37 @@ static union { unsigned char __c[8]; double __d; } __huge_val =
 
 #ifdef __USE_ISOC9X
 
-# ifdef __GNUC__
+# if __GNUC_PREREQ(2,95)
 
-#  define HUGE_VALF					\
+#  define HUGE_VALF (0x1.0p255f)
+#  define HUGE_VALL (0x1.0p32767L)
+
+# else
+
+#  ifdef __GNUC__
+
+#   define HUGE_VALF					\
   (__extension__					\
    ((union { unsigned long __l; float __f; })		\
     { __l: 0x7f800000UL }).__f)
 
-#  define HUGE_VALL					\
+#   define HUGE_VALL					\
   (__extension__					\
    ((union { unsigned long __l[3]; long double __ld; })	\
     { __l: { 0x7fff0000UL, 0x80000000UL, 0UL } }).__ld)
 
-# else /* not GCC */
+#  else /* not GCC */
 
 static union { unsigned char __c[4]; float __f; } __huge_valf =
   { { 0x7f, 0x80, 0, 0 } };
-#  define HUGE_VALF	(__huge_valf.__f)
+#   define HUGE_VALF	(__huge_valf.__f)
 
 static union { unsigned char __c[12]; long double __ld; } __huge_vall =
   { { 0x7f, 0xff, 0, 0, 0x80, 0, 0, 0, 0, 0, 0, 0 } };
-#  define HUGE_VALL	(__huge_vall.__ld)
+#   define HUGE_VALL	(__huge_vall.__ld)
+
+#  endif /* GCC.  */
 
-# endif	/* GCC.  */
+# endif /* GCC 2.95.  */
 
 #endif	/* __USE_ISOC9X.  */
diff --git a/sysdeps/sparc/sparc32/fpu/bits/huge_val.h b/sysdeps/sparc/sparc32/fpu/bits/huge_val.h
index 673d6f0..40b03df 100644
--- a/sysdeps/sparc/sparc32/fpu/bits/huge_val.h
+++ b/sysdeps/sparc/sparc32/fpu/bits/huge_val.h
@@ -29,11 +29,19 @@
 
 #ifdef	__GNUC__
 
-# define HUGE_VAL \
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VAL (0x1.0p2047)
+
+# else
+
+#  define HUGE_VAL \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; })   \
     { __l: 0x7ff0000000000000ULL }).__d)
 
+# endif
+
 #else /* not GCC */
 
 typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
@@ -50,51 +58,60 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
 
 #ifdef __USE_ISOC9X
 
-# ifdef __GNUC__
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VALF (0x1.0p255)
+#  define HUGE_VALL (0x1.0p32767)
+
+# else
+
+#  ifdef __GNUC__
 
-#  define HUGE_VALF \
+#   define HUGE_VALF \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })    \
     { __l: 0x7f800000UL }).__d)
 
-# else /* not GCC */
+#  else /* not GCC */
 
 typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
 
-#  define __HUGE_VALF_bytes	{ 0x7f, 0x80, 0, 0 }
+#   define __HUGE_VALF_bytes	{ 0x7f, 0x80, 0, 0 }
 
 static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-#  define HUGE_VALF	(__huge_valf.__f)
+#   define HUGE_VALF	(__huge_valf.__f)
 
-# endif	/* GCC.  */
+#  endif /* GCC.  */
 
-#if __WORDSIZE == 32
+#  if __WORDSIZE == 32
 
 /* Sparc32 has IEEE 754 64bit long double */
-# define HUGE_VALL HUGE_VAL
+#   define HUGE_VALL HUGE_VAL
 
-#else
+#  else
 
 /* Sparc64 uses IEEE 754 128bit long double */
 
-#ifdef	__GNUC__
+#   ifdef __GNUC__
 
-# define HUGE_VALL \
+#    define HUGE_VALL \
   (__extension__									\
    ((union { struct { unsigned long __h, __l; } __i; long double __d; })		\
     { __i: { __h: 0x7fff000000000000UL, __l: 0 } }).__d)
-              
-#else /* not GCC */
+
+#   else /* not GCC */
 
 typedef union { unsigned char __c[16]; long double __d; } __huge_vall_t;
 
-# define __HUGE_VALL_bytes	{ 0x7f, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+#    define __HUGE_VALL_bytes	{ 0x7f, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-# define HUGE_VALL	(__huge_vall.__d)
+#    define HUGE_VALL	(__huge_vall.__d)
 
-#endif	/* GCC.  */
+#   endif /* GCC.  */
 
-#endif
+#  endif
+
+# endif /* GCC 2.95.  */
 
 #endif /* __USE_ISOC9X.  */
diff --git a/sysdeps/sparc/sparc64/fpu/bits/huge_val.h b/sysdeps/sparc/sparc64/fpu/bits/huge_val.h
index 673d6f0..7885274 100644
--- a/sysdeps/sparc/sparc64/fpu/bits/huge_val.h
+++ b/sysdeps/sparc/sparc64/fpu/bits/huge_val.h
@@ -29,11 +29,19 @@
 
 #ifdef	__GNUC__
 
-# define HUGE_VAL \
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VAL (0x1.0p2047)
+
+# else
+
+#  define HUGE_VAL \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; })   \
     { __l: 0x7ff0000000000000ULL }).__d)
 
+# endif
+
 #else /* not GCC */
 
 typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
@@ -50,51 +58,65 @@ static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
 
 #ifdef __USE_ISOC9X
 
-# ifdef __GNUC__
+# if __GNUC_PREREQ(2,95)
+
+#  define HUGE_VALF (0x1.0p255f)
+#  if __WORDSIZE == 32
+#   define HUGE_VALL HUGE_VAL
+#  else
+/* Sparc64 uses IEEE 754 128bit long double */
+#   define HUGE_VALL (0x1.0p32767L)
+#  endif
+
+# else
 
-#  define HUGE_VALF \
+#  ifdef __GNUC__
+
+#   define HUGE_VALF \
   (__extension__							      \
    ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; })    \
     { __l: 0x7f800000UL }).__d)
 
-# else /* not GCC */
+#  else /* not GCC */
 
 typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
 
-#  define __HUGE_VALF_bytes	{ 0x7f, 0x80, 0, 0 }
+#   define __HUGE_VALF_bytes	{ 0x7f, 0x80, 0, 0 }
 
 static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-#  define HUGE_VALF	(__huge_valf.__f)
+#   define HUGE_VALF	(__huge_valf.__f)
 
-# endif	/* GCC.  */
+#  endif /* GCC.  */
 
-#if __WORDSIZE == 32
+#  if __WORDSIZE == 32
 
 /* Sparc32 has IEEE 754 64bit long double */
-# define HUGE_VALL HUGE_VAL
+#   define HUGE_VALL HUGE_VAL
 
-#else
+#  else
 
 /* Sparc64 uses IEEE 754 128bit long double */
 
-#ifdef	__GNUC__
+#   ifdef __GNUC__
 
-# define HUGE_VALL \
+#    define HUGE_VALL \
   (__extension__									\
    ((union { struct { unsigned long __h, __l; } __i; long double __d; })		\
     { __i: { __h: 0x7fff000000000000UL, __l: 0 } }).__d)
-              
-#else /* not GCC */
+
+#   else /* not GCC */
 
 typedef union { unsigned char __c[16]; long double __d; } __huge_vall_t;
 
-# define __HUGE_VALL_bytes	{ 0x7f, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+#    define __HUGE_VALL_bytes	{ 0x7f, 0xff, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-# define HUGE_VALL	(__huge_vall.__d)
+#    define HUGE_VALL	(__huge_vall.__d)
 
-#endif	/* GCC.  */
+#   endif /* GCC.  */
 
-#endif
+#  endif
+
+# endif /* GCC 2.95.  */
 
 #endif /* __USE_ISOC9X.  */