From patchwork Wed Jan 6 20:56:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 10257 Received: (qmail 1247 invoked by alias); 6 Jan 2016 20:56:42 -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 1228 invoked by uid 89); 6 Jan 2016 20:56:41 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=1, 28, hongjiu.lu@intel.com, sk:hongjiu, hongjiuluintelcom X-HELO: mail-qk0-f172.google.com MIME-Version: 1.0 X-Received: by 10.55.192.214 with SMTP id v83mr133822182qkv.31.1452113797620; Wed, 06 Jan 2016 12:56:37 -0800 (PST) In-Reply-To: <568D6EB0.20502@linaro.org> References: <568D6EB0.20502@linaro.org> Date: Wed, 6 Jan 2016 12:56:37 -0800 Message-ID: Subject: Re: PING^1: [PATCH 2/2] Mark internal unistd functions hidden in ld.so From: "H.J. Lu" To: Adhemerval Zanella Cc: GNU C Library On Wed, Jan 6, 2016 at 11:44 AM, Adhemerval Zanella wrote: > LGTM, only one comment below regarding some comments inclusion. > > The only nit about the patchset is the creation of another header with > platform specific header. I think we can move both dl-mman.h and > dl-unistd.h to common header (maybe dl-sysdep.h), but we can push it > a future cleanup. Sure. > I think you should also add a comment, as you did for dl-mman.h, explaining > why we can't hide __close, __getcwd, __getpid, _libc_read and __libc_write > on Hurd. > This is what I checked in. Thanks. From 730bbab2c39dd615c31c924041b4d16d7f107ae0 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 6 Jan 2016 12:37:04 -0800 Subject: [PATCH] Mark internal unistd functions hidden in ld.so Since internal unistd functions are only used internally in ld.so and libc.so, they can be made hidden. __close, __getcwd, __getpid, __libc_read and __libc_write can't be hidden in ld.so on Hurd since they will be preempted by the ones in libc.so after bootstrap. [BZ #19122] * include/unistd.h [IS_IN (rtld)]: Include . * sysdeps/generic/dl-unistd.h: New file. * sysdeps/mach/hurd/dl-unistd.h: Likewise. --- ChangeLog | 7 +++++++ include/unistd.h | 6 +++++- sysdeps/generic/dl-unistd.h | 30 ++++++++++++++++++++++++++++++ sysdeps/mach/hurd/dl-unistd.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 sysdeps/generic/dl-unistd.h create mode 100644 sysdeps/mach/hurd/dl-unistd.h diff --git a/ChangeLog b/ChangeLog index 6c7fef4..72614fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2016-01-05 H.J. Lu + [BZ #19122] + * include/unistd.h [IS_IN (rtld)]: Include . + * sysdeps/generic/dl-unistd.h: New file. + * sysdeps/mach/hurd/dl-unistd.h: Likewise. + +2016-01-05 H.J. Lu + [BZ #19122] * include/sys/mman.h [IS_IN (rtld)]: Include . * sysdeps/generic/dl-mman.h: New file. diff --git a/include/unistd.h b/include/unistd.h index cb41637..5152f64 100644 --- a/include/unistd.h +++ b/include/unistd.h @@ -158,7 +158,7 @@ rtld_hidden_proto (__libc_enable_secure) /* Various internal function. */ -extern void __libc_check_standard_fds (void); +extern void __libc_check_standard_fds (void) attribute_hidden; /* Internal name for fork function. */ @@ -176,6 +176,10 @@ extern int __have_dup3 attribute_hidden; extern int __getlogin_r_loginuid (char *name, size_t namesize) attribute_hidden; +# if IS_IN (rtld) +# include +# endif + __END_DECLS # endif diff --git a/sysdeps/generic/dl-unistd.h b/sysdeps/generic/dl-unistd.h new file mode 100644 index 0000000..98da672 --- /dev/null +++ b/sysdeps/generic/dl-unistd.h @@ -0,0 +1,30 @@ +/* Functions with hidden attribute internal to ld.so, which are declared + in include/unistd.h. Generic version. + Copyright (C) 2015 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 + . */ + +extern __typeof (__access) __access attribute_hidden; +extern __typeof (__brk) __brk attribute_hidden; +extern __typeof (__close) __close attribute_hidden; +extern __typeof (__getcwd) __getcwd attribute_hidden; +extern __typeof (__getpid) __getpid attribute_hidden; +extern __typeof (__libc_read) __libc_read attribute_hidden; +extern __typeof (__libc_write) __libc_write attribute_hidden; +extern __typeof (__lseek) __lseek attribute_hidden; +extern __typeof (__profil) __profil attribute_hidden; +extern __typeof (__read) __read attribute_hidden; +extern __typeof (__sbrk) __sbrk attribute_hidden; diff --git a/sysdeps/mach/hurd/dl-unistd.h b/sysdeps/mach/hurd/dl-unistd.h new file mode 100644 index 0000000..14e5f6b --- /dev/null +++ b/sysdeps/mach/hurd/dl-unistd.h @@ -0,0 +1,28 @@ +/* Functions with hidden attribute internal to ld.so, which are declared + in include/unistd.h. Hurd version. + Copyright (C) 2015 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 + . */ + +/* __close, __getcwd, __getpid, __libc_read and __libc_write can't be + hidden in ld.so on Hurd since they will be preempted by the ones in + libc.so after bootstrap. */ +extern __typeof (__access) __access attribute_hidden; +extern __typeof (__brk) __brk attribute_hidden; +extern __typeof (__lseek) __lseek attribute_hidden; +extern __typeof (__profil) __profil attribute_hidden; +extern __typeof (__read) __read attribute_hidden; +extern __typeof (__sbrk) __sbrk attribute_hidden; -- 2.5.0