From patchwork Mon Oct 19 19:33:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 532528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id EAE2A1402C4 for ; Tue, 20 Oct 2015 06:34:08 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=vH9E0cSw; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; q=dns; s=default; b= tOGk2lYhkCCiXrxs2BfTambHaAwPxzVBgdZpQwPELAcVrhxUMloqg/6zZrTSQ9Sm 9uWG3RGK71aUZwtImxZXJO4txmO2yptWHBPH2kmjQzY8xkskS5+W63JqCz6xr4z2 cb1FUtDO+Yu4SwgER6RGEAulYPub3Ra6LfA05JQe4V8= 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:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; s=default; bh=O3UKj X3AlnWanG+l0hfzYJUkQnk=; b=vH9E0cSwWPZC6mmG2m7Cl1kh7N76Le6mSO9NN qtRAvV7ntEdLITutp7fnzs425fYF9TUGcNexqRqf/mI3OewWLpWs1+fIq4RDapcj 00kFKZTuWic+ORZbHtyFDTJyjAWpi7Vav61lYzFpDXb5Ph1StSFHUKXRDug9LP3j S8zbsE= Received: (qmail 6810 invoked by alias); 19 Oct 2015 19:34:03 -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 6795 invoked by uid 89); 19 Oct 2015 19:34:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f53.google.com MIME-Version: 1.0 X-Received: by 10.202.208.143 with SMTP id h137mr3578871oig.74.1445283239121; Mon, 19 Oct 2015 12:33:59 -0700 (PDT) In-Reply-To: <20151019183138.86D6E2C3AA0@topped-with-meat.com> References: <1445189141-18068-1-git-send-email-hjl.tools@gmail.com> <1445189141-18068-3-git-send-email-hjl.tools@gmail.com> <20151019183138.86D6E2C3AA0@topped-with-meat.com> Date: Mon, 19 Oct 2015 12:33:58 -0700 Message-ID: Subject: Re: [PATCH 3/3] Mark internel unistd functions hidden From: "H.J. Lu" To: Roland McGrath Cc: GNU C Library On Mon, Oct 19, 2015 at 11:31 AM, Roland McGrath wrote: > NAK to #ifdef in generic code. Here is the updated patch with a new header file, dl-unistd.h. OK for master? From d6e63bad69929e8965a82f2270b5952249f9bb4d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 14 Oct 2015 15:21:55 -0700 Subject: [PATCH 2/2] Mark internel unistd functions hidden Since internal unistd functions are only used internally in ld.so and libc.so, they can be made hidden. Some functions 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 (__libc_check_standard_fds): Add attribute_hidden. [IS_IN (rtld)] (__access): Likewise. [IS_IN (rtld)] (__brk): Likewise. [IS_IN (rtld)] (__lseek): Likewise. [IS_IN (rtld)] (__profil): Likewise. [IS_IN (rtld)] (__read): Likewise. [IS_IN (rtld)] (__sbrk): Likewise. [IS_IN (rtld)]: Include . * sysdeps/generic/dl-unistd.h: New file. * sysdeps/mach/hurd/dl-unistd.h: Likewise. --- include/unistd.h | 12 +++++++++++- sysdeps/generic/dl-unistd.h | 22 ++++++++++++++++++++++ sysdeps/mach/hurd/dl-unistd.h | 20 ++++++++++++++++++++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 sysdeps/generic/dl-unistd.h create mode 100644 sysdeps/mach/hurd/dl-unistd.h diff --git a/include/unistd.h b/include/unistd.h index cb41637..176745d 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,16 @@ extern int __have_dup3 attribute_hidden; extern int __getlogin_r_loginuid (char *name, size_t namesize) attribute_hidden; +# if IS_IN (rtld) +# include +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; +# endif + __END_DECLS # endif diff --git a/sysdeps/generic/dl-unistd.h b/sysdeps/generic/dl-unistd.h new file mode 100644 index 0000000..8877a85 --- /dev/null +++ b/sysdeps/generic/dl-unistd.h @@ -0,0 +1,22 @@ +/* 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 (__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; diff --git a/sysdeps/mach/hurd/dl-unistd.h b/sysdeps/mach/hurd/dl-unistd.h new file mode 100644 index 0000000..1a16a8b --- /dev/null +++ b/sysdeps/mach/hurd/dl-unistd.h @@ -0,0 +1,20 @@ +/* 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 + . */ + +/* Can't hide functions in sysdeps/generic/dl-unistd.h on Hurd, since + those functions in ld.so will be preempted by the ones in libc.so + after bootstrap. */ -- 2.4.3