From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 17 Dec 2002 03:49:23 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_2~508
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26a026b94036e2e2a41a6693327d796cc82bdacd;p=thirdparty%2Fglibc.git

Update.

2002-12-16  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/socket.S [NEED_CANCELLATION &&
	CENABLE]: Don't lose content of %ebx.
---

diff --git a/ChangeLog b/ChangeLog
index 75ca2b67434..acf7205eb15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/socket.S [NEED_CANCELLATION &&
+	CENABLE]: Don't lose content of %ebx.
+
 2002-12-17  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/unix/sysv/linux/i386/socket.S: Use SINGLE_THREAD_P
diff --git a/sysdeps/unix/sysv/linux/i386/socket.S b/sysdeps/unix/sysv/linux/i386/socket.S
index 52d3aa933ec..53f1be61eab 100644
--- a/sysdeps/unix/sysv/linux/i386/socket.S
+++ b/sysdeps/unix/sysv/linux/i386/socket.S
@@ -91,13 +91,15 @@ L(pseudo_end):
         /* Do the system call trap.  */
 	int $0x80
 
+	/* Restore registers.  */
+	movl %edx, %ebx
+
 	/* Restore the cancellation.  */
 	xchgl %esi, %eax
 	CDISABLE
 
 	/* Restore registers.  */
 	movl %esi, %eax
-	movl %edx, %ebx
 	popl %esi
 
 	/* %eax is < 0 if there was an error.  */