diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-10-11 20:34:59 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-10-11 20:34:59 +0000 |
| commit | 46c38bd7dc34e104870982c64dae364b1a28b549 (patch) | |
| tree | 99c02529a6eed24a5ca9c84a3e08cf9cb1047fff /nptl | |
| parent | 37fb75957cc01c7bb52d625d6fcdf19452cb224e (diff) | |
| download | glibc-46c38bd7dc34e104870982c64dae364b1a28b549.tar glibc-46c38bd7dc34e104870982c64dae364b1a28b549.tar.gz glibc-46c38bd7dc34e104870982c64dae364b1a28b549.tar.bz2 glibc-46c38bd7dc34e104870982c64dae364b1a28b549.zip | |
* sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait.
* sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait.
* sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for
version GLIBC_2.6.
* Versions.def: Add GLIBC_2.6 for libc.
* sysdeps/unix/sysv/linux/i386/sysdep.h (DOARGS_6): Fix offset.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index a8bd0fd45a..f00f066479 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2006-10-11 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Add support for + cancelable syscalls with six parameters. + * sysdeps/unix/sysv/linux/rtld-lowlevel.h: Use catomic_* operations instead of atomic_*. diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 147f5c8470..2d1ad3d7cc 100644 --- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -58,6 +58,7 @@ # define SAVE_OLDTYPE_3 SAVE_OLDTYPE_2 # define SAVE_OLDTYPE_4 SAVE_OLDTYPE_2 # define SAVE_OLDTYPE_5 SAVE_OLDTYPE_2 +# define SAVE_OLDTYPE_6 SAVE_OLDTYPE_2 # define PUSHCARGS_0 /* No arguments to push. */ # define DOCARGS_0 /* No arguments to frob. */ @@ -101,6 +102,14 @@ # define _POPCARGS_5 _POPCARGS_4; popl %edi; \ cfi_adjust_cfa_offset (-4); cfi_restore (edi); +# define PUSHCARGS_6 _PUSHCARGS_6 +# define DOCARGS_6 _DOARGS_6 (44) +# define POPCARGS_6 _POPCARGS_6 +# define _PUSHCARGS_6 pushl %ebp; cfi_adjust_cfa_offset (4); \ + cfi_rel_offset (ebp, 0); _PUSHCARGS_5 +# define _POPCARGS_6 _POPCARGS_5; popl %ebp; \ + cfi_adjust_cfa_offset (-4); cfi_restore (ebp); + # ifdef IS_IN_libpthread # define CENABLE call __pthread_enable_asynccancel; # define CDISABLE call __pthread_disable_asynccancel @@ -122,6 +131,7 @@ # define POPSTATE_3 POPSTATE_2 # define POPSTATE_4 POPSTATE_3 # define POPSTATE_5 POPSTATE_4 +# define POPSTATE_6 POPSTATE_5 # ifndef __ASSEMBLER__ # define SINGLE_THREAD_P \ |