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: 54599 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 4050423002 for ; Wed, 7 Oct 2015 16:24:39 +0000 (UTC) Received: by lbwr8 with SMTP id r8sf9775999lbw.0 for ; Wed, 07 Oct 2015 09:24:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=K6PB6R0mjJAOldbDbadBiK0s0x7lT9wCMFXqJ8J8s7I=; b=ixqMP/shaCm+lYqxBIDuYDRISf42vf4leXVjGk6hguiooPNoGBMPpAozFXhQgokl/w kOhFQrQrPkM50C4MPgOBSzXK2tz/5M5vu+yqJIfC5qzRTUWEPZVb6SAM9if6OAdVCLjP iGZBV5M/2bhJogF7Gez7JuFbY0Pfb2hiDn1vfvLrJBXQjBBu47ItzdwgPhkn8u/io91S TbuEfCVOAjI6FIiwZYEKiu9y3ubU/1/bpBhkybWZdii6rDqo4xjWoli9k5amLu9VquHQ 8NsAzCdyGhUxjqdspFrStE2u116zRyVsUfZ6uCC4Q/giwvGl+qOyYRwaytanUAVIFbeZ 4Gjw== X-Gm-Message-State: ALoCoQnsCIauqVfFHPKlSnY12VwW2C7fKEGFBOwJvzdQwTitkRJuqdsMTp9csWeA+E4BLEmAWL7X X-Received: by 10.194.240.230 with SMTP id wd6mr439218wjc.0.1444235078177; Wed, 07 Oct 2015 09:24:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.213.82 with SMTP id m79ls90098lfg.19.gmail; Wed, 07 Oct 2015 09:24:38 -0700 (PDT) X-Received: by 10.112.17.34 with SMTP id l2mr1065304lbd.117.1444235078017; Wed, 07 Oct 2015 09:24:38 -0700 (PDT) Received: from mail-lb0-x22f.google.com (mail-lb0-x22f.google.com. [2a00:1450:4010:c04::22f]) by mx.google.com with ESMTPS id n35si25843639lfi.20.2015.10.07.09.24.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 09:24:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22f as permitted sender) client-ip=2a00:1450:4010:c04::22f; Received: by lbos8 with SMTP id s8so17355582lbo.0 for ; Wed, 07 Oct 2015 09:24:37 -0700 (PDT) X-Received: by 10.112.156.167 with SMTP id wf7mr1107301lbb.88.1444235077871; Wed, 07 Oct 2015 09:24:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp79007lbq; Wed, 7 Oct 2015 09:24:36 -0700 (PDT) X-Received: by 10.107.135.69 with SMTP id j66mr2897292iod.174.1444235076587; Wed, 07 Oct 2015 09:24:36 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id j3si3157191igx.31.2015.10.07.09.24.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 09:24:36 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-63754-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 105419 invoked by alias); 7 Oct 2015 16:23:35 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 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-Received: by 10.129.119.4 with SMTP id s4mr1692002ywc.67.1444235006644; Wed, 07 Oct 2015 09:23:26 -0700 (PDT) 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> X-Original-Sender: adhemerval.zanella@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22f as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 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