From patchwork Mon May 8 15:26:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 98829 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp1383159qge; Mon, 8 May 2017 08:28:02 -0700 (PDT) X-Received: by 10.98.18.157 with SMTP id 29mr4844810pfs.75.1494257282267; Mon, 08 May 2017 08:28:02 -0700 (PDT) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id q78si9935515pgq.344.2017.05.08.08.28.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 May 2017 08:28:02 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-79118-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-79118-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-79118-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=Rz2PC5W8b62CC+U15/0ByNe5PeDxmGA PwsfZYia5MU4YurpfMkGpq08qp5JnYk5ES6Gc9KPof6RKDuSKOvl8r2IcgCfC4z7 FOBHMprk6sBZrZ2zTc6WSNwH2gUgjcxFL/7fd2Ple8vHpOqq8E4seCI1sWReOwie hwVC+9HMxBlw= 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=WF+nDRhmDL3AXXIKSanZXO3SmrE=; b=BM3IY M4n/mpOsVNPJkUO5dBKZEcfGAKgYKzRbxzHAVSTagvWYhVRKSgB3iVqExG0QcpBn lPd0RX0KhAZO2mcsJNUjPwVGHiF3Bmlhr85INXb5GzF3ijXSCKkAvMUNQ4CGKMXi V0MShzIOPPatlK286N68gUuBMuW0QGhvbmTFNA= Received: (qmail 54491 invoked by alias); 8 May 2017 15:27:05 -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 54162 invoked by uid 89); 8 May 2017 15:27:05 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=5, 6 X-HELO: mail-qt0-f175.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=pMhH4WrHgXjA+deFZtmTaXM+ftdXOWKPiP/RnSMwZxI=; b=jCi8lIhNshif9saneuQl9N5fYc6fmA5OM5wFQIiygG7SNd8JHdzpJodVswKM2Ztm+U aNAfsgO6TzwtCxe2Nv+/wloI6SZ8q240LclZy292717YigDNAE8sS8ZuN8hIH6YcaL3W 3K1O1xJt9IBWWMjfe4PoGUhnocmzzIKMT3gYiDMuaR86tL2KG2OEmWCZN+veD7U55LBi YHr/OfM0LXJHM3S0GEVK+M1osDTkB9xT7nWSLoOrDeuFXRxNU7vJ/7aT0gUAWSzx7bhe rBGjbfxpCUGKWUKM67EOl+s2JBPYEctOhMMpcHwLYaXVsm9y2vx5rwCGEHUcU714uW9k 80Bg== X-Gm-Message-State: AODbwcBwAVuR2XyZ6reUq3xR/H8CoHIBL6OULkqsY5p1QuSXQpWqz8q5 X0RbPzPrT9jpNCE91kYmnQ== X-Received: by 10.237.37.55 with SMTP id v52mr19019605qtc.31.1494257223544; Mon, 08 May 2017 08:27:03 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 4/8] Consolidate Linux read syscall Date: Mon, 8 May 2017 12:26:48 -0300 Message-Id: <1494257212-524-4-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1494257212-524-1-git-send-email-adhemerval.zanella@linaro.org> References: <1494257212-524-1-git-send-email-adhemerval.zanella@linaro.org> This patch consolidates the read Linux syscall implementation on sysdeps/unix/sysv/linux/read.c. This leads to a different frame pointer creation on some architectures: * It fixes BZ#21428 on aarch64, since now the returned address for the read syscall can be correctly found out by backtrace_symbols. * It makes tst-backtrace{5,6} fails on powerpc due an issue on its custom backtrace implementation. It is fixed on last patch from this set. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu. [BZ #21428] * include/unistd.h (read): Add hidden proto. * io/Makefile (CFLAGS-read.c): New rule. * nptl/Makefile (CFLAGS-read.c): New rule. * sysdeps/unix/sysv/linux/read.c: New file. --- ChangeLog | 4 ++++ include/unistd.h | 1 + io/Makefile | 1 + nptl/Makefile | 1 + sysdeps/unix/sysv/linux/read.c | 33 +++++++++++++++++++++++++++++++++ 5 files changed, 40 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/read.c -- 2.7.4 diff --git a/include/unistd.h b/include/unistd.h index f36759b..01556d3 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -53,6 +53,7 @@ extern ssize_t __libc_pwrite64 (int __fd, const void *__buf, size_t __n, __off64_t __offset) attribute_hidden; extern ssize_t __libc_read (int __fd, void *__buf, size_t __n); libc_hidden_proto (__libc_read) +libc_hidden_proto (read) extern ssize_t __libc_write (int __fd, const void *__buf, size_t __n); libc_hidden_proto (__libc_write) extern int __pipe (int __pipedes[2]); diff --git a/io/Makefile b/io/Makefile index 8b1c250..db14c0d 100644 --- a/io/Makefile +++ b/io/Makefile @@ -100,6 +100,7 @@ CFLAGS-posix_fallocate64.c = -fexceptions CFLAGS-fallocate.c = -fexceptions CFLAGS-fallocate64.c = -fexceptions CFLAGS-sync_file_range.c = -fexceptions +CFLAGS-read.c = -fexceptions CFLAGS-test-stat.c = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE CFLAGS-test-lfs.c = -D_LARGEFILE64_SOURCE diff --git a/nptl/Makefile b/nptl/Makefile index 8251ac4..faabd45 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -214,6 +214,7 @@ CFLAGS-recvfrom.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-recvmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-sendmsg.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-close.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-read.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions diff --git a/sysdeps/unix/sysv/linux/read.c b/sysdeps/unix/sysv/linux/read.c new file mode 100644 index 0000000..2a02c1b --- /dev/null +++ b/sysdeps/unix/sysv/linux/read.c @@ -0,0 +1,33 @@ +/* Linux read syscall implementation. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include + +/* Read NBYTES into BUF from FD. Return the number read or -1. */ +ssize_t +__libc_read (int fd, void *buf, size_t nbytes) +{ + return SYSCALL_CANCEL (read, fd, buf, nbytes); +} +libc_hidden_def (__libc_read) + +libc_hidden_def (__read) +weak_alias (__libc_read, __read) +libc_hidden_def (read) +weak_alias (__libc_read, read)