diff options
42 files changed, 607 insertions, 932 deletions
@@ -1,3 +1,43 @@ +2004-03-15 Richard Henderson <rth@redhat.com> + + * 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. + 2004-03-15 Ulrich Drepper <drepper@redhat.com> * stdio-common/vfscanf.c: Simplify error handling macros. Use diff --git a/bits/huge_val.h b/bits/huge_val.h index 545b8a615b..e102ac3220 100644 --- a/bits/huge_val.h +++ b/bits/huge_val.h @@ -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 diff --git a/bits/huge_valf.h b/bits/huge_valf.h new file mode 100644 index 0000000000..4cb5ebdfcb --- /dev/null +++ b/bits/huge_valf.h @@ -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 diff --git a/bits/huge_vall.h b/bits/huge_vall.h new file mode 100644 index 0000000000..d5e8e2237b --- /dev/null +++ b/bits/huge_vall.h @@ -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 diff --git a/bits/inf.h b/bits/inf.h new file mode 100644 index 0000000000..2d526adb23 --- /dev/null +++ b/bits/inf.h @@ -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 diff --git a/bits/mathdef.h b/bits/mathdef.h index d08dc3820d..00c67241a0 100644 --- a/bits/mathdef.h +++ b/bits/mathdef.h @@ -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,10 +30,6 @@ typedef double float_t; /* `float' expressions are evaluated as 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) # define FP_ILOGBNAN 2147483647 diff --git a/math/Makefile b/math/Makefile index c78a2a6d15..6a9134b5dd 100644 --- a/math/Makefile +++ b/math/Makefile @@ -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 diff --git a/math/math.h b/math/math.h index 9161412f98..65fd715510 100644 --- a/math/math.h +++ b/math/math.h @@ -31,15 +31,20 @@ __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> + +/* Get machine-dependent INFINITY value. */ +# include <bits/inf.h> /* Get machine-dependent NAN value (returned for some domain errors). */ -#ifdef __USE_ISOC99 # include <bits/nan.h> -#endif +#endif /* __USE_ISOC99 */ + /* 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, so we can easily declare each function as both `name' and `__name', diff --git a/sysdeps/alpha/fpu/bits/mathdef.h b/sysdeps/alpha/fpu/bits/mathdef.h index 7979822996..d5f2d5a843 100644 --- a/sysdeps/alpha/fpu/bits/mathdef.h +++ b/sysdeps/alpha/fpu/bits/mathdef.h @@ -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,18 +34,12 @@ 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 @@ -52,9 +47,6 @@ typedef double double_t; typedef double float_t; typedef double double_t; -/* Define `INFINITY' as value of type `float'. */ -# define INFINITY HUGE_VALF - # endif /* The values returned by `ilogb' for 0 and NaN respectively. */ diff --git a/sysdeps/arm/bits/huge_val.h b/sysdeps/arm/bits/huge_val.h index 625cdc5c37..3339a0d01c 100644 --- a/sysdeps/arm/bits/huge_val.h +++ b/sysdeps/arm/bits/huge_val.h @@ -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) +#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__ -# else - -# 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 = { __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,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. */ diff --git a/sysdeps/arm/fpu/bits/mathdef.h b/sysdeps/arm/fpu/bits/mathdef.h index 44d7f0ddea..e013e74b7e 100644 --- a/ |