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 X-Patchwork-Id: 54730 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 42A4522FFC for ; Fri, 9 Oct 2015 17:30:31 +0000 (UTC) Received: by wisv5 with SMTP id v5sf32631951wis.0 for ; Fri, 09 Oct 2015 10:30:30 -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:x-original-sender:x-original-authentication-results; bh=NLzuovP5bgtmDpihR1mgfXRny1kfA3ZLT4qbn+5eP2g=; b=Ulhhv6wwmJp9RPDTXUQpRjBLcj7mYk3jv/9IORF5j17rJ21GJA0DPgdTsC81AN8Oaa RoBIICf7SussSFX0v5oeU08Ehaw4iyY9VnDrr8D9r4T8KHwkdhaz00x/gi3e+FnoLKSH iLpezcmKADiCV/vdLSK2z0MISHPDKZPIkvVRWgCDBqn5Zan0J0gMkWryGNAZCrwqIGMC mjbCFylPsNj/284jAJ31PYfFQQocOmCoaSsJbWt+KWKmwk4EA5dGY4t4illZkYNKvuwK b+9MhK+VwPLOE6aPq53wbIGC+AnLQ9wf+rgR09sk7QfedArZOep7nMq7REKsP662iMIG kYUw== X-Gm-Message-State: ALoCoQkMn9p274os29xkfvXlpPrdkvom45aaYibNKh6y7inS/8cUHiKPxEcHufSWcmq452xJdKzQ X-Received: by 10.194.83.169 with SMTP id r9mr2874335wjy.6.1444411830509; Fri, 09 Oct 2015 10:30:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.82.3 with SMTP id g3ls345190lfb.10.gmail; Fri, 09 Oct 2015 10:30:30 -0700 (PDT) X-Received: by 10.112.140.197 with SMTP id ri5mr7135529lbb.65.1444411830361; Fri, 09 Oct 2015 10:30:30 -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 n11si1945647lfb.114.2015.10.09.10.30.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Oct 2015 10:30:30 -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 lbwr8 with SMTP id r8so87640170lbw.2 for ; Fri, 09 Oct 2015 10:30:30 -0700 (PDT) X-Received: by 10.112.163.131 with SMTP id yi3mr7121389lbb.36.1444411828408; Fri, 09 Oct 2015 10:30:28 -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 w3csp118247lbq; Fri, 9 Oct 2015 10:30:26 -0700 (PDT) X-Received: by 10.68.200.100 with SMTP id jr4mr16999711pbc.16.1444411826651; Fri, 09 Oct 2015 10:30:26 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id zd10si4072187pac.43.2015.10.09.10.30.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Oct 2015 10:30:26 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-63877-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 30831 invoked by alias); 9 Oct 2015 17:30:15 -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 30819 invoked by uid 89); 9 Oct 2015 17:30:14 -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-f174.google.com 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 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> 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 | 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