diff mbox

[BZ,#6792] Set errno for log1p on pole/domain error.

Message ID mfebc7$nt1$1@ger.gmane.org
State Superseded
Headers show

Commit Message

Stefan Liebler March 31, 2015, 2:35 p.m. UTC
Hi,

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.

Tested on s390, s390x, ppc64, x86_64 and i686 (which uses sysdeps/i386).
No new testsuite failures.
The test program attached to bug6792 is now showing ERANGE/EDOM.

Ok to commit?

Bye
Stefan

---
2015-03-31  Stefan Liebler  <stli@linux.vnet.ibm.com>

	[BZ #6792]
	math/w_log1p.c: New File.
	Add wrapper which sets errno on pole or domain error.
	Add weak_alias for corresponding log1p function.
	math/w_log1pf.c: Likewise.
	math/w_log1pl.c: Likewise.
	math/Makefile (libm-calls): Add w_log1p.
	math/s_log1pl.c:
	Remove weak_alias for corresponding log1p function.
	sysdeps/i386/fpu/s_log1p.S: Likewise.
	sysdeps/i386/fpu/s_log1pf.S: Likewise.
	sysdeps/i386/fpu/s_log1pl.S: Likewise.
	sysdeps/ieee754/dbl-64/s_log1p.c: Likewise.
	sysdeps/ieee754/flt-32/s_log1pf.c: Likewise.
	sysdeps/ieee754/ldbl-128/s_log1pl.c: Likewise.
	sysdeps/ieee754/ldbl-64-128/s_log1pl.c:
	Remove long_double_symbol for corresponding log1p function.
	sysdeps/ieee754/ldbl-128ibm/s_log1pl.c: Likewise.
	sysdeps/ieee754/ldbl-64-128/w_log1pl.c: New File.
	Adds long_double_symbol for corresponding log1p function.
	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.
	Do not use wrapper, because errno is set by own implementation.
	sysdeps/ia64/fpu/w_log1pf.c: Likewise.
	sysdeps/ia64/fpu/w_log1pl.c: Likewise.
	sysdeps/x86_64/fpu/s_log1pl.S
	math/libm-test.inc (log1p_test_data):
	Add errno expectations.

Comments

Stefan Liebler April 7, 2015, 9:06 a.m. UTC | #1
ping

On 03/31/2015 04:35 PM, Stefan Liebler wrote:
> Hi,
>
> 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.
>
> Tested on s390, s390x, ppc64, x86_64 and i686 (which uses sysdeps/i386).
> No new testsuite failures.
> The test program attached to bug6792 is now showing ERANGE/EDOM.
>
> Ok to commit?
>
> Bye
> Stefan
>
> ---
> 2015-03-31  Stefan Liebler  <stli@linux.vnet.ibm.com>
>
>      [BZ #6792]
>      math/w_log1p.c: New File.
>      Add wrapper which sets errno on pole or domain error.
>      Add weak_alias for corresponding log1p function.
>      math/w_log1pf.c: Likewise.
>      math/w_log1pl.c: Likewise.
>      math/Makefile (libm-calls): Add w_log1p.
>      math/s_log1pl.c:
>      Remove weak_alias for corresponding log1p function.
>      sysdeps/i386/fpu/s_log1p.S: Likewise.
>      sysdeps/i386/fpu/s_log1pf.S: Likewise.
>      sysdeps/i386/fpu/s_log1pl.S: Likewise.
>      sysdeps/ieee754/dbl-64/s_log1p.c: Likewise.
>      sysdeps/ieee754/flt-32/s_log1pf.c: Likewise.
>      sysdeps/ieee754/ldbl-128/s_log1pl.c: Likewise.
>      sysdeps/ieee754/ldbl-64-128/s_log1pl.c:
>      Remove long_double_symbol for corresponding log1p function.
>      sysdeps/ieee754/ldbl-128ibm/s_log1pl.c: Likewise.
>      sysdeps/ieee754/ldbl-64-128/w_log1pl.c: New File.
>      Adds long_double_symbol for corresponding log1p function.
>      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.
>      Do not use wrapper, because errno is set by own implementation.
>      sysdeps/ia64/fpu/w_log1pf.c: Likewise.
>      sysdeps/ia64/fpu/w_log1pl.c: Likewise.
>      sysdeps/x86_64/fpu/s_log1pl.S
>      math/libm-test.inc (log1p_test_data):
>      Add errno expectations.
Joseph Myers April 7, 2015, 5:13 p.m. UTC | #2
On Tue, 31 Mar 2015, Stefan Liebler wrote:

> 2015-03-31  Stefan Liebler  <stli@linux.vnet.ibm.com>
> 
> 	[BZ #6792]
> 	math/w_log1p.c: New File.
> 	Add wrapper which sets errno on pole or domain error.
> 	Add weak_alias for corresponding log1p function.

All these ChangeLog entries are missing the initial '* ' before the file 
name.  "New file" not "New File".  No further description of the file is 
needed in the ChangeLog entry.

> 	math/s_log1pl.c:
> 	Remove weak_alias for corresponding log1p function.

	(log1pl): Remove weak_alias.

> +    TEST_f_f (log1p, -2, qnan_value, INVALID_EXCEPTION|EDOM),

ERRNO_EDOM, not just EDOM.

> +/* Wrapper for __log1p handles setting errno.

"that handles".

> +double
> +__w_log1p (double x)
> +{
> +  if (__glibc_unlikely (x <= -1.0))

I'd expect you to need islessequal here to avoid spurious "invalid" 
exceptions for quiet NaN arguments.  (Some architectures may have GCC bugs 
meaning the wrong comparison gets used for <= and so this doesn't show up 
in glibc testing, e.g. bug 58684 for powerpc, but using <= would result in 
failures for architectures without such bugs or where those GCC bugs don't 
apply when compiling this implementation.)

The same comments apply to the implementations for other types.

> +/* Nothing to do.
> +   Errno is set in sysdeps/ia64/fpu/s_log1pf.S.  */

See the GNU Coding Standards: "If a lower-case identifier comes at the 
beginning of a sentence, don't capitalize it!  Changing the spelling makes 
it a different identifier.".
diff mbox

Patch

diff --git a/math/Makefile b/math/Makefile
index 3904e41..1537b5a 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -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	\
diff --git a/math/libm-test.inc b/math/libm-test.inc
index 7acd29b..0f0c5b2 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -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|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),
diff --git a/math/s_log1pl.c b/math/s_log1pl.c
index 9e51ce2..a216fb3 100644
--- a/math/s_log1pl.c
+++ b/math/s_log1pl.c
@@ -9,6 +9,5 @@  __log1pl (long double x)
   __set_errno (ENOSYS);
   return 0.0;
 }
-weak_alias (__log1pl, log1pl)
 
 stub_warning (log1pl)
diff --git a/math/w_log1p.c b/math/w_log1p.c
new file mode 100644
index 0000000..e076510
--- /dev/null
+++ b/math/w_log1p.c
@@ -0,0 +1,41 @@ 
+/* Wrapper for __log1p 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 (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
diff --git a/math/w_log1pf.c b/math/w_log1pf.c
new file mode 100644
index 0000000..1748819
--- /dev/null
+++ b/math/w_log1pf.c
@@ -0,0 +1,36 @@ 
+/* Wrapper for __log1pf 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 (x <= -1.0f))
+    {
+      if (x == -1.0f)
+	__set_errno (ERANGE);
+      else
+	__set_errno (EDOM);
+    }
+
+  return __log1pf (x);
+}
+weak_alias (__w_log1pf, log1pf)
diff --git a/math/w_log1pl.c b/math/w_log1pl.c
new file mode 100644
index 0000000..cf54511
--- /dev/null
+++ b/math/w_log1pl.c
@@ -0,0 +1,36 @@ 
+/* Wrapper for __log1pl 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 (x <= -1.0L))
+    {
+      if (x == -1.0L)
+	__set_errno (ERANGE);
+      else
+	__set_errno (EDOM);
+    }
+
+  return __log1pl (x);
+}
+weak_alias (__w_log1pl, log1pl)
diff --git a/sysdeps/i386/fpu/s_log1p.S b/sysdeps/i386/fpu/s_log1p.S
index 797a2ab..8624249 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 1e7f2e1..b071e73 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 d2d5d3b..8f87cf6 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 0000000..ce119dd
--- /dev/null
+++ b/sysdeps/ia64/fpu/w_log1p.c
@@ -0,0 +1,20 @@ 
+/* Wrapper for __log1p 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 0000000..84b5613
--- /dev/null
+++ b/sysdeps/ia64/fpu/w_log1pf.c
@@ -0,0 +1,20 @@ 
+/* Wrapper for __log1pf 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 0000000..ace5d9e
--- /dev/null
+++ b/sysdeps/ia64/fpu/w_log1pl.c
@@ -0,0 +1,20 @@ 
+/* Wrapper for __log1pl 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 c922148..86bbfba 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 5f00feb..94c33fc 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 4a30af6..b70a55b 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 e4bb6e8..a0e24d7 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 0000000..20739d7
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-128ibm/w_log1pl.c
@@ -0,0 +1,23 @@ 
+/* Wrapper for __log1pl 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 eebd636..11d56bf 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 0000000..20739d7
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-64-128/w_log1pl.c
@@ -0,0 +1,23 @@ 
+/* Wrapper for __log1pl 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 1840ced..082618d 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 cb7235a..480c395 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 8dbef89..a4f34a4 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 af3024a..e83f64d 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)