diff mbox

[2/4] Move exp compat wrappers under math/

Message ID 59B90D42.3080503@arm.com
State New, archived
Headers show

Commit Message

Szabolcs Nagy Sept. 13, 2017, 10:49 a.m. UTC
On 13/09/17 11:46, Szabolcs Nagy wrote:
> Move exp compat wrappers to math/w_exp{,f,l}_compat.c to be
> consistent with other wrappers.
> 
> 2017-09-13  Szabolcs Nagy  <szabolcs.nagy@arm.com>
> 
> 	* sysdeps/ieee754/dbl-64/w_exp_compat.c: Move to...
> 	* math/w_exp_compat.c: ... here.
> 	* sysdeps/ieee754/flt-32/w_expf_compat.c: Move to...
> 	* math/w_expf_compat.c: ... here.
> 	* sysdeps/ieee754/ldbl-128/w_expl_compat.c: Move to...
> 	* math/w_expl_compat.c: ... here.
> 	* sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c: Remove.
> 	* sysdeps/ieee754/ldbl-96/w_expl_compat.c: Remove.
> 	* sysdeps/ieee754/ldbl-opt/w_exp_compat.c: Use the new path.
> 	* sysdeps/ieee754/ldbl-opt/w_expl_compat.c: Likewise.
> 

now with patch attached.

Comments

Joseph Myers Sept. 13, 2017, 12:43 p.m. UTC | #1
On Wed, 13 Sep 2017, Szabolcs Nagy wrote:

> On 13/09/17 11:46, Szabolcs Nagy wrote:
> > Move exp compat wrappers to math/w_exp{,f,l}_compat.c to be
> > consistent with other wrappers.
> > 
> > 2017-09-13  Szabolcs Nagy  <szabolcs.nagy@arm.com>
> > 
> > 	* sysdeps/ieee754/dbl-64/w_exp_compat.c: Move to...
> > 	* math/w_exp_compat.c: ... here.
> > 	* sysdeps/ieee754/flt-32/w_expf_compat.c: Move to...
> > 	* math/w_expf_compat.c: ... here.
> > 	* sysdeps/ieee754/ldbl-128/w_expl_compat.c: Move to...
> > 	* math/w_expl_compat.c: ... here.
> > 	* sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c: Remove.
> > 	* sysdeps/ieee754/ldbl-96/w_expl_compat.c: Remove.
> > 	* sysdeps/ieee754/ldbl-opt/w_exp_compat.c: Use the new path.
> > 	* sysdeps/ieee754/ldbl-opt/w_expl_compat.c: Likewise.
> > 
> 
> now with patch attached.

OK.
diff mbox

Patch

From a6ff6f68f2b610f6e78ba9a40c08a526f7b2cc7c Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 6 Sep 2017 16:48:41 +0100
Subject: [PATCH 2/4] w_exp*_compat

---
 {sysdeps/ieee754/dbl-64 => math}/w_exp_compat.c    |  0
 {sysdeps/ieee754/flt-32 => math}/w_expf_compat.c   |  0
 math/w_expl_compat.c                               | 48 ++++++++++++++++++----
 sysdeps/ieee754/ldbl-128/w_expl_compat.c           | 45 --------------------
 sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c        | 24 -----------
 sysdeps/ieee754/ldbl-96/w_expl_compat.c            | 37 -----------------
 sysdeps/ieee754/ldbl-opt/w_exp_compat.c            |  2 +-
 .../{ldbl-64-128 => ldbl-opt}/w_expl_compat.c      |  2 +-
 8 files changed, 42 insertions(+), 116 deletions(-)
 rename {sysdeps/ieee754/dbl-64 => math}/w_exp_compat.c (100%)
 rename {sysdeps/ieee754/flt-32 => math}/w_expf_compat.c (100%)
 delete mode 100644 sysdeps/ieee754/ldbl-128/w_expl_compat.c
 delete mode 100644 sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c
 delete mode 100644 sysdeps/ieee754/ldbl-96/w_expl_compat.c
 rename sysdeps/ieee754/{ldbl-64-128 => ldbl-opt}/w_expl_compat.c (72%)

diff --git a/sysdeps/ieee754/dbl-64/w_exp_compat.c b/math/w_exp_compat.c
similarity index 100%
rename from sysdeps/ieee754/dbl-64/w_exp_compat.c
rename to math/w_exp_compat.c
diff --git a/sysdeps/ieee754/flt-32/w_expf_compat.c b/math/w_expf_compat.c
similarity index 100%
rename from sysdeps/ieee754/flt-32/w_expf_compat.c
rename to math/w_expf_compat.c
diff --git a/math/w_expl_compat.c b/math/w_expl_compat.c
index 70096a820c..ec076deaad 100644
--- a/math/w_expl_compat.c
+++ b/math/w_expl_compat.c
@@ -1,13 +1,45 @@ 
+/* w_expl.c -- long double version of w_exp.c.
+ * Conversion to long double by Ulrich Drepper,
+ * Cygnus Support, drepper@cygnus.com.
+ */
+
+/*
+ * ====================================================
+ * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ *
+ * Developed at SunPro, a Sun Microsystems, Inc. business.
+ * Permission to use, copy, modify, and distribute this
+ * software is freely granted, provided that this notice
+ * is preserved.
+ * ====================================================
+ */
+
+#if defined(LIBM_SCCS) && !defined(lint)
+static char rcsid[] = "$NetBSD: $";
+#endif
+
+/*
+ * wrapper expl(x)
+ */
+
 #include <math.h>
-#include <stdio.h>
-#include <errno.h>
+#include <math_private.h>
+#include <math-svid-compat.h>
 
