diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-10-13 16:53:09 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-10-13 16:53:09 +0000 |
commit | 2020748d8efb7fbadd43a49cc3859dcf4a93472e (patch) | |
tree | 733421e99928124e5ca51f4fa68246c596e67140 /sysdeps/powerpc/fpu | |
parent | e8dab9477f33ab7a67405f4e147cbaa1a4bb443b (diff) | |
download | glibc-2020748d8efb7fbadd43a49cc3859dcf4a93472e.tar.gz glibc-2020748d8efb7fbadd43a49cc3859dcf4a93472e.tar.xz glibc-2020748d8efb7fbadd43a49cc3859dcf4a93472e.zip |
Move powerpc llround implementations to powerpc32 directory.
sysdeps/powerpc/fpu/ has versions of llround and llroundf that are actually used only for powerpc32 because sysdeps/powerpc/powerpc64/fpu/ has its own versions of those functions. This patch moves them into sysdeps/powerpc/powerpc32/fpu to reflect where they are actually used (in preparation for fixing other problems with those functions). Tested for powerpc that installed stripped shared libraries are unchanged by this patch. * sysdeps/powerpc/fpu/s_llround.c: Move to .... * sysdeps/powerpc/powerpc32/fpu/s_llround.c: ...here. * sysdeps/powerpc/fpu/s_llroundf.c: Move to .... * sysdeps/powerpc/powerpc32/fpu/s_llroundf.c: ...here.
Diffstat (limited to 'sysdeps/powerpc/fpu')
-rw-r--r-- | sysdeps/powerpc/fpu/s_llround.c | 52 | ||||
-rw-r--r-- | sysdeps/powerpc/fpu/s_llroundf.c | 44 |
2 files changed, 0 insertions, 96 deletions
diff --git a/sysdeps/powerpc/fpu/s_llround.c b/sysdeps/powerpc/fpu/s_llround.c deleted file mode 100644 index 85514a1d3f..0000000000 --- a/sysdeps/powerpc/fpu/s_llround.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Round double value to long long int. - Copyright (C) 1997-2015 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, see - <http://www.gnu.org/licenses/>. */ - -#include <math.h> -#include <math_ldbl_opt.h> - -/* Round to the nearest integer, with values exactly on a 0.5 boundary - rounded away from zero, regardless of the current rounding mode. - If (long long)x, when x is out of range of a long long, clips at - LLONG_MAX or LLONG_MIN, then this implementation also clips. */ - -long long int -__llround (double x) -{ - long long xr = (long long) x; - double xrf = (double) xr; - - if (x >= 0.0) - { - if (x - xrf >= 0.5) - xr += (long long) ((unsigned long long) xr + 1) > 0; - } - else - { - if (xrf - x >= 0.5) - xr -= (long long) ((unsigned long long) xr - 1) < 0; - } - return xr; -} -weak_alias (__llround, llround) -#ifdef NO_LONG_DOUBLE -strong_alias (__llround, __llroundl) -weak_alias (__llround, llroundl) -#endif -#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_1) -compat_symbol (libm, __llround, llroundl, GLIBC_2_1); -#endif diff --git a/sysdeps/powerpc/fpu/s_llroundf.c b/sysdeps/powerpc/fpu/s_llroundf.c deleted file mode 100644 index 8ce4b26191..0000000000 --- a/sysdeps/powerpc/fpu/s_llroundf.c +++ /dev/null @@ -1,44 +0,0 @@ -/* Round float value to long long int. - Copyright (C) 1997-2015 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, see - <http://www.gnu.org/licenses/>. */ - -#include <math.h> - -/* Round to the nearest integer, with values exactly on a 0.5 boundary - rounded away from zero, regardless of the current rounding mode. - If (long long)x, when x is out of range of a long long, clips at - LLONG_MAX or LLONG_MIN, then this implementation also clips. */ - -long long int -__llroundf (float x) -{ - long long xr = (long long) x; - float xrf = (float) xr; - - if (x >= 0.0) - { - if (x - xrf >= 0.5) - xr += (long long) ((unsigned long long) xr + 1) > 0; - } - else - { - if (xrf - x >= 0.5) - xr -= (long long) ((unsigned long long) xr - 1) < 0; - } - return xr; -} -weak_alias (__llroundf, llroundf) |