From patchwork Tue May 23 18:25:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 100385 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp448630qge; Tue, 23 May 2017 11:26:51 -0700 (PDT) X-Received: by 10.99.97.83 with SMTP id v80mr34649724pgb.94.1495564011731; Tue, 23 May 2017 11:26:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495564011; cv=none; d=google.com; s=arc-20160816; b=OMUTlrAMvykhFW3csEgZSau+9Uj3ppXnJETLQZZ6pnkpeJMg7H4wtAThD5/uW2moUH qmrdg/8+r7JhrAwnmlKY5gRHTgdvG6ewAlGVMAVXWAFbQeEZVuy4sM11BMY+DjLTK4vO wEvsX3kklxDty7AZVfmFGNF7Cm4oLHRpEsKvibMGvWwoux26v5R/HlZVz8CWoet5hD5R 4gvzb1dL+5RMpcoQANwjn/AEtEmS011cRuCrF5fT5AzWkZMl0J0QR/XcbxCXDVgz8NQn 9mqh5hDcb9KfJZzIA9qQ3whE6NkSHif5Gjw7dyNNecaokPqLBZQ1YJiD2SQvgrlrI0yJ eOuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=9ahv5ottJ1RhSm0LDEY9jnHsYUyAGwpTYv0mWF4Qt98=; b=cZY8pg29n63eTj/Qs8yKm2YrnQkTqFLh7EXxBd8nSyo+XRl6mPWCDdiTo0kbLnUixm BDzXcJK9z3QlUiAgqabqsi9nii6dyF2UZ9nXTZ18mN2hMSI3CBNYMXdUu28TYySFGQC5 iB77xtmIMmmKGsfYiah3zYAgC6h6nshODrlxJFQo1nYO5yY+gBbU6AJ84dNUaewXj4Tr GLeMcVG3i29eCGUKP/Az+ILoi2KWT6XtNGXmRqGT3vfwKP46WkXUzHN6A1ixqCHPmy5S d7IBvAfA7v5GGqI/cDbCDbyDvB1BGfBIDAWOdqkD2aodI5D/qimPsbtoOcOg2BFW2SbL 7NqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-79667-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-79667-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id d8si21996137pgn.60.2017.05.23.11.26.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 May 2017 11:26:51 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-79667-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-79667-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-79667-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=KlY671fCGdG9UTcSJniYIoZTK0RBGaX eD7d8PKNYK4qYVU1dyRAUE97Qt0A78sq+MMQeQjDyVe22uem+Pgo78uYeySkL+2y TfyBnGh0FKfNpbeisGHNbwDRIOELQUVl7MMv03PG85deXQqgqowysNJH0huWGFjI dCjxoxWinMr8= 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=TM05xcrHBiyvzwrnuMqXFgAGToQ=; b=QpoSA 21sW0hW4kR0JXYkXSZMx6HnTdv313pP5rGuu+wb8IbiHEhhwbtCg/DSF+IWiKXro zwdif+Iq2/o+gMwIhgC16qSIJpU+AiqcY7KujkeIXiux4sNDioPDx/5jQ5Mo5TwU vwQN0QqeNDABZE3h+Q5mqPJx39VOF30QJP0Rng= Received: (qmail 72270 invoked by alias); 23 May 2017 18:26:14 -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 72019 invoked by uid 89); 23 May 2017 18:26:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=iii X-HELO: mail-qt0-f170.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=9ahv5ottJ1RhSm0LDEY9jnHsYUyAGwpTYv0mWF4Qt98=; b=CZ9Zhepy6MbamEUv6cX5VBjhrebFQRtVCLBmZWsVRU80P/ubgA0zUWzJJ6XIhsDYb2 NCl3CHUZIO9OEgOdJCzld7AcodaY7MYZblxWInJOn0cK+kjMT06DGFaxvOPru7bnWwTE 4Lc9CoEfmftQqMDg4lj41lzzOMzMSPY2mT2fdBKonb+AaXYvc8pTtXj+Vt8vSX27ZHrq V2Fm1IaiRyU3U3Tl/Ms4CkTgnVpDnrL/EahR7ac+0CAcoeFNYxzLiHDoiEd9TPgjusg0 z6YlCORNDjbnbYYhc6Ed3nEe2RAY4chNt6JsOIR00tpDd9oIoPQejUbwZnXqN7gJAagp VdgA== X-Gm-Message-State: AODbwcDstHKEYs+Hf60YRp/WcHff4tqFptSy8I8xMQeWjRg/Uk0PO7Oo E58s2TiVcl/9C64xrCNBiA== X-Received: by 10.200.44.41 with SMTP id d38mr28166611qta.182.1495563972626; Tue, 23 May 2017 11:26:12 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 3/5] linux: Consolidate sync_file_range implementation Date: Tue, 23 May 2017 15:25:58 -0300 Message-Id: <1495563960-669-4-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1495563960-669-1-git-send-email-adhemerval.zanella@linaro.org> References: <1495563960-669-1-git-send-email-adhemerval.zanella@linaro.org> This patch consolidates Linux sync_file_range at default sysdeps/unix/sysv/linux/sync_file_range.c implementation. It also moves the rules flags from generic io/Makefile to Linux one due the fact it is a Linux-only symbol. Checked on i686-linux-gnu and x86_64-linux-gnu. * io/Makefile (CFLAGS-sync_file_range.c): Remove rule. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-sync_file_range.c): New rule. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove sync_file_range. --- ChangeLog | 6 ++++++ io/Makefile | 1 - sysdeps/unix/sysv/linux/Makefile | 1 + sysdeps/unix/sysv/linux/wordsize-64/syscalls.list | 1 - 4 files changed, 7 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/io/Makefile b/io/Makefile index 16365e5..2f26bf5 100644 --- a/io/Makefile +++ b/io/Makefile @@ -99,7 +99,6 @@ CFLAGS-posix_fallocate.c = -fexceptions CFLAGS-posix_fallocate64.c = -fexceptions CFLAGS-fallocate.c = -fexceptions CFLAGS-fallocate64.c = -fexceptions -CFLAGS-sync_file_range.c = -fexceptions CFLAGS-read.c = -fexceptions CFLAGS-write.c = -fexceptions diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 99b3f9d..1a170c2 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -25,6 +25,7 @@ CFLAGS-tee.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-vmsplice.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-splice.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-open_by_handle_at.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-sync_file_range.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" # Note that bits/mman-linux.h is listed here though the file lives in the diff --git a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list index 5c78677..4bb7ebf 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list +++ b/sysdeps/unix/sysv/linux/wordsize-64/syscalls.list @@ -4,7 +4,6 @@ fstatfs - fstatfs i:ip __fstatfs fstatfs fstatfs64 __fstatfs64 statfs - statfs i:sp __statfs statfs statfs64 readahead - readahead i:iii __readahead readahead sendfile - sendfile i:iipi sendfile sendfile64 -sync_file_range - sync_file_range Ci:iiii sync_file_range prlimit EXTRA prlimit64 i:iipp prlimit prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark