about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/linux/i386/socket.S4
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 75ca2b6743..acf7205eb1 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 52d3aa933e..53f1be61ea 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.  */