Update.

2004-02-13  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/powerpc/powerpc64/fpu/s_llrintf.c (__lrintf, lrintf):
	Define.
	(__lrintl, lrintl): Remove.
	* sysdeps/powerpc/powerpc64/fpu/s_llrint.c (__lrint): Fix a typo in
	strong_alias spelling.
	* sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: Remove.
	* sysdeps/powerpc/powerpc64/fpu/s_lrint.S: New file.

diff --git a/ChangeLog b/ChangeLog
index 2c00fb3..aafa6d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-02-13  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/powerpc/powerpc64/fpu/s_llrintf.c (__lrintf, lrintf):
+       Define.
+       (__lrintl, lrintl): Remove.
+       * sysdeps/powerpc/powerpc64/fpu/s_llrint.c (__lrint): Fix a typo in
+       strong_alias spelling.
+       * sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: Remove.
+       * sysdeps/powerpc/powerpc64/fpu/s_lrint.S: New file.
+
 2004-02-12  Ulrich Drepper  <drepper@redhat.com>
 
        * posix/getopt.h: Add some non-gcc support.  Patch by Aharon Robbins.
@@ -14,7 +24,6 @@
        * sysdeps/powerpc/powerpc32/fpu/s_llrint.c: ... here.
        * sysdeps/powerpc/fpu/s_llrintf.c: Move to...
        * sysdeps/powerpc/powerpc32/fpu/s_llrintf.c: ... here.
-       * sysdeps/powerpc/powerpc64/fpu/s_lrint.c: New file.
        * sysdeps/powerpc/powerpc64/fpu/s_llrint.c: New file.
        * sysdeps/powerpc/powerpc64/fpu/s_lrintf.S: New file.
        * sysdeps/powerpc/powerpc64/fpu/s_llrintf.c: New file.

diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrint.c b/sysdeps/powerpc/powerpc64/fpu/s_llrint.c
index 907299b..f6ea3f4 100644 (file)
--- a/sysdeps/powerpc/powerpc64/fpu/s_llrint.c
+++ b/sysdeps/powerpc/powerpc64/fpu/s_llrint.c
@@ -35,7 +35,7 @@ __llrint (double x)
 {
   return (long long int) __rint (x);
 }
-string_alias (__llrint, __lrint)
+strong_alias (__llrint, __lrint)
 weak_alias (__llrint, llrint)
 weak_alias (__lrint, lrint)
 #ifdef NO_LONG_DOUBLE

diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c b/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c
index 90db250..7d8e22a 100644 (file)
--- a/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c
+++ b/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c
@@ -18,8 +18,8 @@
    02111-1307 USA.  */
 
 /* Kludge to avoid decls that will confuse strong_alias below.  */
-#define __lrintl XXX__lrintf
-#define lrintl XXXlrintf
+#define __lrintf XXX__lrintf
+#define lrintf XXXlrintf
 
 #include "math.h"
 

diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lrint.S b/sysdeps/powerpc/powerpc64/fpu/s_lrint.S
new file mode 100644 (file)
index 0000000..fe77469
--- /dev/null
+++ b/sysdeps/powerpc/powerpc64/fpu/s_lrint.S
@@ -0,0 +1,2 @@
+/* __lrint is in s_llrint.c  */
+/* __lrint is in s_llrint.c  */

diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S b/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S
deleted file mode 100644 (file)
index 3ea4e29..0000000
--- a/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S
+++ /dev/null
@@ -1 +0,0 @@
-/* __lrintf is in s_llrintf.c  */