From patchwork Wed Oct 7 16:23:05 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: 527364 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2539514010F for ; Thu, 8 Oct 2015 03:24:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=XYYA4N4k; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=bSvemGvfhyQaaEwpCq8LrGoB4hh8wEQ K0QL7cYUWYjOUCn0K4bB/qbIYlerE2E0zknW5U4JnSTAVZAdq6BBrlY0/5uYDWSV 3f6fc0T43H/UFXAfH2zhLm0JygNlq6Qq03donn7S2kCJTNKPhWYmIDaBDEHnM7QK cYX+ZbVHKUdU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=LXUlwcrPJYLE0DMFTXiMtlxYnyQ=; b=XYYA4 N4k3ft8cL7JGEmg+Gr5GChM/VlW+EaNXkK6y2/rSeTYyQRFxYFBgboyumHhuNDeG zEK6NY9gKGTwHSLhLAmk7ql7Z8r9TWnoEEsQnEQHValJbW3hVNcDtcAAleTFQPLi A2Fq1zUk6Atev6dSfc7LJ+fl12jDhR9z0u323Y= Received: (qmail 105419 invoked by alias); 7 Oct 2015 16:23:35 -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 105345 invoked by uid 89); 7 Oct 2015 16:23:35 -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-f172.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:in-reply-to :references; bh=K6PB6R0mjJAOldbDbadBiK0s0x7lT9wCMFXqJ8J8s7I=; b=JCYRhImSxSDRt+biJyAaDlXyfSRD+qCb3EvD/sTmbC5BaFcC21UB8mGNIImDrSCzcy 07nRA2wxuknVJsjf65uDYP0op+MoqDOZWDNCd/q1Q1+NjI5RzJR18W6KrBGcrjdH0IF7 llAqqVij/rk3gCHYTlRuum744A3agZoZRDh0AGffpysfskRxCNLkIXJhO3oS0aj7L8BI VJh7mBAtbcEMf2TgYY7SLpw8lkTgNTgz8q/OBVVJ5rPA03rR2Q0PyEBSQZdFaXXgQ6Ep maGrDZ7mn+MUSS4MS7kjqz3r2iPJUjOIG4G23b4USYLUaa1zAJR/h4eUyaerxu0YlijH gH1w== X-Gm-Message-State: ALoCoQnV3BZec/TVybUiRKXW97dqUa6aDNUYzARtRx4lYEfT8YbaMR3i8nPFHmdnZmUwIlI/cXZq X-Received: by 10.129.119.4 with SMTP id s4mr1692002ywc.67.1444235006644; Wed, 07 Oct 2015 09:23:26 -0700 (PDT) From: Adhemerval Zanella X-Google-Original-From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 03/13] Mark lseek/llseek as non-cancellable Date: Wed, 7 Oct 2015 13:23:05 -0300 Message-Id: <1444234995-9542-4-git-send-email-adhemerval.zanella@linaro.com> In-Reply-To: <1444234995-9542-1-git-send-email-adhemerval.zanella@linaro.com> References: <1444234995-9542-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 | 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 + + * 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 Phil Blundell * 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 . */ -#include +#include /* Return -1LL in a full 64 bits. */ #undef SYSCALL_ERROR_HANDLER