diff options
author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2015-04-13 21:16:56 +0200 |
---|---|---|
committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2015-04-13 21:19:27 +0200 |
commit | de8aadd52c97f9a04d5e8709b16dc5baf9292a09 (patch) | |
tree | b175bb57f828c47ece2f9a259efefa9a39cbc1b6 /sysdeps | |
parent | 7378b1f8f8ef25017d36af60e2d6a42939d74526 (diff) | |
download | glibc-de8aadd52c97f9a04d5e8709b16dc5baf9292a09.tar glibc-de8aadd52c97f9a04d5e8709b16dc5baf9292a09.tar.gz glibc-de8aadd52c97f9a04d5e8709b16dc5baf9292a09.tar.bz2 glibc-de8aadd52c97f9a04d5e8709b16dc5baf9292a09.zip |
Set errno for log1p on pole/domain error.
According to bug 6792, errno is not set to ERANGE/EDOM
by calling log1p/log1pf/log1pl with x = -1 or x < -1.
This patch adds a wrapper which sets errno in those cases
and returns the value of the existing __log1p function.
The log1p is now an alias to the wrapper function
instead of __log1p.
The files in sysdeps are reflecting these changes.
The ia64 implementation sets errno by itself,
thus the wrapper-file is empty.
The libm-test is adjusted for log1p-tests to check errno.
[BZ #6792]
* math/w_log1p.c: New file.
* math/w_log1pf.c: Likewise.
* math/w_log1pl.c: Likewise.
* math/Makefile (libm-calls): Add w_log1p.
* math/s_log1pl.c (log1pl): Remove weak_alias.
* sysdeps/i386/fpu/s_log1p.S (log1p): Likewise.
* sysdeps/i386/fpu/s_log1pf.S (log1pf): Likewise.
* sysdeps/i386/fpu/s_log1pl.S (log1pl): Likewise.
* sysdeps/x86_64/fpu/s_log1pl.S (log1pl): Likewise.
* sysdeps/ieee754/dbl-64/s_log1p.c (log1p): Likewise.
[NO_LONG_DOUBLE] (log1pl): Likewise.
* sysdeps/ieee754/flt-32/s_log1pf.c (log1pf): Likewise.
* sysdeps/ieee754/ldbl-128/s_log1pl.c (log1pl): Likewise.
* sysdeps/ieee754/ldbl-64-128/s_log1pl.c
(log1p): Remove long_double_symbol.
* sysdeps/ieee754/ldbl-128ibm/s_log1pl.c (log1pl): Likewise.
* sysdeps/ieee754/ldbl-64-128/w_log1pl.c: New file.
* sysdeps/ieee754/ldbl-128ibm/w_log1pl.c: Likewise.
* sysdeps/m68k/m680x0/fpu/s_log1p.c: Define empty weak_alias to
remove weak_alias for corresponding log1p function.
* sysdeps/m68k/m680x0/fpu/s_log1pf.c: Likewise.
* sysdeps/m68k/m680x0/fpu/s_log1pl.c: Likewise.
* sysdeps/ia64/fpu/w_log1p.c: New file.
* sysdeps/ia64/fpu/w_log1pf.c: Likewise.
* sysdeps/ia64/fpu/w_log1pl.c: Likewise.
* math/libm-test.inc (log1p_test_data): Add errno expectations.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/i386/fpu/s_log1p.S | 1 | ||||
-rw-r--r-- | sysdeps/i386/fpu/s_log1pf.S | 1 | ||||
-rw-r--r-- | sysdeps/i386/fpu/s_log1pl.S | 1 | ||||
-rw-r--r-- | sysdeps/ia64/fpu/w_log1p.c | 20 | ||||
-rw-r--r-- | sysdeps/ia64/fpu/w_log1pf.c | 20 | ||||
-rw-r--r-- | sysdeps/ia64/fpu/w_log1pl.c | 20 | ||||
-rw-r--r-- | sysdeps/ieee754/dbl-64/s_log1p.c | 5 | ||||
-rw-r--r-- | sysdeps/ieee754/flt-32/s_log1pf.c | 1 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128/s_log1pl.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/s_log1pl.c | 2 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm/w_log1pl.c | 23 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-64-128/s_log1pl.c | 3 | ||||
-rw-r--r-- | sysdeps/ieee754/ldbl-64-128/w_log1pl.c | 23 | ||||
-rw-r--r-- | sysdeps/m68k/m680x0/fpu/s_log1p.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/m680x0/fpu/s_log1pf.c | 2 | ||||
-rw-r--r-- | sysdeps/m68k/m680x0/fpu/s_log1pl.c | 2 | ||||
-rw-r--r-- | sysdeps/x86_64/fpu/s_log1pl.S | 1 |
17 files changed, 112 insertions, 17 deletions
diff --git a/sysdeps/i386/fpu/s_log1p.S b/sysdeps/i386/fpu/s_log1p.S index 797a2abf62..8624249dba 100644 --- a/sysdeps/i386/fpu/s_log1p.S +++ b/sysdeps/i386/fpu/s_log1p.S @@ -63,4 +63,3 @@ ENTRY(__log1p) ret END (__log1p) -weak_alias (__log1p, log1p) diff --git a/sysdeps/i386/fpu/s_log1pf.S b/sysdeps/i386/fpu/s_log1pf.S index 1e7f2e1c5f..b071e7372d 100644 --- a/sysdeps/i386/fpu/s_log1pf.S +++ b/sysdeps/i386/fpu/s_log1pf.S @@ -63,4 +63,3 @@ ENTRY(__log1pf) ret END (__log1pf) -weak_alias (__log1pf, log1pf) diff --git a/sysdeps/i386/fpu/s_log1pl.S b/sysdeps/i386/fpu/s_log1pl.S index d2d5d3bc7c..8f87cf61c6 100644 --- a/sysdeps/i386/fpu/s_log1pl.S +++ b/sysdeps/i386/fpu/s_log1pl.S @@ -75,4 +75,3 @@ ENTRY(__log1pl) ret END (__log1pl) -weak_alias (__log1pl, log1pl) diff --git a/sysdeps/ia64/fpu/w_log1p.c b/sysdeps/ia64/fpu/w_log1p.c new file mode 100644 index 0000000000..f28fb24ab8 --- /dev/null +++ b/sysdeps/ia64/fpu/w_log1p.c @@ -0,0 +1,20 @@ +/* Wrapper for __log1p that handles setting errno. + Copyright (C) 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/>. */ + +/* Nothing to do. + errno is set in sysdeps/ia64/fpu/s_log1p.S. */ diff --git a/sysdeps/ia64/fpu/w_log1pf.c b/sysdeps/ia64/fpu/w_log1pf.c new file mode 100644 index 0000000000..356cc6b282 --- /dev/null +++ b/sysdeps/ia64/fpu/w_log1pf.c @@ -0,0 +1,20 @@ +/* Wrapper for __log1pf that handles setting errno. + Copyright (C) 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/>. */ + +/* Nothing to do. + errno is set in sysdeps/ia64/fpu/s_log1pf.S. */ diff --git a/sysdeps/ia64/fpu/w_log1pl.c b/sysdeps/ia64/fpu/w_log1pl.c new file mode 100644 index 0000000000..f66c223d61 --- /dev/null +++ b/sysdeps/ia64/fpu/w_log1pl.c @@ -0,0 +1,20 @@ +/* Wrapper for __log1pl that handles setting errno. + Copyright (C) 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/>. */ + +/* Nothing to do. + errno is set in sysdeps/ia64/fpu/s_log1pl.S. */ diff --git a/sysdeps/ieee754/dbl-64/s_log1p.c b/sysdeps/ieee754/dbl-64/s_log1p.c index c922148937..86bbfbacaf 100644 --- a/sysdeps/ieee754/dbl-64/s_log1p.c +++ b/sysdeps/ieee754/dbl-64/s_log1p.c @@ -189,8 +189,3 @@ __log1p (double x) else return k * ln2_hi - ((hfsq - (s * (hfsq + R) + (k * ln2_lo + c))) - f); } -weak_alias (__log1p, log1p) -#ifdef NO_LONG_DOUBLE -strong_alias (__log1p, __log1pl) -weak_alias (__log1p, log1pl) -#endif diff --git a/sysdeps/ieee754/flt-32/s_log1pf.c b/sysdeps/ieee754/flt-32/s_log1pf.c index 5f00febc04..94c33fca16 100644 --- a/sysdeps/ieee754/flt-32/s_log1pf.c +++ b/sysdeps/ieee754/flt-32/s_log1pf.c @@ -96,4 +96,3 @@ __log1pf(float x) if(k==0) return f-(hfsq-s*(hfsq+R)); else return k*ln2_hi-((hfsq-(s*(hfsq+R)+(k*ln2_lo+c)))-f); } -weak_alias (__log1pf, log1pf) diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c index 4a30af62fa..b70a55b758 100644 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c @@ -253,5 +253,3 @@ __log1pl (long double xm1) z = z + e * C1; return (z); } - -weak_alias (__log1pl, log1pl) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c b/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c index e4bb6e8d9b..a0e24d7f22 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_log1pl.c @@ -249,5 +249,3 @@ __log1pl (long double xm1) z = z + e * C1; return (z); } - -long_double_symbol (libm, __log1pl, log1pl); diff --git a/sysdeps/ieee754/ldbl-128ibm/w_log1pl.c b/sysdeps/ieee754/ldbl-128ibm/w_log1pl.c new file mode 100644 index 0000000000..279a62a0f4 --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm/w_log1pl.c @@ -0,0 +1,23 @@ +/* Wrapper for __log1pl that handles setting errno. + Copyright (C) 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_ldbl_opt.h> +#undef weak_alias +#define weak_alias(n,a) +#include <math/w_log1pl.c> +long_double_symbol (libm, __w_log1pl, log1pl); diff --git a/sysdeps/ieee754/ldbl-64-128/s_log1pl.c b/sysdeps/ieee754/ldbl-64-128/s_log1pl.c index eebd63638a..11d56bfe9f 100644 --- a/sysdeps/ieee754/ldbl-64-128/s_log1pl.c +++ b/sysdeps/ieee754/ldbl-64-128/s_log1pl.c @@ -1,5 +1,2 @@ #include <math_ldbl_opt.h> -#undef weak_alias -#define weak_alias(n,a) #include <sysdeps/ieee754/ldbl-128/s_log1pl.c> -long_double_symbol (libm, __log1pl, log1pl); diff --git a/sysdeps/ieee754/ldbl-64-128/w_log1pl.c b/sysdeps/ieee754/ldbl-64-128/w_log1pl.c new file mode 100644 index 0000000000..279a62a0f4 --- /dev/null +++ b/sysdeps/ieee754/ldbl-64-128/w_log1pl.c @@ -0,0 +1,23 @@ +/* Wrapper for __log1pl that handles setting errno. + Copyright (C) 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_ldbl_opt.h> +#undef weak_alias +#define weak_alias(n,a) +#include <math/w_log1pl.c> +long_double_symbol (libm, __w_log1pl, log1pl); diff --git a/sysdeps/m68k/m680x0/fpu/s_log1p.c b/sysdeps/m68k/m680x0/fpu/s_log1p.c index 1840ced137..082618df18 100644 --- a/sysdeps/m68k/m680x0/fpu/s_log1p.c +++ b/sysdeps/m68k/m680x0/fpu/s_log1p.c @@ -1,2 +1,4 @@ #define FUNC log1p +#undef weak_alias +#define weak_alias(a,b) #include <s_atan.c> diff --git a/sysdeps/m68k/m680x0/fpu/s_log1pf.c b/sysdeps/m68k/m680x0/fpu/s_log1pf.c index cb7235a071..480c39519f 100644 --- a/sysdeps/m68k/m680x0/fpu/s_log1pf.c +++ b/sysdeps/m68k/m680x0/fpu/s_log1pf.c @@ -1,2 +1,4 @@ #define FUNC log1pf +#undef weak_alias +#define weak_alias(a,b) #include <s_atanf.c> diff --git a/sysdeps/m68k/m680x0/fpu/s_log1pl.c b/sysdeps/m68k/m680x0/fpu/s_log1pl.c index 8dbef89095..a4f34a4f86 100644 --- a/sysdeps/m68k/m680x0/fpu/s_log1pl.c +++ b/sysdeps/m68k/m680x0/fpu/s_log1pl.c @@ -1,2 +1,4 @@ #define FUNC log1pl +#undef weak_alias +#define weak_alias(a,b) #include <s_atanl.c> diff --git a/sysdeps/x86_64/fpu/s_log1pl.S b/sysdeps/x86_64/fpu/s_log1pl.S index af3024ad55..e83f64d3c0 100644 --- a/sysdeps/x86_64/fpu/s_log1pl.S +++ b/sysdeps/x86_64/fpu/s_log1pl.S @@ -71,4 +71,3 @@ ENTRY(__log1pl) ret END (__log1pl) -weak_alias (__log1pl, log1pl) |