From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20042 invoked by alias); 13 Feb 2004 11:28:07 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 20013 invoked from network); 13 Feb 2004 11:28:05 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.19.66) by sources.redhat.com with SMTP; 13 Feb 2004 11:28:05 -0000 Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1]) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i1D9Jmvf032459; Fri, 13 Feb 2004 10:19:48 +0100 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i1D9JjFi032439; Fri, 13 Feb 2004 10:19:45 +0100 Date: Fri, 13 Feb 2004 11:28:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Steve Munroe , Glibc hackers Subject: [PATCH] Fix ppc64 lrint (take 2) Message-ID: <20040213091945.GE4581@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek References: <20040212191533.GB4581@sunsite.ms.mff.cuni.cz> <402C5503.5060605@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <402C5503.5060605@redhat.com> User-Agent: Mutt/1.4i X-SW-Source: 2004-02/txt/msg00016.txt.bz2 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 * 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