This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 03/13] Mark lseek/llseek as non-cancellable
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: libc-alpha at sourceware dot org
- Date: Wed, 7 Oct 2015 13:23:05 -0300
- Subject: [PATCH 03/13] Mark lseek/llseek as non-cancellable
- Authentication-results: sourceware.org; auth=none
- References: <1444234995-9542-1-git-send-email-adhemerval dot zanella at linaro dot com>
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.
---
ChangeLog | 8 ++++++++
sysdeps/unix/sysv/linux/mips/mips64/syscalls.list | 2 +-
sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 2 +-
sysdeps/unix/sysv/linux/x86_64/x32/lseek.S | 2 +-
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 75cd365..e4cc8e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
2015-10-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+
+ * 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.
+
+2015-10-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
Phil Blundell <pb@pbcui.dot.net>
* nptl/tst-cancel26.c: New file.
diff --git a/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list b/sysdeps/unix/sysv/linux/mips/mips64/syscalls.list
index 50d5ba3..6c80e27 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 2876bbd..51ee8d8 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 c7b3cf1..85e5578 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
--
1.9.1