This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] Fix ppc64 lrint (take 2)


On Thu, Feb 12, 2004 at 08:39:31PM -0800, Ulrich Drepper wrote:
> I've applied the patch except the s_lrintf.S part.  The file wasn't
> there for ppc64 and doesn't have to be moved.

I shouldn't have been sending untested patches, sorry.
There were 2 pastos, 1 typo.  Plus when powerpc/fpu/s_lrintf.S is kept,
powerpc64/fpu/ should contain s_lrint.S, not s_lrintf.S.  Also I've tweaked
the ChangeLog entry to match what has been really commited yesterday.
With this ppc64 seems to build again.

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.

--- libc/ChangeLog.jj	2004-02-13 08:49:06.000000000 +0100
+++ libc/ChangeLog	2004-02-13 13:22:14.455774368 +0100
@@ -14,7 +14,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.
--- libc/sysdeps/powerpc/powerpc64/fpu/s_lrint.S.jj	2004-02-13 13:20:38.484364240 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_lrint.S	2004-02-13 13:21:06.144159312 +0100
@@ -0,0 +1 @@
+/* __lrint is in s_llrint.c  */
--- libc/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S.jj	2004-02-13 09:02:40.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_lrintf.S	2004-02-13 13:20:28.732846696 +0100
@@ -1 +0,0 @@
-/* __lrintf is in s_llrintf.c  */
--- libc/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c.jj	2004-02-13 05:32:33.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_llrintf.c	2004-02-13 13:21:28.290792512 +0100
@@ -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"
 
--- libc/sysdeps/powerpc/powerpc64/fpu/s_llrint.c.jj	2004-02-13 05:32:03.000000000 +0100
+++ libc/sysdeps/powerpc/powerpc64/fpu/s_llrint.c	2004-02-13 13:20:57.612456328 +0100
@@ -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


	Jakub


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]