From patchwork Fri Oct 9 17:30:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 9018 Received: (qmail 30831 invoked by alias); 9 Oct 2015 17:30:15 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 30819 invoked by uid 89); 9 Oct 2015 17:30:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-yk0-f174.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=NLzuovP5bgtmDpihR1mgfXRny1kfA3ZLT4qbn+5eP2g=; b=cT9Qq9vC5FZtumEyNrbL/IQp3bSEoxMlTO4PQas48ZK8WYLHbRkzfWV81Nv4brbkx5 RSoErxGoCk6zUmy8ZlYu3Uzd9FxLLnf0W3sXZwZo4kSi0op6AEXYyfYpnGX423U1oHGA bVQcTaG+NFXL4qubyvZ/G5HQU+BPb4xQ7IoAsPTzldSLIaGdq+nVGBb7p4ejaFHK+6vB vCtLtOAO2E2fmjeS2AheyaGyCHwXv7x5tMSELInlCCdWFtYgjs1TMFg+3pt8YfXuZ7cD ve3MJqejcbXrXJYNzY4EiWgd+dLaQFwX0EPt+4cY7+F5Ua5Plefi6onk2JuE9WWZpDw1 9vyQ== X-Gm-Message-State: ALoCoQnU+B8uJWbY+kTzUB3B7mm6H3Lf0FfIijUoVdOonsAjvXC/VgR9w6mJaR7K1zlqDZP4cB+D X-Received: by 10.129.109.214 with SMTP id i205mr9961886ywc.179.1444411810476; Fri, 09 Oct 2015 10:30:10 -0700 (PDT) From: Adhemerval Zanella X-Google-Original-From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] Mark lseek/llseek as non-cancellable Date: Fri, 9 Oct 2015 14:30:00 -0300 Message-Id: <1444411800-16185-1-git-send-email-adhemerval.zanella@linaro.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 | 10 ++++++++++ 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, 13 insertions(+), 3 deletions(-) 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 . */ -#include +#include /* Return -1LL in a full 64 bits. */ #undef SYSCALL_ERROR_HANDLER