This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
Revamp HUGE_VAL, INFINITY, NAN
- From: Richard Henderson <rth at redhat dot com>
- To: libc-alpha at sources dot redhat dot com
- Date: Sun, 14 Mar 2004 11:35:37 -0800
- Subject: Revamp HUGE_VAL, INFINITY, NAN
I started off just adding the GCC builtins, but got sidetracked when
I noticed how much duplication there was.
36 files changed, 469 insertions(+), 920 deletions(-)
We could do even better if we had something in endian.h that could
unify the arm and sh huge_val.h with the regular ieee version.
Couple o random points:
* Note that GCC does in fact arrange for these builtins to act
like compile-time constants.
* The generic value of INFINITY needs to generate a diagnostic,
thus the value of "1e9999f" and not HUGE_VALF.
* The generic value of HUGE_VALL needs to have type long double,
thus the cast. Oops, just noticed that I missed the cast in
the sparc version of that header...
* Why does sh4 duplicate the sh math headers?
Tested only on alpha. Ok?
r~
* math/Makefile (headers): Add bits/huge_valf.h, bits/huge_vall.h,
and bits/inf.h.
* math/math.h: Include them.
* sysdeps/alpha/fpu/bits/mathdef.h, sysdeps/arm/fpu/bits/mathdef.h,
sysdeps/generic/bits/mathdef.h, sysdeps/i386/fpu/bits/mathdef.h,
sysdeps/ia64/fpu/bits/mathdef.h, sysdeps/m68k/fpu/bits/mathdef.h,
sysdeps/mips/fpu/bits/mathdef.h, sysdeps/powerpc/fpu/bits/mathdef.h,
sysdeps/sh/sh4/fpu/bits/mathdef.h, sysdeps/sparc/fpu/bits/mathdef.h,
sysdeps/x86_64/fpu/bits/mathdef.h: Remove INFINITY.
* sysdeps/arm/bits/huge_val.h (HUGE_VAL): Use __builtin_huge_val.
(HUGE_VALF, HUGE_VALL): Remove.
* sysdeps/ieee754/bits/huge_val.h: Likewise.
* sysdeps/sh/bits/huge_val.h: Likewise.
* sysdeps/generic/bits/huge_val.h (HUGE_VAL): Use __builtin_huge_val.
* sysdeps/generic/bits/huge_valf.h: New file.
* sysdeps/generic/bits/huge_vall.h: New file.
* sysdeps/generic/bits/inf.h: New file.
* sysdeps/ieee754/bits/huge_valf.h: New file.
* sysdeps/ieee754/bits/inf.h: New file.
* sysdeps/i386/bits/huge_val.h: Remove file.
* sysdeps/i386/bits/huge_vall.h: New file.
* sysdeps/ia64/bits/huge_val.h: Remove file.
* sysdeps/ia64/bits/huge_vall.h: New file.
* sysdeps/ieee754/ldbl-128/bits/huge_vall.h: New file.
* sysdeps/m68k/bits/huge_val.h: Remove file.
* sysdeps/m68k/bits/huge_vall.h: New file.
* sysdeps/s390/bits/huge_val.h: Remove file.
* sysdeps/sh/sh4/fpu/bits/huge_val.h: Remove file.
* sysdeps/sparc/bits/huge_vall.h: New file.
* sysdeps/sparc/sparc32/fpu/bits/huge_val.h: Remove file.
* sysdeps/sparc/sparc64/fpu/bits/huge_val.h: Remove file.
* sysdeps/ieee754/bits/nan.h (NAN): Use __builtin_nanf.
* sysdeps/mips/bits/nan.h (NAN): Likewise.
Index: math/Makefile
===================================================================
RCS file: /cvs/glibc/libc/math/Makefile,v
retrieving revision 1.124
diff -c -p -d -u -r1.124 Makefile
--- math/Makefile 7 Dec 2003 21:13:39 -0000 1.124
+++ math/Makefile 14 Mar 2004 19:31:37 -0000
@@ -22,8 +22,9 @@ subdir := math
# Installed header files.
headers := math.h bits/mathcalls.h bits/mathinline.h bits/huge_val.h \
- bits/nan.h fpu_control.h complex.h bits/cmathcalls.h \
- fenv.h bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h
+ bits/huge_valf.h bits/huge_vall.h bits/inf.h bits/nan.h \
+ fpu_control.h complex.h bits/cmathcalls.h fenv.h \
+ bits/fenv.h bits/fenvinline.h bits/mathdef.h tgmath.h
# Internal header files.
distribute := math_ldbl.h math_private.h machine/asm.h
Index: math/math.h
===================================================================
RCS file: /cvs/glibc/libc/math/math.h,v
retrieving revision 1.67
diff -c -p -d -u -r1.67 math.h
--- math/math.h 10 Mar 2004 05:57:45 -0000 1.67
+++ math/math.h 14 Mar 2004 19:31:37 -0000
@@ -31,14 +31,23 @@ __BEGIN_DECLS
/* Get machine-dependent HUGE_VAL value (returned on overflow).
On all IEEE754 machines, this is +Infinity. */
#include <bits/huge_val.h>
+#ifdef __USE_ISOC99
+# include <bits/huge_valf.h>
+# include <bits/huge_vall.h>
+#endif
+
+/* Get machine-dependent INFINITY value. */
+#ifdef __USE_ISOC99
+# include <bits/inf.h>
+#endif
/* Get machine-dependent NAN value (returned for some domain errors). */
#ifdef __USE_ISOC99
# include <bits/nan.h>
#endif
+
/* Get general and ISO C99 specific information. */
#include <bits/mathdef.h>
-
/* The file <bits/mathcalls.h> contains the prototypes for all the
actual math functions. These macros are used for those prototypes,
Index: sysdeps/alpha/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/alpha/fpu/bits/mathdef.h,v
retrieving revision 1.11
diff -c -p -d -u -r1.11 mathdef.h
--- sysdeps/alpha/fpu/bits/mathdef.h 13 Jan 2004 09:15:58 -0000 1.11
+++ sysdeps/alpha/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004
+ 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,27 +34,18 @@
typedef float float_t;
typedef double double_t;
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# else
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
typedef double float_t;
typedef double double_t;
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# endif
# else
/* Wild guess at types for float_t and double_t. */
typedef double float_t;
typedef double double_t;
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
# endif
Index: sysdeps/arm/bits/huge_val.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/arm/bits/huge_val.h,v
retrieving revision 1.6
diff -c -p -d -u -r1.6 huge_val.h
--- sysdeps/arm/bits/huge_val.h 6 Jul 2001 04:55:48 -0000 1.6
+++ sysdeps/arm/bits/huge_val.h 14 Mar 2004 19:31:37 -0000
@@ -1,7 +1,8 @@
-/* `HUGE_VAL' constants for IEEE 754 machines (where it is infinity).
+/* `HUGE_VAL' constant for IEEE 754 machines (where it is infinity).
Used by <stdlib.h> and <math.h> functions for overflow.
ARM version.
- Copyright (C) 1992, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1992, 95, 96, 97, 98, 99, 2000, 2004
+ 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
@@ -23,25 +24,19 @@
# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
#endif
-#include <features.h>
-
/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-#ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VAL (__extension__ 0x1.0p2047)
-
-# else
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VAL (__builtin_huge_val())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VAL (__extension__ 0x1.0p2047)
+#elif defined __GNUC__
-# define HUGE_VAL \
+# define HUGE_VAL \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \
{ __l: 0x000000007ff00000ULL }).__d)
-# endif
-
#else /* not GCC */
# include <endian.h>
@@ -59,46 +54,3 @@ static __huge_val_t __huge_val = { __HUG
# define HUGE_VAL (__huge_val.__d)
#endif /* GCC. */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 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;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-# define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
-# endif
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-
-# endif /* GCC. */
-
-
-/* Generally there is no separate `long double' format and it is the
- same as `double'. */
-# define HUGE_VALL HUGE_VAL
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/arm/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/arm/fpu/bits/mathdef.h,v
retrieving revision 1.5
diff -c -p -d -u -r1.5 mathdef.h
--- sysdeps/arm/fpu/bits/mathdef.h 6 Jul 2001 04:55:48 -0000 1.5
+++ sysdeps/arm/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 2004 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,10 +28,6 @@ typedef float float_t; /* `float' expre
`float'. */
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647)
Index: sysdeps/generic/bits/huge_val.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/bits/huge_val.h,v
retrieving revision 1.3
diff -c -p -d -u -r1.3 huge_val.h
--- sysdeps/generic/bits/huge_val.h 6 Jul 2001 04:55:50 -0000 1.3
+++ sysdeps/generic/bits/huge_val.h 14 Mar 2004 19:31:37 -0000
@@ -1,6 +1,6 @@
/* Stub `HUGE_VAL' constant.
Used by <stdlib.h> and <math.h> functions for overflow.
- Copyright (C) 1992, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1996, 1997, 2004 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
@@ -22,5 +22,8 @@
# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
#endif
-
-#define HUGE_VAL 1e37
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VAL (__builtin_huge_val())
+#else
+# define HUGE_VAL 1e37
+#endif
Index: sysdeps/generic/bits/huge_valf.h
===================================================================
RCS file: sysdeps/generic/bits/huge_valf.h
diff -N sysdeps/generic/bits/huge_valf.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/generic/bits/huge_valf.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,29 @@
+/* Stub `HUGE_VALF' constant.
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1996, 1997, 2004 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_valf.h> directly; include <math.h> instead."
+#endif
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALF (__builtin_huge_valf())
+#else
+# define HUGE_VALF 1e37f
+#endif
Index: sysdeps/generic/bits/huge_vall.h
===================================================================
RCS file: sysdeps/generic/bits/huge_vall.h
diff -N sysdeps/generic/bits/huge_vall.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/generic/bits/huge_vall.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,29 @@
+/* Default `HUGE_VALL' constant.
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1996, 1997, 2004 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_vall.h> directly; include <math.h> instead."
+#endif
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALL (__builtin_huge_vall())
+#else
+# define HUGE_VALL ((long double) HUGE_VAL)
+#endif
Index: sysdeps/generic/bits/inf.h
===================================================================
RCS file: sysdeps/generic/bits/inf.h
diff -N sysdeps/generic/bits/inf.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/generic/bits/inf.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,33 @@
+/* Default `INFINITY' constant.
+ Copyright (C) 2004 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/inf.h> directly; include <math.h> instead."
+#endif
+
+/* If we don't have real infinity, then we're supposed to produce a float
+ value that overflows at translation time, which is required to produce
+ a diagnostic. GCC's __builtin_inff produces a quite nice diagnostic
+ that tells the user that the target doesn't support infinities. */
+
+#if __GNUC_PREREQ(3,3)
+# define INFINITY (__builtin_inff())
+#else
+# define INFINITY (1e9999f)
+#endif
Index: sysdeps/generic/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/generic/bits/mathdef.h,v
retrieving revision 1.10
diff -c -p -d -u -r1.10 mathdef.h
--- sysdeps/generic/bits/mathdef.h 6 Jul 2001 04:55:50 -0000 1.10
+++ sysdeps/generic/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2004 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,10 +29,6 @@ typedef double float_t; /* `float' expr
`double'. */
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647)
Index: sysdeps/i386/bits/huge_val.h
===================================================================
RCS file: sysdeps/i386/bits/huge_val.h
diff -N sysdeps/i386/bits/huge_val.h
--- sysdeps/i386/bits/huge_val.h 6 Jul 2001 04:55:53 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-/* `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, 1999, 2000 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#if __GNUC_PREREQ(2,96)
-# define HUGE_VAL (__extension__ 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__ \
- ((__huge_val_t) { __c: __HUGE_VAL_bytes }).__d)
-# else /* Not GCC. */
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL (__huge_val.__d)
-# endif /* GCC. */
-#endif /* GCC 2.95 */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 0x1.0p255f)
-# define HUGE_VALL (__extension__ 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. */
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# 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_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. */
-static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-# define HUGE_VALL (__huge_vall.__ld)
-# endif /* GCC. */
-
-# endif /* GCC 2.95 */
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/i386/bits/huge_vall.h
===================================================================
RCS file: sysdeps/i386/bits/huge_vall.h
diff -N sysdeps/i386/bits/huge_vall.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/i386/bits/huge_vall.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,43 @@
+/* `HUGE_VALL' constant for ix86 (where it is infinity).
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000, 2004
+ 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_vall.h> directly; include <math.h> instead."
+#endif
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALL (__builtin_huge_vall())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VALL (__extension__ 0x1.0p32767L)
+#else
+
+# 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__ \
+ ((__huge_vall_t) { __c: __HUGE_VALL_bytes }).__ld)
+# else /* Not GCC. */
+static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
+# define HUGE_VALL (__huge_vall.__ld)
+# endif /* GCC. */
+
+#endif /* GCC 2.95 */
Index: sysdeps/i386/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/i386/fpu/bits/mathdef.h,v
retrieving revision 1.11
diff -c -p -d -u -r1.11 mathdef.h
--- sysdeps/i386/fpu/bits/mathdef.h 6 Jul 2001 04:55:53 -0000 1.11
+++ sysdeps/i386/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2004 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,9 +30,6 @@ typedef long double float_t; /* `float'
`long double'. */
typedef long double double_t; /* `double' expressions are evaluated as
`long double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647 - 1)
Index: sysdeps/ia64/bits/huge_val.h
===================================================================
RCS file: sysdeps/ia64/bits/huge_val.h
diff -N sysdeps/ia64/bits/huge_val.h
--- sysdeps/ia64/bits/huge_val.h 6 Jul 2001 04:55:54 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,81 +0,0 @@
-/* `HUGE_VAL' constants for ia64 (where it is infinity).
- Used by <stdlib.h> and <math.h> functions for overflow.
- Copyright (C) 2000 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#if __GNUC_PREREQ(2,96)
-# define HUGE_VAL (__extension__ 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__ \
- ((__huge_val_t) { __c: __HUGE_VAL_bytes }).__d)
-# else /* Not GCC. */
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL (__huge_val.__d)
-# endif /* GCC. */
-#endif /* GCC 2.95 */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 0x1.0p255f)
-# define HUGE_VALL (__extension__ 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. */
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-# endif /* GCC. */
-
-
-# define __HUGE_VALL_bytes { 0, 0, 0, 0, 0, 0, 0, 0x80, 0xff, 0x7f, 0, 0, 0, 0, 0 ,0}
-
-# define __huge_vall_t union { unsigned char __c[16]; long double __ld; }
-# ifdef __GNUC__
-# define HUGE_VALL (__extension__ \
- ((__huge_vall_t) { __c: __HUGE_VALL_bytes }).__ld)
-# else /* Not GCC. */
-static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-# define HUGE_VALL (__huge_vall.__ld)
-# endif /* GCC. */
-
-# endif /* GCC 2.95 */
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/ia64/bits/huge_vall.h
===================================================================
RCS file: sysdeps/ia64/bits/huge_vall.h
diff -N sysdeps/ia64/bits/huge_vall.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/ia64/bits/huge_vall.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,42 @@
+/* `HUGE_VALL' constant for ia64 (where it is infinity).
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 2000, 2004 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_vall.h> directly; include <math.h> instead."
+#endif
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALL (__builtin_huge_vall())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VALL (__extension__ 0x1.0p32767L)
+#else
+
+# define __HUGE_VALL_bytes { 0,0,0,0,0,0,0, 0x80, 0xff, 0x7f, 0,0,0,0,0,0}
+
+# define __huge_vall_t union { unsigned char __c[16]; long double __ld; }
+# ifdef __GNUC__
+# define HUGE_VALL (__extension__ \
+ ((__huge_vall_t) { __c: __HUGE_VALL_bytes }).__ld)
+# else /* Not GCC. */
+static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
+# define HUGE_VALL (__huge_vall.__ld)
+# endif /* GCC. */
+
+#endif /* GCC 2.95 */
Index: sysdeps/ia64/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/ia64/fpu/bits/mathdef.h,v
retrieving revision 1.4
diff -c -p -d -u -r1.4 mathdef.h
--- sysdeps/ia64/fpu/bits/mathdef.h 6 Jul 2001 04:55:54 -0000 1.4
+++ sysdeps/ia64/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2004 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,9 +29,6 @@ typedef float float_t; /* `float' expre
`float'. */
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647 - 1)
Index: sysdeps/ieee754/bits/huge_val.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/ieee754/bits/huge_val.h,v
retrieving revision 1.7
diff -c -p -d -u -r1.7 huge_val.h
--- sysdeps/ieee754/bits/huge_val.h 6 Jul 2001 04:55:54 -0000 1.7
+++ sysdeps/ieee754/bits/huge_val.h 14 Mar 2004 19:31:37 -0000
@@ -1,6 +1,7 @@
-/* `HUGE_VAL' constants for IEEE 754 machines (where it is infinity).
+/* `HUGE_VAL' constant for IEEE 754 machines (where it is infinity).
Used by <stdlib.h> and <math.h> functions for overflow.
- Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000, 2004
+ 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
@@ -22,25 +23,19 @@
# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
#endif
-#include <features.h>
-
/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-#ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VAL (__extension__ 0x1.0p2047)
-
-# else
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VAL (__builtin_huge_val())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VAL (__extension__ 0x1.0p2047)
+#elif defined __GNUC__
-# define HUGE_VAL \
+# define HUGE_VAL \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \
{ __l: 0x7ff0000000000000ULL }).__d)
-# endif
-
#else /* not GCC */
# include <endian.h>
@@ -58,46 +53,3 @@ static __huge_val_t __huge_val = { __HUG
# define HUGE_VAL (__huge_val.__d)
#endif /* GCC. */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 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;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-# define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
-# endif
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-
-# endif /* GCC. */
-
-
-/* Generally there is no separate `long double' format and it is the
- same as `double'. */
-# define HUGE_VALL HUGE_VAL
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/ieee754/bits/huge_valf.h
===================================================================
RCS file: sysdeps/ieee754/bits/huge_valf.h
diff -N sysdeps/ieee754/bits/huge_valf.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/ieee754/bits/huge_valf.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,53 @@
+/* `HUGE_VALF' constant for IEEE 754 machines (where it is infinity).
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000, 2004
+ 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_valf.h> directly; include <math.h> instead."
+#endif
+
+/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALF (__builtin_huge_valf())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VALF (__extension__ 0x1.0p255f)
+#elif defined __GNUC__
+
+# define HUGE_VALF \
+ (__extension__ \
+ ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; }) \
+ { __l: 0x7f800000UL }).__d)
+
+#else /* not GCC */
+
+typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
+# endif
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
+# endif
+
+static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
+# define HUGE_VALF (__huge_valf.__f)
+
+#endif /* GCC. */
Index: sysdeps/ieee754/bits/inf.h
===================================================================
RCS file: sysdeps/ieee754/bits/inf.h
diff -N sysdeps/ieee754/bits/inf.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/ieee754/bits/inf.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,30 @@
+/* `INFINITY' constant for IEEE 754 machines.
+ Copyright (C) 2004 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/inf.h> directly; include <math.h> instead."
+#endif
+
+/* IEEE positive infinity. */
+
+#if __GNUC_PREREQ(3,3)
+# define INFINITY (__builtin_inff())
+#else
+# define INFINITY HUGE_VALF
+#endif
Index: sysdeps/ieee754/bits/nan.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/ieee754/bits/nan.h,v
retrieving revision 1.7
diff -c -p -d -u -r1.7 nan.h
--- sysdeps/ieee754/bits/nan.h 16 Dec 2002 19:32:31 -0000 1.7
+++ sysdeps/ieee754/bits/nan.h 14 Mar 2004 19:31:37 -0000
@@ -1,5 +1,5 @@
/* `NAN' constant for IEEE 754 machines.
- Copyright (C) 1992, 1996, 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1996, 1997, 1999, 2004 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
@@ -24,7 +24,11 @@
/* IEEE Not A Number. */
-#ifdef __GNUC__
+#if __GNUC_PREREQ(3,3)
+
+# define NAN (__builtin_nanf(""))
+
+#elif defined__GNUC__
# define NAN \
(__extension__ \
Index: sysdeps/ieee754/ldbl-128/bits/huge_vall.h
===================================================================
RCS file: sysdeps/ieee754/ldbl-128/bits/huge_vall.h
diff -N sysdeps/ieee754/ldbl-128/bits/huge_vall.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/ieee754/ldbl-128/bits/huge_vall.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,51 @@
+/* `HUGE_VALL' constant for IEEE 754 machines (where it is infinity).
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000, 2004
+ 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_vall.h> directly; include <math.h> instead."
+#endif
+
+/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALL (__builtin_huge_vall())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VALL (__extension__ 0x1.0p32767L)
+#else
+# include <endian.h>
+
+typedef union { unsigned char __c[16]; long double __ld; } __huge_vall_t;
+
+# if __BYTE_ORDER == __BIG_ENDIAN
+# define __HUGE_VALL_bytes { 0x7f, 0xff, 0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
+# endif
+# if __BYTE_ORDER == __LITTLE_ENDIAN
+# define __HUGE_VALL_bytes { 0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0xff, 0x7f }
+# endif
+
+# ifdef __GNUC__
+# define HUGE_VALL (__extension__ \
+ ((__huge_vall_t) { __c : __HUGE_VALL_bytes }).__ld)
+# else
+static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
+# define HUGE_VALL (__huge_val.__d)
+# endif
+#endif
Index: sysdeps/m68k/bits/huge_val.h
===================================================================
RCS file: sysdeps/m68k/bits/huge_val.h
diff -N sysdeps/m68k/bits/huge_val.h
--- sysdeps/m68k/bits/huge_val.h 6 Jul 2001 04:55:55 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,92 +0,0 @@
-/* `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, 1999, 2000 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-
-#include <features.h>
-#include <sys/cdefs.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VAL (__extension__ 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 =
- { { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 } };
-# define HUGE_VAL (__huge_val.__d)
-
-#endif /* GCC. */
-
-
-/* ISO C 99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 0x1.0p255f)
-# define HUGE_VALL (__extension__ 0x1.0p32767L)
-
-# else
-
-# ifdef __GNUC__
-
-# define HUGE_VALF \
- (__extension__ \
- ((union { unsigned long __l; float __f; }) \
- { __l: 0x7f800000UL }).__f)
-
-# define HUGE_VALL \
- (__extension__ \
- ((union { unsigned long __l[3]; long double __ld; }) \
- { __l: { 0x7fff0000UL, 0x80000000UL, 0UL } }).__ld)
-
-# else /* not GCC */
-
-static union { unsigned char __c[4]; float __f; } __huge_valf =
- { { 0x7f, 0x80, 0, 0 } };
-# 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)
-
-# endif /* GCC. */
-
-# endif /* GCC 2.95. */
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/m68k/bits/huge_vall.h
===================================================================
RCS file: sysdeps/m68k/bits/huge_vall.h
diff -N sysdeps/m68k/bits/huge_vall.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/m68k/bits/huge_vall.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,43 @@
+/* `HUGE_VALL' constant for m68k (where it is infinity).
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000, 2004
+ 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
+#endif
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALL (__builtin_huge_vall ())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VALL (__extension__ 0x1.0p32767L)
+#elif defined__GNUC__
+
+# define HUGE_VALL \
+ (__extension__ \
+ ((union { unsigned long __l[3]; long double __ld; }) \
+ { __l: { 0x7fff0000UL, 0x80000000UL, 0UL } }).__ld)
+
+#else /* not GCC */
+
+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)
+
+#endif /* GCC 2.95. */
Index: sysdeps/m68k/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/m68k/fpu/bits/mathdef.h,v
retrieving revision 1.12
diff -c -p -d -u -r1.12 mathdef.h
--- sysdeps/m68k/fpu/bits/mathdef.h 6 Jul 2001 04:55:56 -0000 1.12
+++ sysdeps/m68k/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2004 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,9 +30,6 @@ typedef long double float_t; /* `float'
`long double'. */
typedef long double double_t; /* `double' expressions are evaluated as
`long double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647 - 1)
Index: sysdeps/mips/bits/nan.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mips/bits/nan.h,v
retrieving revision 1.1
diff -c -p -d -u -r1.1 nan.h
--- sysdeps/mips/bits/nan.h 22 Mar 2002 10:10:19 -0000 1.1
+++ sysdeps/mips/bits/nan.h 14 Mar 2004 19:31:37 -0000
@@ -1,5 +1,6 @@
/* `NAN' constant for IEEE 754 machines.
- Copyright (C) 1992, 1996, 1997, 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1992, 1996, 1997, 1999, 2002, 2004
+ 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
@@ -27,7 +28,11 @@
the definition of this open to implementations, and for MIPS the top
bit of the mantissa must be SET to indicate a SNaN. */
-#ifdef __GNUC__
+#if __GNUC_PREREQ(3,3)
+
+# define NAN (__builtin_nanf(""))
+
+#elif defined __GNUC__
# define NAN \
(__extension__ \
Index: sysdeps/mips/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mips/fpu/bits/mathdef.h,v
retrieving revision 1.1
diff -c -p -d -u -r1.1 mathdef.h
--- sysdeps/mips/fpu/bits/mathdef.h 14 Mar 2003 15:30:43 -0000 1.1
+++ sysdeps/mips/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003
+/* Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -30,10 +30,6 @@ typedef double float_t; /* `float' expr
`double'. */
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647)
Index: sysdeps/powerpc/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/powerpc/fpu/bits/mathdef.h,v
retrieving revision 1.7
diff -c -p -d -u -r1.7 mathdef.h
--- sysdeps/powerpc/fpu/bits/mathdef.h 9 Apr 2003 07:40:11 -0000 1.7
+++ sysdeps/powerpc/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997,1998,1999,2000,2003 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1998,1999,2000,2003,2004 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
@@ -39,9 +39,6 @@ typedef float float_t; /* `float' expre
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# else
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
@@ -50,18 +47,12 @@ typedef double float_t; /* `float' expr
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# endif
# else
/* Wild guess at types for float_t and double_t. */
typedef double float_t;
typedef double double_t;
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
# endif
Index: sysdeps/s390/bits/huge_val.h
===================================================================
RCS file: sysdeps/s390/bits/huge_val.h
diff -N sysdeps/s390/bits/huge_val.h
--- sysdeps/s390/bits/huge_val.h 6 Jul 2001 04:56:02 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,69 +0,0 @@
-/* `HUGE_VAL' constants for S/390 (where it is infinity).
- Used by <stdlib.h> and <math.h> functions for overflow.
- Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#if __GNUC_PREREQ(2,96)
-# define HUGE_VAL (__extension__ 0x1.0p2047)
-#else
-# define __HUGE_VAL_bytes { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-
-# 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. */
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL (__huge_val.__d)
-# endif /* GCC. */
-#endif /* GCC 2.95 */
-
-
-/* ISO C 99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-# define HUGE_VALF (__extension__ 0x1.0p255f)
-# define HUGE_VALL (__extension__ 0x1.0p255f)
-# else
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-# 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. */
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-# endif /* GCC. */
-
-/* On 390 there is no 'long double' format. Make it the same as 'double' */
-# define HUGE_VALL HUGE_VAL
-
-# endif /* GCC 2.95 */
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/sh/bits/huge_val.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sh/bits/huge_val.h,v
retrieving revision 1.2
diff -c -p -d -u -r1.2 huge_val.h
--- sysdeps/sh/bits/huge_val.h 6 Jul 2001 04:56:03 -0000 1.2
+++ sysdeps/sh/bits/huge_val.h 14 Mar 2004 19:31:37 -0000
@@ -1,7 +1,8 @@
/* `HUGE_VAL' constants for IEEE 754 machines (where it is infinity).
Used by <stdlib.h> and <math.h> functions for overflow.
SH version.
- Copyright (C) 1992, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1992, 95, 96, 97, 98, 99, 2000, 2004
+ 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
@@ -23,25 +24,19 @@
# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
#endif
-#include <features.h>
-
/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-#ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VAL (__extension__ 0x1.0p2047)
-
-# else
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VAL (__builtin_huge_val())
+#elif __GNUC_PREREQ(2,96)
+# define HUGE_VAL (__extension__ 0x1.0p2047)
+#elif defined __GNUC__
# define HUGE_VAL \
(__extension__ \
((union { unsigned __l __attribute__((__mode__(__DI__))); double __d; }) \
{ __l: 0x000000007ff00000ULL }).__d)
-# endif
-
#else /* not GCC */
# include <endian.h>
@@ -59,46 +54,3 @@ static __huge_val_t __huge_val = { __HUG
# define HUGE_VAL (__huge_val.__d)
#endif /* GCC. */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 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;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-# define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
-# endif
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-
-# endif /* GCC. */
-
-
-/* Generally there is no separate `long double' format and it is the
- same as `double'. */
-# define HUGE_VALL HUGE_VAL
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/sh/sh4/fpu/bits/huge_val.h
===================================================================
RCS file: sysdeps/sh/sh4/fpu/bits/huge_val.h
diff -N sysdeps/sh/sh4/fpu/bits/huge_val.h
--- sysdeps/sh/sh4/fpu/bits/huge_val.h 6 Jul 2001 04:56:04 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,105 +0,0 @@
-/* `HUGE_VAL' constants for IEEE 754 machines (where it is infinity).
- Used by <stdlib.h> and <math.h> functions for overflow.
- SH version.
- Copyright (C) 1992, 1995, 1996, 1997, 1998, 1999, 2000
- 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#ifdef __GNUC__
-
-# 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>
-
-typedef union { unsigned char __c[8]; double __d; } __huge_val_t;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define __HUGE_VAL_bytes { 0, 0, 0, 0, 0x7f, 0xf0, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-# define __HUGE_VAL_bytes { 0, 0, 0xf0, 0x7f, 0, 0, 0, 0 }
-# endif
-
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL (__huge_val.__d)
-
-#endif /* GCC. */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# ifdef __GNUC__
-
-# 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;
-
-# if __BYTE_ORDER == __BIG_ENDIAN
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-# endif
-# if __BYTE_ORDER == __LITTLE_ENDIAN
-# define __HUGE_VALF_bytes { 0, 0, 0x80, 0x7f }
-# endif
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-
-# endif /* GCC. */
-
-
-/* Generally there is no separate `long double' format and it is the
- same as `double'. */
-# define HUGE_VALL HUGE_VAL
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/sh/sh4/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sh/sh4/fpu/bits/mathdef.h,v
retrieving revision 1.3
diff -c -p -d -u -r1.3 mathdef.h
--- sysdeps/sh/sh4/fpu/bits/mathdef.h 6 Jul 2001 04:56:04 -0000 1.3
+++ sysdeps/sh/sh4/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2004 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
@@ -39,9 +39,6 @@ typedef float float_t; /* `float' expre
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# else
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
@@ -50,18 +47,12 @@ typedef double float_t; /* `float' expr
typedef double double_t; /* `double' expressions are evaluated as
`double'. */
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# endif
# else
/* Wild guess at types for float_t and double_t. */
typedef double float_t;
typedef double double_t;
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
# endif
Index: sysdeps/sparc/bits/huge_vall.h
===================================================================
RCS file: sysdeps/sparc/bits/huge_vall.h
diff -N sysdeps/sparc/bits/huge_vall.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sysdeps/sparc/bits/huge_vall.h 14 Mar 2004 19:31:37 -0000
@@ -0,0 +1,49 @@
+/* `HUGE_VALL' constant for IEEE 754 machines (where it is infinity).
+ Used by <stdlib.h> and <math.h> functions for overflow.
+ Copyright (C) 1992, 1995, 1996, 1997, 1999, 2000, 2004
+ 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifndef _MATH_H
+# error "Never use <bits/huge_vall.h> directly; include <math.h> instead."
+#endif
+
+#if __GNUC_PREREQ(3,3)
+# define HUGE_VALL (__builtin_huge_vall())
+#else
+# include <bits/wordsize.h>
+# if __WORDSIZE == 32
+# define HUGE_VALL ((long double) HUGE_VAL)
+# elif __GNUC_PREREQ(2,96)
+# define HUGE_VALL (__extension__ 0x1.0p32767L)
+# elif defined __GNUC__
+
+# define HUGE_VALL \
+ (__extension__ \
+ ((union { struct { unsigned long __h, __l; } __i; long double __d; }) \
+ { __i: { __h: 0x7fff000000000000UL, __l: 0 } }).__d)
+
+# 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 }
+static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
+# define HUGE_VALL (__huge_vall.__d)
+
+# endif /* GCC. */
+#endif /* GCC 3.3. */
Index: sysdeps/sparc/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/sparc/fpu/bits/mathdef.h,v
retrieving revision 1.10
diff -c -p -d -u -r1.10 mathdef.h
--- sysdeps/sparc/fpu/bits/mathdef.h 6 Jul 2001 04:56:04 -0000 1.10
+++ sysdeps/sparc/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 1999, 2000, 2004 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,27 +35,18 @@
typedef float float_t;
typedef double double_t;
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# else
/* For `gcc -traditional', `float' expressions are evaluated as `double'. */
typedef double float_t;
typedef double double_t;
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
-
# endif
# else
/* Wild guess at types for float_t and double_t. */
typedef double float_t;
typedef double double_t;
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
# endif
Index: sysdeps/sparc/sparc32/fpu/bits/huge_val.h
===================================================================
RCS file: sysdeps/sparc/sparc32/fpu/bits/huge_val.h
diff -N sysdeps/sparc/sparc32/fpu/bits/huge_val.h
--- sysdeps/sparc/sparc32/fpu/bits/huge_val.h 6 Jul 2001 04:56:04 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,122 +0,0 @@
-/* `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, 1999, 2000 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-#include <bits/wordsize.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VAL (__extension__ 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;
-
-# define __HUGE_VAL_bytes { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL (__huge_val.__d)
-
-#endif /* GCC. */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 0x1.0p255f)
-# if __WORDSIZE == 32
-# define HUGE_VALL HUGE_VAL
-# else
-/* Sparc64 uses IEEE 754 128bit long double */
-# define HUGE_VALL (__extension__ 0x1.0p32767L)
-# endif
-
-# else
-
-# ifdef __GNUC__
-
-# define HUGE_VALF \
- (__extension__ \
- ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; }) \
- { __l: 0x7f800000UL }).__d)
-
-# else /* not GCC */
-
-typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
-
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-
-# endif /* GCC. */
-
-# if __WORDSIZE == 32
-
-/* Sparc32 has IEEE 754 64bit long double */
-# define HUGE_VALL HUGE_VAL
-
-# else
-
-/* Sparc64 uses IEEE 754 128bit long double */
-
-# ifdef __GNUC__
-
-# define HUGE_VALL \
- (__extension__ \
- ((union { struct { unsigned long __h, __l; } __i; long double __d; }) \
- { __i: { __h: 0x7fff000000000000UL, __l: 0 } }).__d)
-
-# 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 }
-
-static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-# define HUGE_VALL (__huge_vall.__d)
-
-# endif /* GCC. */
-
-# endif
-
-# endif /* GCC 2.95. */
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/sparc/sparc64/fpu/bits/huge_val.h
===================================================================
RCS file: sysdeps/sparc/sparc64/fpu/bits/huge_val.h
diff -N sysdeps/sparc/sparc64/fpu/bits/huge_val.h
--- sysdeps/sparc/sparc64/fpu/bits/huge_val.h 6 Jul 2001 04:56:05 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,122 +0,0 @@
-/* `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, 1999, 2000 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
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
-
-#ifndef _MATH_H
-# error "Never use <bits/huge_val.h> directly; include <math.h> instead."
-#endif
-
-#include <features.h>
-#include <bits/wordsize.h>
-
-/* IEEE positive infinity (-HUGE_VAL is negative infinity). */
-
-#ifdef __GNUC__
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VAL (__extension__ 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;
-
-# define __HUGE_VAL_bytes { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }
-
-static __huge_val_t __huge_val = { __HUGE_VAL_bytes };
-# define HUGE_VAL (__huge_val.__d)
-
-#endif /* GCC. */
-
-
-/* ISO C99 extensions: (float) HUGE_VALF and (long double) HUGE_VALL. */
-
-#ifdef __USE_ISOC99
-
-# if __GNUC_PREREQ(2,96)
-
-# define HUGE_VALF (__extension__ 0x1.0p255f)
-# if __WORDSIZE == 32
-# define HUGE_VALL HUGE_VAL
-# else
-/* Sparc64 uses IEEE 754 128bit long double */
-# define HUGE_VALL (__extension__ 0x1.0p32767L)
-# endif
-
-# else
-
-# ifdef __GNUC__
-
-# define HUGE_VALF \
- (__extension__ \
- ((union { unsigned __l __attribute__((__mode__(__SI__))); float __d; }) \
- { __l: 0x7f800000UL }).__d)
-
-# else /* not GCC */
-
-typedef union { unsigned char __c[4]; float __f; } __huge_valf_t;
-
-# define __HUGE_VALF_bytes { 0x7f, 0x80, 0, 0 }
-
-static __huge_valf_t __huge_valf = { __HUGE_VALF_bytes };
-# define HUGE_VALF (__huge_valf.__f)
-
-# endif /* GCC. */
-
-# if __WORDSIZE == 32
-
-/* Sparc32 has IEEE 754 64bit long double */
-# define HUGE_VALL HUGE_VAL
-
-# else
-
-/* Sparc64 uses IEEE 754 128bit long double */
-
-# ifdef __GNUC__
-
-# define HUGE_VALL \
- (__extension__ \
- ((union { struct { unsigned long __h, __l; } __i; long double __d; }) \
- { __i: { __h: 0x7fff000000000000UL, __l: 0 } }).__d)
-
-# 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 }
-
-static __huge_vall_t __huge_vall = { __HUGE_VALL_bytes };
-# define HUGE_VALL (__huge_vall.__d)
-
-# endif /* GCC. */
-
-# endif
-
-# endif /* GCC 2.95. */
-
-#endif /* __USE_ISOC99. */
Index: sysdeps/x86_64/fpu/bits/mathdef.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/x86_64/fpu/bits/mathdef.h,v
retrieving revision 1.1
diff -c -p -d -u -r1.1 mathdef.h
--- sysdeps/x86_64/fpu/bits/mathdef.h 19 Sep 2001 10:22:39 -0000 1.1
+++ sysdeps/x86_64/fpu/bits/mathdef.h 14 Mar 2004 19:31:37 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2004 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,9 +28,6 @@
typedef float float_t; /* `float' expressions are evaluated as `float'. */
typedef double double_t; /* `double' expressions are evaluated
as `double'. */
-
-/* Define `INFINITY' as value of type `float'. */
-# define INFINITY HUGE_VALF
/* The values returned by `ilogb' for 0 and NaN respectively. */
# define FP_ILOGB0 (-2147483647 - 1)