Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
2003-06-16  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/socket.S: Add unwind information.

	* sysdeps/unix/sysv/linux/wait.c (__libc_wait): Fix type of result
	variable.

	* sysdeps/posix/getaddrinfo.c (gaih_inet): Set no_inet6_date also
  • Loading branch information
Ulrich Drepper committed Jun 16, 2003
1 parent 0e0deb0 commit f60db8e
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
9 changes: 8 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2003-06-16 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/i386/socket.S: Add unwind information.

* sysdeps/unix/sysv/linux/wait.c (__libc_wait): Fix type of result
variable.

2003-06-16 Thorsten Kukuk <kukuk@suse.de>

* include/libc-symbols.h: Add static_link_warning macro.
Expand Down Expand Up @@ -195,7 +202,7 @@

2003-06-12 Ulrich Drepper <drepper@redhat.com>

* sysdeps/posix/getaddrinfo.c (gaih_inet): Set no_inet6_date alse
* sysdeps/posix/getaddrinfo.c (gaih_inet): Set no_inet6_date also
if only PF_INET address is needed.

* nss/getXXbyYY_r.c: Make sure we always return a nonzero value in
Expand Down
12 changes: 11 additions & 1 deletion sysdeps/unix/sysv/linux/i386/socket.S
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1995, 1996, 1997, 1998, 2002 Free Software Foundation, Inc.
/* Copyright (C) 1995,1996,1997,1998,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -41,6 +41,7 @@
#endif

.globl __socket
cfi_startproc
ENTRY (__socket)
#if defined NEED_CANCELLATION && defined CENABLE
SINGLE_THREAD_P
Expand All @@ -49,6 +50,7 @@ ENTRY (__socket)

/* Save registers. */
movl %ebx, %edx
cfi_register (3, 2)

movl $SYS_ify(socketcall), %eax /* System call number in %eax. */

Expand All @@ -61,6 +63,7 @@ ENTRY (__socket)

/* Restore registers. */
movl %edx, %ebx
cfi_restore (3)

/* %eax is < 0 if there was an error. */
cmpl $-125, %eax
Expand All @@ -74,13 +77,16 @@ L(pseudo_end):
#if defined NEED_CANCELLATION && defined CENABLE
/* We need one more register. */
1: pushl %esi
cfi_adjust_cfa_offset(4)

/* Enable asynchronous cancellation. */
CENABLE
movl %eax, %esi
cfi_offset(6, -8) /* %esi */

/* Save registers. */
movl %ebx, %edx
cfi_register (3, 2)

movl $SYS_ify(socketcall), %eax /* System call number in %eax. */

Expand All @@ -93,6 +99,7 @@ L(pseudo_end):

/* Restore registers. */
movl %edx, %ebx
cfi_restore (3)

/* Restore the cancellation. */
xchgl %esi, %eax
Expand All @@ -101,6 +108,8 @@ L(pseudo_end):
/* Restore registers. */
movl %esi, %eax
popl %esi
cfi_restore (6)
cfi_adjust_cfa_offset(-4)

/* %eax is < 0 if there was an error. */
cmpl $-125, %eax
Expand All @@ -109,6 +118,7 @@ L(pseudo_end):
/* Successful; return the syscall's value. */
ret
#endif
cfi_endproc
PSEUDO_END (__socket)

#ifndef NO_WEAK_ALIAS
Expand Down

0 comments on commit f60db8e

Please sign in to comment.