From 2a1ece14a516ff546f38f5e2a68a23f0cd8a6701 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 13 Feb 2004 04:49:04 +0000 Subject: Update. 2004-02-12 Ulrich Drepper * posix/getopt.h: Add some non-gcc support. Patch by Aharon Robbins. 2004-02-12 Mark Brown * sysdeps/ia64/fpu/e_fmodf.S: Added text of Intel license. * sysdeps/powerpc/fpu/s_lrint.c: Move to... * sysdeps/powerpc/powerpc32/fpu/s_lrint.c: ... here. * sysdeps/powerpc/fpu/s_llrint.c: Move to... * sysdeps/powerpc/powerpc32/fpu/s_llrint.c: ... here. * sysdeps/powerpc/fpu/s_llrintf.c: Move to... * sysdeps/powerpc/powerpc32/fpu/s_llrintf.c: ... here. * sysdeps/powerpc/powerpc64/fpu/s_lrint.c: New file. * sysdeps/powerpc/powerpc64/fpu/s_llrint.c: New file. * sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: New file. * sysdeps/powerpc/powerpc64/fpu/s_llrintf.c: New file. --- ChangeLog | 19 +++++++++++ posix/getopt.h | 6 +++- sysdeps/ia64/fpu/e_fmodf.S | 15 +++++++++ sysdeps/powerpc/fpu/s_llrint.c | 31 ------------------ sysdeps/powerpc/fpu/s_llrintf.c | 27 ---------------- sysdeps/powerpc/fpu/s_lrint.c | 53 ------------------------------- sysdeps/powerpc/powerpc32/fpu/s_llrint.c | 31 ++++++++++++++++++ sysdeps/powerpc/powerpc32/fpu/s_llrintf.c | 27 ++++++++++++++++ sysdeps/powerpc/powerpc32/fpu/s_lrint.c | 53 +++++++++++++++++++++++++++++++ sysdeps/powerpc/powerpc64/fpu/s_llrint.c | 46 +++++++++++++++++++++++++++ sysdeps/powerpc/powerpc64/fpu/s_llrintf.c | 36 +++++++++++++++++++++ sysdeps/powerpc/powerpc64/fpu/s_lrintf.S | 1 + 12 files changed, 233 insertions(+), 112 deletions(-) delete mode 100644 sysdeps/powerpc/fpu/s_llrint.c delete mode 100644 sysdeps/powerpc/fpu/s_llrintf.c delete mode 100644 sysdeps/powerpc/fpu/s_lrint.c create mode 100644 sysdeps/powerpc/powerpc32/fpu/s_llrint.c create mode 100644 sysdeps/powerpc/powerpc32/fpu/s_llrintf.c create mode 100644 sysdeps/powerpc/powerpc32/fpu/s_lrint.c create mode 100644 sysdeps/powerpc/powerpc64/fpu/s_llrint.c create mode 100644 sysdeps/powerpc/powerpc64/fpu/s_llrintf.c create mode 100644 sysdeps/powerpc/powerpc64/fpu/s_lrintf.S diff --git a/ChangeLog b/ChangeLog index e8744951b1..2c00fb38fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ +2004-02-12 Ulrich Drepper + + * posix/getopt.h: Add some non-gcc support. Patch by Aharon Robbins. + +2004-02-12 Mark Brown + + * sysdeps/ia64/fpu/e_fmodf.S: Added text of Intel license. + 2004-02-12 Jakub Jelinek + * sysdeps/powerpc/fpu/s_lrint.c: Move to... + * sysdeps/powerpc/powerpc32/fpu/s_lrint.c: ... here. + * sysdeps/powerpc/fpu/s_llrint.c: Move to... + * sysdeps/powerpc/powerpc32/fpu/s_llrint.c: ... here. + * sysdeps/powerpc/fpu/s_llrintf.c: Move to... + * sysdeps/powerpc/powerpc32/fpu/s_llrintf.c: ... here. + * sysdeps/powerpc/powerpc64/fpu/s_lrint.c: New file. + * sysdeps/powerpc/powerpc64/fpu/s_llrint.c: New file. + * sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: New file. + * sysdeps/powerpc/powerpc64/fpu/s_llrintf.c: New file. + * math/libm-test.inc (lrint_test): Add new test. (llrint_test, lround_test, llround_test): Likewise. * sysdeps/ieee754/ldbl-128/s_lroundl.c (__lroundl): Fix special case diff --git a/posix/getopt.h b/posix/getopt.h index 53cb2baaf0..675d3a73ba 100644 --- a/posix/getopt.h +++ b/posix/getopt.h @@ -1,5 +1,6 @@ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999,2001,2003 Free Software Foundation, Inc. + Copyright (C) 1989-1994,1996-1999,2001,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 @@ -35,6 +36,9 @@ #endif #ifndef __THROW +# ifndef __GNUC__ +# define __GNUC_PREREQ(maj, min) (0) +# endif # if defined __cplusplus && __GNUC_PREREQ (2,8) # define __THROW throw () # else diff --git a/sysdeps/ia64/fpu/e_fmodf.S b/sysdeps/ia64/fpu/e_fmodf.S index 9ac03a9a5e..5b6390eeec 100644 --- a/sysdeps/ia64/fpu/e_fmodf.S +++ b/sysdeps/ia64/fpu/e_fmodf.S @@ -6,6 +6,21 @@ // Bob Norin, Shane Story, and Ping Tak Peter Tang of the Computational // Software Lab, Intel Corporation. // +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// * Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// * The name of Intel Corporation may not be used to endorse or promote +// products derived from this software without specific prior written +// permission. +// // WARRANTY DISCLAIMER // // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS diff --git a/sysdeps/powerpc/fpu/s_llrint.c b/sysdeps/powerpc/fpu/s_llrint.c deleted file mode 100644 index 7fdc296b0b..0000000000 --- a/sysdeps/powerpc/fpu/s_llrint.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Round a double value to a long long in the current rounding mode. - Copyright (C) 1997 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. */ - -#include "math.h" - -long long int -__llrint (double x) -{ - return (long long int) __rint (x); -} -weak_alias (__llrint, llrint) -#ifdef NO_LONG_DOUBLE -strong_alias (__llrint, __llrintl) -weak_alias (__llrint, llrintl) -#endif diff --git a/sysdeps/powerpc/fpu/s_llrintf.c b/sysdeps/powerpc/fpu/s_llrintf.c deleted file mode 100644 index 0439e45589..0000000000 --- a/sysdeps/powerpc/fpu/s_llrintf.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Round a float value to a long long in the current rounding mode. - Copyright (C) 1997 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. */ - -#include "math.h" - -long long int -__llrintf (float x) -{ - return (long long int) __rintf (x); -} -weak_alias (__llrintf, llrintf) diff --git a/sysdeps/powerpc/fpu/s_lrint.c b/sysdeps/powerpc/fpu/s_lrint.c deleted file mode 100644 index c78fb035bd..0000000000 --- a/sysdeps/powerpc/fpu/s_lrint.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Round floating-point to integer. PowerPC version. - Copyright (C) 1997,2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - 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. */ - -/* Kludge to avoid decls that will confuse strong_alias below. */ -#define __lrintf XXX__lrintf -#define __lrintl XXX__lrintl -#define lrintf XXXlrintf -#define lrintl XXXlrintl - -#include "math.h" - -#undef __lrintf -#undef __lrintl -#undef lrintf -#undef lrintl - - -long int -__lrint (double x) -{ - union - { - double d; - int ll[2]; - } u; - asm ("fctiw %0,%1" : "=f"(u.d) : "f"(x)); - return u.ll[1]; -} -weak_alias (__lrint, lrint) - -strong_alias (__lrint, __lrintf) -weak_alias (__lrint, lrintf) - -#ifdef NO_LONG_DOUBLE -strong_alias (__lrint, __lrintl) -weak_alias (__lrint, lrintl) -#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/s_llrint.c b/sysdeps/powerpc/powerpc32/fpu/s_llrint.c new file mode 100644 index 0000000000..7fdc296b0b --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/s_llrint.c @@ -0,0 +1,31 @@ +/* Round a double value to a long long in the current rounding mode. + Copyright (C) 1997 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. */ + +#include "math.h" + +long long int +__llrint (double x) +{ + return (long long int) __rint (x); +} +weak_alias (__llrint, llrint) +#ifdef NO_LONG_DOUBLE +strong_alias (__llrint, __llrintl) +weak_alias (__llrint, llrintl) +#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c b/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c new file mode 100644 index 0000000000..0439e45589 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/s_llrintf.c @@ -0,0 +1,27 @@ +/* Round a float value to a long long in the current rounding mode. + Copyright (C) 1997 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. */ + +#include "math.h" + +long long int +__llrintf (float x) +{ + return (long long int) __rintf (x); +} +weak_alias (__llrintf, llrintf) diff --git a/sysdeps/powerpc/powerpc32/fpu/s_lrint.c b/sysdeps/powerpc/powerpc32/fpu/s_lrint.c new file mode 100644 index 0000000000..c78fb035bd --- /dev/null +++ b/sysdeps/powerpc/powerpc32/fpu/s_lrint.c @@ -0,0 +1,53 @@ +/* Round floating-point to integer. PowerPC version. + Copyright (C) 1997,2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + 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. */ + +/* Kludge to avoid decls that will confuse strong_alias below. */ +#define __lrintf XXX__lrintf +#define __lrintl XXX__lrintl +#define lrintf XXXlrintf +#define lrintl XXXlrintl + +#include "math.h" + +#undef __lrintf +#undef __lrintl +#undef lrintf +#undef lrintl + + +long int +__lrint (double x) +{ + union + { + double d; + int ll[2]; + } u; + asm ("fctiw %0,%1" : "=f"(u.d) : "f"(x)); + return u.ll[1]; +} +weak_alias (__lrint, lrint) + +strong_alias (__lrint, __lrintf) +weak_alias (__lrint, lrintf) + +#ifdef NO_LONG_DOUBLE +strong_alias (__lrint, __lrintl) +weak_alias (__lrint, lrintl) +#endif diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrint.c b/sysdeps/powerpc/powerpc64/fpu/s_llrint.c new file mode 100644 index 0000000000..907299ba3e --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/s_llrint.c @@ -0,0 +1,46 @@ +/* Round a double value to a long long in the current rounding mode. + Copyright (C) 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. */ + +/* Kludge to avoid decls that will confuse strong_alias below. */ +#define __lrint XXX__lrint +#define __lrintl XXX__lrintl +#define lrint XXXlrint +#define lrintl XXXlrintl + +#include "math.h" + +#undef __lrint +#undef __lrintl +#undef lrint +#undef lrintl + +long long int +__llrint (double x) +{ + return (long long int) __rint (x); +} +string_alias (__llrint, __lrint) +weak_alias (__llrint, llrint) +weak_alias (__lrint, lrint) +#ifdef NO_LONG_DOUBLE +strong_alias (__llrint, __llrintl) +weak_alias (__llrint, llrintl) +strong_alias (__lrint, __lrintl) +weak_alias (__lrint, lrintl) +#endif diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c b/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c new file mode 100644 index 0000000000..90db250e95 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c @@ -0,0 +1,36 @@ +/* Round a float value to a long long in the current rounding mode. + Copyright (C) 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. */ + +/* Kludge to avoid decls that will confuse strong_alias below. */ +#define __lrintl XXX__lrintf +#define lrintl XXXlrintf + +#include "math.h" + +#undef __lrintf +#undef lrintf + +long long int +__llrintf (float x) +{ + return (long long int) __rintf (x); +} +strong_alias (__llrintf, __lrintf) +weak_alias (__llrintf, llrintf) +weak_alias (__lrintf, lrintf) diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S b/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S new file mode 100644 index 0000000000..3ea4e29319 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S @@ -0,0 +1 @@ +/* __lrintf is in s_llrintf.c */ -- cgit v1.2.3