-long double
-__expl(long double x)
+#if LIBM_SVID_COMPAT
+long double __expl(long double x)	/* wrapper exp */
 {
-  fputs ("__expl not implemented\n", stderr);
-  __set_errno (ENOSYS);
-  return 0.0;
-}
+# ifdef _IEEE_LIBM
+	return __ieee754_expl(x);
+# else
+	long double z = __ieee754_expl (x);
+	if (__glibc_unlikely (!isfinite (z) || z == 0)
+	    && isfinite (x) && _LIB_VERSION != _IEEE_)
+	  return __kernel_standard_l (x, x, 206 + !!signbit (x));
 
+	return z;
+# endif
+}
+hidden_def (__expl)
 weak_alias (__expl, expl)
+#endif
diff --git a/sysdeps/ieee754/ldbl-128/w_expl_compat.c b/sysdeps/ieee754/ldbl-128/w_expl_compat.c
deleted file mode 100644
index ec076deaad..0000000000
--- a/sysdeps/ieee754/ldbl-128/w_expl_compat.c
+++ /dev/null
@@ -1,45 +0,0 @@ 
-/* w_expl.c -- long double version of w_exp.c.
- * Conversion to long double by Ulrich Drepper,
- * Cygnus Support, drepper@cygnus.com.
- */
-
-/*
- * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
- *
- * Developed at SunPro, a Sun Microsystems, Inc. business.
- * Permission to use, copy, modify, and distribute this
- * software is freely granted, provided that this notice
- * is preserved.
- * ====================================================
- */
-
-#if defined(LIBM_SCCS) && !defined(lint)
-static char rcsid[] = "$NetBSD: $";
-#endif
-
-/*
- * wrapper expl(x)
- */
-
-#include <math.h>
-#include <math_private.h>
-#include <math-svid-compat.h>
-
-#if LIBM_SVID_COMPAT
-long double __expl(long double x)	/* wrapper exp */
-{
-# ifdef _IEEE_LIBM
-	return __ieee754_expl(x);
-# else
-	long double z = __ieee754_expl (x);
-	if (__glibc_unlikely (!isfinite (z) || z == 0)
-	    && isfinite (x) && _LIB_VERSION != _IEEE_)
-	  return __kernel_standard_l (x, x, 206 + !!signbit (x));
-
-	return z;
-# endif
-}
-hidden_def (__expl)
-weak_alias (__expl, expl)
-#endif
diff --git a/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c b/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c
deleted file mode 100644
index 53948a96e6..0000000000
--- a/sysdeps/ieee754/ldbl-128ibm/w_expl_compat.c
+++ /dev/null
@@ -1,24 +0,0 @@ 
-#include <math.h>
-#include <math_private.h>
-#include <math-svid-compat.h>
-#include <math_ldbl_opt.h>
-
-#if LIBM_SVID_COMPAT
-long double __expl(long double x)	/* wrapper exp  */
-{
-  long double z;
-  z = __ieee754_expl(x);
-  if (_LIB_VERSION == _IEEE_)
-    return z;
-  if (isfinite(x))
-    {
-      if (!isfinite (z))
-	return __kernel_standard_l(x,x,206); /* exp overflow  */
-      else if (z == 0.0L)
-	return __kernel_standard_l(x,x,207); /* exp underflow  */
-    }
-  return z;
-}
-hidden_def (__expl)
-long_double_symbol (libm, __expl, expl);
-#endif
diff --git a/sysdeps/ieee754/ldbl-96/w_expl_compat.c b/sysdeps/ieee754/ldbl-96/w_expl_compat.c
deleted file mode 100644
index ae9ab586cb..0000000000
--- a/sysdeps/ieee754/ldbl-96/w_expl_compat.c
+++ /dev/null
@@ -1,37 +0,0 @@ 
-/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
-
-   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_private.h>
-#include <math-svid-compat.h>
-
-#if LIBM_SVID_COMPAT
-/* wrapper expl */
-long double
-__expl (long double x)
-{
-  long double z = __ieee754_expl (x);
-  if (__builtin_expect (!isfinite (z) || z == 0, 0)
-      && isfinite (x) && _LIB_VERSION != _IEEE_)
-    return __kernel_standard_l (x, x, 206 + !!signbit (x));
-
-  return z;
-}
-hidden_def (__expl)
-weak_alias (__expl, expl)
-#endif
diff --git a/sysdeps/ieee754/ldbl-opt/w_exp_compat.c b/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
index 686c9c26d0..d01fe655ff 100644
--- a/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
+++ b/sysdeps/ieee754/ldbl-opt/w_exp_compat.c
@@ -1,5 +1,5 @@ 
 #include <math_ldbl_opt.h>
-#include <sysdeps/ieee754/dbl-64/w_exp_compat.c>
+#include <math/w_exp_compat.c>
 #if LONG_DOUBLE_COMPAT(libm, GLIBC_2_0)
 compat_symbol (libm, __exp, expl, GLIBC_2_0);
 #endif
diff --git a/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c b/sysdeps/ieee754/ldbl-opt/w_expl_compat.c
similarity index 72%
rename from sysdeps/ieee754/ldbl-64-128/w_expl_compat.c
rename to sysdeps/ieee754/ldbl-opt/w_expl_compat.c
index 037e8bf348..4534051d88 100644
--- a/sysdeps/ieee754/ldbl-64-128/w_expl_compat.c
+++ b/sysdeps/ieee754/ldbl-opt/w_expl_compat.c
@@ -1,7 +1,7 @@ 
 #include <math_ldbl_opt.h>
 #undef weak_alias
 #define weak_alias(n,a)
-#include <sysdeps/ieee754/ldbl-128/w_expl_compat.c>
+#include <math/w_expl_compat.c>
 #if LIBM_SVID_COMPAT
 long_double_symbol (libm, __expl, expl);
 #endif
-- 
2.11.0