Finish ilogb changes

	[BZ# 6794]
	* sysdeps/ieee754/ldbl-96/s_ilogbl.c: Moved to ...
	* sysdeps/ieee754/ldbl-96/e_ilogbl.c: ... here.
	Rename __ilogbl to __ieee754_ilogbl and remove weak_alias.

	* sysdeps/ieee754/ldbl-128/s_ilogbl.c: Moved to ...
	* sysdeps/ieee754/ldbl-128/e_ilogbl.c: ... here.
	Rename __ilogbl to __ieee754_ilogbl and remove weak_alias.

	* sysdeps/ieee754/ldbl-64-128/s_ilogbl.c: Moved to ...
	* sysdeps/ieee754/ldbl-64-128/e_ilogbl.c: ... here.

	* sysdeps/sparc/sparc64/soft-fp/s_ilogbl.c: Moved to ...
	* sysdeps/sparc/sparc64/soft-fp/e_ilogbl.c: ... here.
	Rename __ilogbl to __ieee754_ilogbl and remove weak_alias.

diff --git a/ChangeLog b/ChangeLog
index bb41dd1..2728eaa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2012-04-18  Andreas Jaeger  <aj@suse.de>
+
+       [BZ# 6794]
+       * sysdeps/ieee754/ldbl-96/s_ilogbl.c: Moved to ...
+       * sysdeps/ieee754/ldbl-96/e_ilogbl.c: ... here.
+       Rename __ilogbl to __ieee754_ilogbl and remove weak_alias.
+
+       * sysdeps/ieee754/ldbl-128/s_ilogbl.c: Moved to ...
+       * sysdeps/ieee754/ldbl-128/e_ilogbl.c: ... here.
+       Rename __ilogbl to __ieee754_ilogbl and remove weak_alias.
+
+       * sysdeps/ieee754/ldbl-64-128/s_ilogbl.c: Moved to ...
+       * sysdeps/ieee754/ldbl-64-128/e_ilogbl.c: ... here.
+       Adjust for changed ldbl-128 files.
+
+       * sysdeps/sparc/sparc64/soft-fp/s_ilogbl.c: Moved to ...
+       * sysdeps/sparc/sparc64/soft-fp/e_ilogbl.c: ... here.
+       Rename __ilogbl to __ieee754_ilogbl and remove weak_alias.
+
 2012-04-17  David S. Miller  <davem@davemloft.net>
 
        * sysdeps/sparc/sparc32/memcopy.h: Delete.
@@ -34,7 +53,7 @@
        exception being thrown with 0.0 as argument.
        * sysdeps/ieee754/dbl-64/s_ilogb.c: Moved to ...
        * sysdeps/ieee754/dbl-64/e_ilogb.c: ... here.
-       * sysdeps/ieee754/flt-32/e_ilogbf.c: Moved to ...
+       * sysdeps/ieee754/flt-32/s_ilogbf.c: Moved to ...
        * sysdeps/ieee754/flt-32/e_ilogbf.c: ... here.
        * sysdeps/ieee754/ldbl-128ibm/s_ilogbl.c: Moved to ...
        * sysdeps/ieee754/ldbl-128ibm/e_ilogbl.c: ... here.

diff --git a/sysdeps/ieee754/ldbl-128/s_ilogbl.c b/sysdeps/ieee754/ldbl-128/e_ilogbl.c
similarity index 96%
rename from sysdeps/ieee754/ldbl-128/s_ilogbl.c
rename to sysdeps/ieee754/ldbl-128/e_ilogbl.c
index d52eb05..0a47649 100644 (file)
--- a/sysdeps/ieee754/ldbl-128/s_ilogbl.c
+++ b/sysdeps/ieee754/ldbl-128/e_ilogbl.c
@@ -28,7 +28,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <math.h>
 #include <math_private.h>
 
-int __ilogbl(long double x)
+int __ieee754_ilogbl (long double x)
 {
        int64_t hx,lx;
        int ix;
@@ -54,4 +54,3 @@ int __ilogbl(long double x)
        }
        return FP_ILOGBNAN;
 }
-weak_alias (__ilogbl, ilogbl)

diff --git a/sysdeps/ieee754/ldbl-64-128/e_ilogbl.c b/sysdeps/ieee754/ldbl-64-128/e_ilogbl.c
new file mode 100644 (file)
index 0000000..75a38e1
--- /dev/null
+++ b/sysdeps/ieee754/ldbl-64-128/e_ilogbl.c
@@ -0,0 +1,2 @@
+#include <math_ldbl_opt.h>
+#include <sysdeps/ieee754/ldbl-128/e_ilogbl.c>

diff --git a/sysdeps/ieee754/ldbl-64-128/s_ilogbl.c b/sysdeps/ieee754/ldbl-64-128/s_ilogbl.c
deleted file mode 100644 (file)
index bb88082..0000000
--- a/sysdeps/ieee754/ldbl-64-128/s_ilogbl.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <math_ldbl_opt.h>
-#undef weak_alias
-#define weak_alias(n,a)
-#include <sysdeps/ieee754/ldbl-128/s_ilogbl.c>
-long_double_symbol (libm, __ilogbl, ilogbl);

diff --git a/sysdeps/ieee754/ldbl-96/s_ilogbl.c b/sysdeps/ieee754/ldbl-96/e_ilogbl.c
similarity index 96%
rename from sysdeps/ieee754/ldbl-96/s_ilogbl.c
rename to sysdeps/ieee754/ldbl-96/e_ilogbl.c
index 7534599..0c7d9d5 100644 (file)
--- a/sysdeps/ieee754/ldbl-96/s_ilogbl.c
+++ b/sysdeps/ieee754/ldbl-96/e_ilogbl.c
@@ -29,7 +29,7 @@ static char rcsid[] = "$NetBSD: $";
 #include <math.h>
 #include <math_private.h>
 
-int __ilogbl(long double x)
+int __ieee754_ilogbl (long double x)
 {
        int32_t es,hx,lx,ix;
 
@@ -57,4 +57,3 @@ int __ilogbl(long double x)
        }
        return FP_ILOGBNAN;
 }
-weak_alias (__ilogbl, ilogbl)

diff --git a/sysdeps/sparc/sparc64/soft-fp/s_ilogbl.c b/sysdeps/sparc/sparc64/soft-fp/e_ilogbl.c
similarity index 94%
rename from sysdeps/sparc/sparc64/soft-fp/s_ilogbl.c
rename to sysdeps/sparc/sparc64/soft-fp/e_ilogbl.c
index 6d8bd00..e24eee2 100644 (file)
--- a/sysdeps/sparc/sparc64/soft-fp/s_ilogbl.c
+++ b/sysdeps/sparc/sparc64/soft-fp/e_ilogbl.c
@@ -1,6 +1,6 @@
 /* Software floating-point emulation.
    ilogbl(x, exp)
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Jakub Jelinek (jj@ultra.linux.cz).
 
@@ -28,7 +28,7 @@
 #include "quad.h"
 #include <math.h>
 
-int __ilogbl(long double x)
+int __ieee754_ilogbl (long double x)
 {
   FP_DECL_EX;
   FP_DECL_Q(X);
@@ -77,5 +77,3 @@ int __ilogbl(long double x)
       return FP_ILOGBNAN;
     }
 }
-
-weak_alias (__ilogbl, ilogbl)