From 8400b18bfb630399e4b028cabe72ba55b580ef66 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 1 Feb 2006 03:14:01 +0000 Subject: * sysdeps/unix/sysv/linux/alpha/fpu/Implies: New file. * sysdeps/alpha/fpu/s_ceil.c: Include math_ldbl_opt.h, add compat_symbol if LONG_DOUBLE_COMPAT. * sysdeps/alpha/fpu/s_copysign.c: Likewise. * sysdeps/alpha/fpu/s_fabs.c: Likewise. * sysdeps/alpha/fpu/s_floor.c: Likewise. * sysdeps/alpha/fpu/s_rint.c: Likewise. * sysdeps/alpha/soft-fp/e_sqrtl.c: New file. * sysdeps/alpha/Implies: Add ieee754/ldbl-128. * sysdeps/unix/sysv/linux/alpha/bits/wordsize.h: New file. * sysdeps/unix/sysv/linux/alpha/Implies: Add ieee754/ldbl-64-128, ieee754/ldbl-opt. * sysdeps/alpha/bits/mathdef.h (__NO_LONG_DOUBLE_MATH): Remove. * sysdeps/unix/sysv/linux/alpha/nldbl-abi.h: New file. * sysdeps/unix/sysv/linux/alpha/Makefile [$(subdir) = math] (libm-routines): Add multc3, divtc3. --- ChangeLog | 18 +++++++++++++ sysdeps/alpha/Implies | 5 ++-- sysdeps/alpha/bits/mathdef.h | 10 ++------ sysdeps/alpha/fpu/s_ceil.c | 6 ++++- sysdeps/alpha/fpu/s_copysign.c | 10 +++++++- sysdeps/alpha/fpu/s_fabs.c | 6 ++++- sysdeps/alpha/fpu/s_floor.c | 6 ++++- sysdeps/alpha/fpu/s_rint.c | 6 ++++- sysdeps/alpha/soft-fp/e_sqrtl.c | 37 +++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/alpha/Implies | 3 +++ sysdeps/unix/sysv/linux/alpha/Makefile | 10 ++++++++ sysdeps/unix/sysv/linux/alpha/bits/wordsize.h | 30 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/alpha/fpu/Implies | 2 ++ sysdeps/unix/sysv/linux/alpha/nldbl-abi.h | 8 ++++++ 14 files changed, 142 insertions(+), 15 deletions(-) create mode 100644 sysdeps/alpha/soft-fp/e_sqrtl.c create mode 100644 sysdeps/unix/sysv/linux/alpha/bits/wordsize.h create mode 100644 sysdeps/unix/sysv/linux/alpha/fpu/Implies create mode 100644 sysdeps/unix/sysv/linux/alpha/nldbl-abi.h diff --git a/ChangeLog b/ChangeLog index 34ea126610..fd32cdf05c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,23 @@ 2006-01-31 Jakub Jelinek + * sysdeps/unix/sysv/linux/alpha/fpu/Implies: New file. + * sysdeps/alpha/fpu/s_ceil.c: Include math_ldbl_opt.h, add + compat_symbol if LONG_DOUBLE_COMPAT. + * sysdeps/alpha/fpu/s_copysign.c: Likewise. + * sysdeps/alpha/fpu/s_fabs.c: Likewise. + * sysdeps/alpha/fpu/s_floor.c: Likewise. + * sysdeps/alpha/fpu/s_rint.c: Likewise. + * sysdeps/alpha/soft-fp/e_sqrtl.c: New file. + * sysdeps/alpha/Implies: Add ieee754/ldbl-128. + + * sysdeps/unix/sysv/linux/alpha/bits/wordsize.h: New file. + * sysdeps/unix/sysv/linux/alpha/Implies: Add ieee754/ldbl-64-128, + ieee754/ldbl-opt. + * sysdeps/alpha/bits/mathdef.h (__NO_LONG_DOUBLE_MATH): Remove. + * sysdeps/unix/sysv/linux/alpha/nldbl-abi.h: New file. + * sysdeps/unix/sysv/linux/alpha/Makefile + [$(subdir) = math] (libm-routines): Add multc3, divtc3. + * math/divtc3.c: New file. * math/multc3.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc32/Makefile diff --git a/sysdeps/alpha/Implies b/sysdeps/alpha/Implies index 4b354f3e47..18c35908c4 100644 --- a/sysdeps/alpha/Implies +++ b/sysdeps/alpha/Implies @@ -1,5 +1,6 @@ wordsize-64 -# Alpha uses IEEE 754 single and double precision floating point. -ieee754/flt-32 +# Alpha uses IEEE 754 single, double and quad precision floating point. +ieee754/ldbl-128 ieee754/dbl-64 +ieee754/flt-32 alpha/soft-fp diff --git a/sysdeps/alpha/bits/mathdef.h b/sysdeps/alpha/bits/mathdef.h index d5f2d5a843..cbfaf68e22 100644 --- a/sysdeps/alpha/bits/mathdef.h +++ b/sysdeps/alpha/bits/mathdef.h @@ -1,5 +1,5 @@ -/* Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004 - Free Software Foundation, Inc. +/* Copyright (C) 1997,1998,1999,2000,2003,2004,2006 + 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 @@ -55,12 +55,6 @@ typedef double double_t; #endif /* ISO C99 && MATH_H */ -#ifndef __NO_LONG_DOUBLE_MATH -/* Signal that we do not really have a `long double'. The disables the - declaration of all the `long double' function variants. */ -# define __NO_LONG_DOUBLE_MATH 1 -#endif - #if defined _COMPLEX_H && !defined _COMPLEX_H_MATHDEF # define _COMPLEX_H_MATHDEF 1 # if defined(__GNUC__) && !__GNUC_PREREQ(3,4) diff --git a/sysdeps/alpha/fpu/s_ceil.c b/sysdeps/alpha/fpu/s_ceil.c index a7a46bb2b4..ec58fd9486 100644 --- a/sysdeps/alpha/fpu/s_ceil.c +++ b/sysdeps/alpha/fpu/s_ceil.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 2000, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include +#include /* Use the -inf rounding mode conversion instructions to implement ceil, via something akin to -floor(-x). This is much faster than @@ -52,3 +53,6 @@ weak_alias (__ceil, ceil) strong_alias (__ceil, __ceill) weak_alias (__ceil, ceill) #endif +#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) +compat_symbol (libm, __ceil, ceill, GLIBC_2_0); +#endif diff --git a/sysdeps/alpha/fpu/s_copysign.c b/sysdeps/alpha/fpu/s_copysign.c index e86778e840..52c632ec4c 100644 --- a/sysdeps/alpha/fpu/s_copysign.c +++ b/sysdeps/alpha/fpu/s_copysign.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include +#include double __copysign (double x, double y) @@ -31,3 +32,10 @@ weak_alias (__copysign, copysign) strong_alias (__copysign, __copysignl) weak_alias (__copysign, copysignl) #endif +#ifdef IS_IN_libm +# if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) +compat_symbol (libm, __copysign, copysignl, GLIBC_2_0); +# endif +#elif LONG_DOUBLE_COMPAT(libc, GLIBC_2_0) +compat_symbol (libc, __copysign, copysignl, GLIBC_2_0); +#endif diff --git a/sysdeps/alpha/fpu/s_fabs.c b/sysdeps/alpha/fpu/s_fabs.c index f7a2f9353b..9bc42f68d0 100644 --- a/sysdeps/alpha/fpu/s_fabs.c +++ b/sysdeps/alpha/fpu/s_fabs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include +#include double __fabs (double x) @@ -35,3 +36,6 @@ weak_alias (__fabs, fabs) strong_alias (__fabs, __fabsl) weak_alias (__fabs, fabsl) #endif +#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) +compat_symbol (libm, __fabs, fabsl, GLIBC_2_0); +#endif diff --git a/sysdeps/alpha/fpu/s_floor.c b/sysdeps/alpha/fpu/s_floor.c index c6872f5fcf..b22c52303d 100644 --- a/sysdeps/alpha/fpu/s_floor.c +++ b/sysdeps/alpha/fpu/s_floor.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include +#include /* Use the -inf rounding mode conversion instructions to implement @@ -53,3 +54,6 @@ weak_alias (__floor, floor) strong_alias (__floor, __floorl) weak_alias (__floor, floorl) #endif +#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) +compat_symbol (libm, __floor, floorl, GLIBC_2_0); +#endif diff --git a/sysdeps/alpha/fpu/s_rint.c b/sysdeps/alpha/fpu/s_rint.c index 61cba04c27..be09651b35 100644 --- a/sysdeps/alpha/fpu/s_rint.c +++ b/sysdeps/alpha/fpu/s_rint.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Richard Henderson. @@ -18,6 +18,7 @@ 02111-1307 USA. */ #include +#include double @@ -48,3 +49,6 @@ weak_alias (__rint, rint) strong_alias (__rint, __rintl) weak_alias (__rint, rintl) #endif +#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0) +compat_symbol (libm, __rint, rintl, GLIBC_2_0); +#endif diff --git a/sysdeps/alpha/soft-fp/e_sqrtl.c b/sysdeps/alpha/soft-fp/e_sqrtl.c new file mode 100644 index 0000000000..a1d09725b7 --- /dev/null +++ b/sysdeps/alpha/soft-fp/e_sqrtl.c @@ -0,0 +1,37 @@ +/* long double square root in software floating-point emulation. + Copyright (C) 1997, 1999, 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Richard Henderson (rth@cygnus.com) and + Jakub Jelinek (jj@ultra.linux.cz). + + 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. */ + +#include "local-soft-fp.h" + +long double +__ieee754_sqrtl (const long double a) +{ + FP_DECL_EX; + FP_DECL_Q(A); FP_DECL_Q(C); + long double c; + + FP_INIT_ROUNDMODE; + FP_UNPACK_Q(A, a); + FP_SQRT_Q(C, A); + FP_PACK_Q(c, C); + FP_HANDLE_EXCEPTIONS; + return c; +} diff --git a/sysdeps/unix/sysv/linux/alpha/Implies b/sysdeps/unix/sysv/linux/alpha/Implies index 8d91c80097..1616efecbe 100644 --- a/sysdeps/unix/sysv/linux/alpha/Implies +++ b/sysdeps/unix/sysv/linux/alpha/Implies @@ -1 +1,4 @@ unix/sysv/linux/wordsize-64 +# These supply the ABI compatibility for when long double was double. +ieee754/ldbl-64-128 +ieee754/ldbl-opt diff --git a/sysdeps/unix/sysv/linux/alpha/Makefile b/sysdeps/unix/sysv/linux/alpha/Makefile index 37a9214fe9..f64f23fd7a 100644 --- a/sysdeps/unix/sysv/linux/alpha/Makefile +++ b/sysdeps/unix/sysv/linux/alpha/Makefile @@ -26,3 +26,13 @@ endif ifeq ($(subdir),signal) sysdep_routines += rt_sigaction endif + +ifeq ($(subdir),math) +# These 2 routines are normally in libgcc{.a,_s.so.1}. +# However, alpha -mlong-double-128 libgcc relies on +# glibc providing _Ots* routines and without these files +# glibc relies on __multc3/__divtc3 only provided +# by libgcc if configured with -mlong-double-128. +# Provide these routines here as well. +libm-routines += multc3 divtc3 +endif # math diff --git a/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h new file mode 100644 index 0000000000..22fc64109c --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/bits/wordsize.h @@ -0,0 +1,30 @@ +/* Copyright (C) 1999, 2006 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. */ + +#define __WORDSIZE 64 + +#if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL + +/* Signal that we didn't used to have a `long double'. The changes all + the `long double' function variants to be redirects to the double + functions. */ +# define __LONG_DOUBLE_MATH_OPTIONAL 1 +# ifndef __LONG_DOUBLE_128__ +# define __NO_LONG_DOUBLE_MATH 1 +# endif +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/fpu/Implies b/sysdeps/unix/sysv/linux/alpha/fpu/Implies new file mode 100644 index 0000000000..d76f511c2e --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/fpu/Implies @@ -0,0 +1,2 @@ +# Override ldbl-opt with alpha specific routines. +alpha/fpu diff --git a/sysdeps/unix/sysv/linux/alpha/nldbl-abi.h b/sysdeps/unix/sysv/linux/alpha/nldbl-abi.h new file mode 100644 index 0000000000..bd985cc59c --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/nldbl-abi.h @@ -0,0 +1,8 @@ +/* ABI version for long double switch. + This is used by the Versions and math_ldbl_opt.h files in + sysdeps/ieee754/ldbl-opt/. It gives the ABI version where + long double == double was replaced with proper long double + for libm *l functions and libc functions using long double. */ + +#define NLDBL_VERSION GLIBC_2.4 +#define LONG_DOUBLE_COMPAT_VERSION GLIBC_2_4 -- cgit 1.4.1