diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-09-24 15:35:57 -0700 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.com> | 2015-10-09 14:26:08 -0300 |
| commit | 0fcc93bce950c8d0c440eee3f968fbeec22db784 (patch) | |
| tree | 7ad3dd9a3eb9124b17b562390d339e7e8333d82a | |
| parent | ae5d8eaed0b56ed72726ce78173a855b5c166d51 (diff) | |
| download | glibc-0fcc93bce950c8d0c440eee3f968fbeec22db784.tar.gz glibc-0fcc93bce950c8d0c440eee3f968fbeec22db784.tar.xz glibc-0fcc93bce950c8d0c440eee3f968fbeec22db784.zip | |
Mark lseek/llseek as non-cancellable
This patch sets lseek/llseek for 64-bit, MIPS n32, and x86_32 as non- cancelable. This make it consistant with 32-bit platform. Tested on i686, x86_64, and x32. * sysdeps/unix/sysv/linux/mips/mips64/syscalls.list (lseek): Set as non-cancelable. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (llseek): Likewise. * sysdeps/unix/sysv/linux/x86_64/x32/lseek.S (__libc_lseek64): Likewise.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/mips64/syscalls.list | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/lseek.S | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index f68dff7fdd..025a3d84fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2015-10-09 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S + * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S + + * sysdeps/unix/sysv/linux/i386/i686/pthread_cond_timedwait.S: Remove + file. + * sysdeps/unix/sysv/linux/i386/pthread_cond_timedwait.S: Likewise. + * sysdeps/unix/sysv/linux/i386/pthread_cond_wait.S: Likewise. + 2015-10-09 Joseph Myers <joseph@codesourcery.com> * sysdeps/i386/configure.ac (libc_cv_cc_novzeroupper): Remove diff --git a/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list index 50d5ba3199..6c80e27f75 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list +++ b/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list @@ -1,6 +1,6 @@ # File name Caller Syscall name Args Strong name Weak names -lseek - lseek Ci:iii __libc_lseek __lseek lseek __llseek llseek __libc_lseek64 __lseek64 lseek64 +lseek - lseek i:iii __libc_lseek __lseek lseek __llseek llseek __libc_lseek64 __lseek64 lseek64 mmap - mmap b:aniiii __mmap mmap __mmap64 mmap64 diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 2876bbdc3e..51ee8d8239 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -1,7 +1,7 @@ # File name Caller Syscall name # args Strong name Weak names # Whee! 64-bit systems naturally implement llseek. -llseek EXTRA lseek Ci:iii __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 +llseek EXTRA lseek i:iii __libc_lseek __lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 lseek llseek - pread - pread Ci:ibni __libc_pread __libc_pread64 __pread pread __pread64 pread64 pwrite - pwrite Ci:ibni __libc_pwrite __libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64 diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/lseek.S b/sysdeps/unix/sysv/linux/x86_64/x32/lseek.S index c7b3cf1209..85e557870d 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/lseek.S +++ b/sysdeps/unix/sysv/linux/x86_64/x32/lseek.S @@ -16,7 +16,7 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sysdep-cancel.h> +#include <sysdep.h> /* Return -1LL in a full 64 bits. */ #undef SYSCALL_ERROR_HANDLER |