mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-12-15 04:20:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Set errno for log1p on pole/domain error.

Browse Source 
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.
This commit is contained in:
Stefan Liebler 2015-04-13 21:16:56 +02:00 committed by Andreas Krebbel
parent 7378b1f8f8
commit de8aadd52c
25 changed files with 261 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ChangeLog
View File

@ -1,3 +1,33 @@
2015-04-13 Stefan Liebler <stli@linux.vnet.ibm.com>
[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.
2015-04-10 Joseph Myers <joseph@codesourcery.com>
[BZ #18247]

2
NEWS
View File

@ -9,7 +9,7 @@ Version 2.22
* The following bugs are resolved with this release:
4719, 13064, 14094, 14841, 14906, 15319, 15467, 15790, 15969, 16351,
4719, 6792, 13064, 14094, 14841, 14906, 15319, 15467, 15790, 15969, 16351,
16512, 16560, 16783, 16850, 17090, 17195, 17269, 17523, 17542, 17569,
17588, 17596, 17620, 17621, 17628, 17631, 17711, 17776, 17779, 17792,
17836, 17912, 17916, 17930, 17932, 17944, 17949, 17964, 17965, 17967,

2
math/Makefile
View File

@ -47,7 +47,7 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \
e_ilogb \
k_cos k_rem_pio2 k_sin k_tan s_asinh s_atan s_cbrt \
s_ceil s_cos s_erf s_expm1 s_fabs \
s_floor s_log1p s_logb \
s_floor s_log1p w_log1p s_logb \
s_nextafter s_nexttoward s_rint s_scalbln w_scalbln \
s_significand s_sin s_tan s_tanh w_acos w_acosh w_asin \
w_atan2 w_atanh w_cosh w_drem w_exp w_exp2 w_exp10 w_fmod \

8
math/libm-test.inc
View File

@ -7798,10 +7798,10 @@ log10_test (void)
static const struct test_f_f_data log1p_test_data[] =
{
TEST_f_f (log1p, -1, minus_infty, DIVIDE_BY_ZERO_EXCEPTION),
TEST_f_f (log1p, -2, qnan_value, INVALID_EXCEPTION),
TEST_f_f (log1p, -max_value, qnan_value, INVALID_EXCEPTION),
TEST_f_f (log1p, minus_infty, qnan_value, INVALID_EXCEPTION),
TEST_f_f (log1p, -1, minus_infty, DIVIDE_BY_ZERO_EXCEPTION|ERRNO_ERANGE),
TEST_f_f (log1p, -2, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
TEST_f_f (log1p, -max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
TEST_f_f (log1p, minus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM),
TEST_f_f (log1p, plus_infty, plus_infty),
TEST_f_f (log1p, qnan_value, qnan_value, NO_INEXACT_EXCEPTION),

1
math/s_log1pl.c
View File

@ -9,6 +9,5 @@ __log1pl (long double x)
__set_errno (ENOSYS);
return 0.0;
}
weak_alias (__log1pl, log1pl)
stub_warning (log1pl)

41
math/w_log1p.c Normal file
View File

@ -0,0 +1,41 @@
/* 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/>. */
#include <errno.h>
#include <math.h>
#include <math_private.h>
double
__w_log1p (double x)
{
if (__glibc_unlikely (islessequal (x, -1.0)))
{
if (x == -1.0)
__set_errno (ERANGE);
else
__set_errno (EDOM);
}
return __log1p (x);
}
weak_alias (__w_log1p, log1p)
#ifdef NO_LONG_DOUBLE
strong_alias (__w_log1p, __log1pl)
weak_alias (__w_log1p, log1pl)
#endif

36
math/w_log1pf.c Normal file
View File

@ -0,0 +1,36 @@
/* 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/>. */
#include <errno.h>
#include <math.h>
#include <math_private.h>
float
__w_log1pf (float x)
{
if (__glibc_unlikely (islessequal (x, -1.0f)))
{
if (x == -1.0f)
__set_errno (ERANGE);
else
__set_errno (EDOM);
}
return __log1pf (x);
}
weak_alias (__w_log1pf, log1pf)

36
math/w_log1pl.c Normal file
View File

@ -0,0 +1,36 @@
/* 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 <errno.h>
#include <math.h>
#include <math_private.h>
long double
__w_log1pl (long double x)
{
if (__glibc_unlikely (islessequal (x, -1.0L)))
{
if (x == -1.0L)
__set_errno (ERANGE);
else
__set_errno (EDOM);
}
return __log1pl (x);
}
weak_alias (__w_log1pl, log1pl)

1
sysdeps/i386/fpu/s_log1p.S
View File

@ -63,4 +63,3 @@ ENTRY(__log1p)
ret
END (__log1p)
weak_alias (__log1p, log1p)

1
sysdeps/i386/fpu/s_log1pf.S
View File

@ -63,4 +63,3 @@ ENTRY(__log1pf)
ret
END (__log1pf)
weak_alias (__log1pf, log1pf)

1
sysdeps/i386/fpu/s_log1pl.S
View File

@ -75,4 +75,3 @@ ENTRY(__log1pl)
ret
END (__log1pl)
weak_alias (__log1pl, log1pl)

20
sysdeps/ia64/fpu/w_log1p.c Normal file
View File

@ -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. */

20
sysdeps/ia64/fpu/w_log1pf.c Normal file
View File

@ -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. */

20
sysdeps/ia64/fpu/w_log1pl.c Normal file
View File

@ -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. */

5
sysdeps/ieee754/dbl-64/s_log1p.c
View File

@ -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

1
sysdeps/ieee754/flt-32/s_log1pf.c
View File

@ -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)

2
sysdeps/ieee754/ldbl-128/s_log1pl.c
View File

@ -253,5 +253,3 @@ __log1pl (long double xm1)
z = z + e * C1;
return (z);
}
weak_alias (__log1pl, log1pl)

2
sysdeps/ieee754/ldbl-128ibm/s_log1pl.c
View File

@ -249,5 +249,3 @@ __log1pl (long double xm1)
z = z + e * C1;
return (z);
}
long_double_symbol (libm, __log1pl, log1pl);

23
sysdeps/ieee754/ldbl-128ibm/w_log1pl.c Normal file
View File

@ -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);

3
sysdeps/ieee754/ldbl-64-128/s_log1pl.c
View File

@ -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);

23
sysdeps/ieee754/ldbl-64-128/w_log1pl.c Normal file
View File

@ -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);

2
sysdeps/m68k/m680x0/fpu/s_log1p.c
View File

@ -1,2 +1,4 @@
#define FUNC log1p
#undef weak_alias
#define weak_alias(a,b)
#include <s_atan.c>

2
sysdeps/m68k/m680x0/fpu/s_log1pf.c
View File

@ -1,2 +1,4 @@
#define FUNC log1pf
#undef weak_alias
#define weak_alias(a,b)
#include <s_atanf.c>

2
sysdeps/m68k/m680x0/fpu/s_log1pl.c
View File

@ -1,2 +1,4 @@
#define FUNC log1pl
#undef weak_alias
#define weak_alias(a,b)
#include <s_atanl.c>

1
sysdeps/x86_64/fpu/s_log1pl.S
View File

@ -71,4 +71,3 @@ ENTRY(__log1pl)
ret
END (__log1pl)
weak_alias (__log1pl, log1pl)