From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 30 Sep 2004 02:56:42 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20040930T0838~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ff2ba908a0341bf3e6f1f7f6db2cac7f89935b5;p=thirdparty%2Fglibc.git

Update.

2004-09-29  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/i386/fpu/s_fdim.S (__fdim): Handle +inf/+inf.
	* sysdeps/i386/fpu/s_fdimf.S (__fdimf): Likewise.
	* sysdeps/i386/fpu/s_fdiml.S (__fdiml): Likewise.

004-09-29  Ulrich Drepper  <drepper@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index f95cc747f09..54c4c85c93f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2004-09-29  Ulrich Drepper  <drepper@redhat.com>
+2004-09-29  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/i386/fpu/s_fdim.S (__fdim): Handle +inf/+inf.
+	* sysdeps/i386/fpu/s_fdimf.S (__fdimf): Likewise.
+	* sysdeps/i386/fpu/s_fdiml.S (__fdiml): Likewise.
+
+004-09-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* grp/initgroups.c: Move compat_call implementation...
 	* grp/compat-initgroups.c: ...to here.  New file.
diff --git a/sysdeps/i386/fpu/s_fdim.S b/sysdeps/i386/fpu/s_fdim.S
index 559a8141828..92deb15d850 100644
--- a/sysdeps/i386/fpu/s_fdim.S
+++ b/sysdeps/i386/fpu/s_fdim.S
@@ -1,5 +1,5 @@
 /* Compute positive difference.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -30,22 +30,23 @@ ENTRY(__fdim)
 	sahf
 	jp	1f
 
-	fsubrp	%st, %st(1)
-	jc	2f
+	jc	3f
 
-	fstp	%st(0)
+	fstp	%st(1)
 	fldz
 	jmp	2f
 
+3:	fsubrp	%st, %st(1)
+	ret
+
 1:	fxam
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x01, %ah
-	je	3f
+	je	2f
 
 	fxch
-3:	fstp	%st(1)
-
-2:	ret
+2:	fstp	%st(1)
+	ret
 END(__fdim)
 weak_alias (__fdim, fdim)
diff --git a/sysdeps/i386/fpu/s_fdimf.S b/sysdeps/i386/fpu/s_fdimf.S
index eb6ba5abc46..905cec2fae2 100644
--- a/sysdeps/i386/fpu/s_fdimf.S
+++ b/sysdeps/i386/fpu/s_fdimf.S
@@ -1,5 +1,5 @@
 /* Compute positive difference.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -30,22 +30,23 @@ ENTRY(__fdimf)
 	sahf
 	jp	1f
 
-	fsubrp	%st, %st(1)
-	jc	2f
+	jc	3f
 
-	fstp	%st(0)
+	fstp	%st(1)
 	fldz
 	jmp	2f
 
+3:	fsubrp	%st, %st(1)
+	ret
+
 1:	fxam
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x01, %ah
-	je	3f
+	je	2f
 
 	fxch
-3:	fstp	%st(1)
-
-2:	ret
+2:	fstp	%st(1)
+	ret
 END(__fdimf)
 weak_alias (__fdimf, fdimf)
diff --git a/sysdeps/i386/fpu/s_fdiml.S b/sysdeps/i386/fpu/s_fdiml.S
index c4e9f154048..754b221de2c 100644
--- a/sysdeps/i386/fpu/s_fdiml.S
+++ b/sysdeps/i386/fpu/s_fdiml.S
@@ -1,5 +1,5 @@
 /* Compute positive difference.
-   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -30,22 +30,23 @@ ENTRY(__fdiml)
 	sahf
 	jp	1f
 
-	fsubrp	%st, %st(1)
-	jc	2f
+	jc	3f
 
-	fstp	%st(0)
+	fstp	%st(1)
 	fldz
 	jmp	2f
 
+3:	fsubrp	%st, %st(1)
+	ret
+
 1:	fxam
 	fnstsw
 	andb	$0x45, %ah
 	cmpb	$0x01, %ah
-	je	3f
+	je	2f
 
 	fxch
-3:	fstp	%st(1)
-
-2:	ret
+2:	fstp	%st(1)
+	ret
 END(__fdiml)
 weak_alias (__fdiml, fdiml)