From patchwork Sun Mar 20 17:05:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 599884 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 3qSptP1rjZz9s8d for ; Mon, 21 Mar 2016 06:29:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=nKE0SMc6; 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:date:from:to:cc:subject:message-id:references :mime-version:content-type:in-reply-to; q=dns; s=default; b=IneV RYYf6sTqwflsenKx02xEmSM/yUjRPIubj+62yJF9G52p4golp1DPezZu6eiQBnkY tpX2DtAkjslkAGPyARPeXjuRKJIM0DgF5+TwRJtnOA8Cs8tvGBQo623+pcI+nONj yRxPOSwDsWzpTppLJ83ymh7QRn7Y2ESN+bDbEvQ= 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:date:from:to:cc:subject:message-id:references :mime-version:content-type:in-reply-to; s=default; bh=7Q7Wq01c6y IDUckAx8OqooTVkqc=; b=nKE0SMc6Oj/o4oNb1Yz9+zwM0X/JF4OUtHwnW7PUS0 FDN4o/gtv7HE0H68njYbLMmA7+mAXw/z3Cc/h+ySDXa8gnSoKGSD5oVwP+eBR0Pz G+B+awTzWQOJgHvH/bbE/vUt96UXgOcJ2+CxMtuwd1BPl5ggRplymIZV21dLE7lF s= Received: (qmail 5133 invoked by alias); 20 Mar 2016 19:27: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 50156 invoked by uid 89); 20 Mar 2016 17:07:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL, BAYES_50 autolearn=ham version=3.3.2 spammy=H*MI:sk:2016032, is_in, IS_IN, hurd X-HELO: sonata.ens-lyon.org Date: Sun, 20 Mar 2016 18:05:28 +0100 From: Samuel Thibault To: hjl.tools@gmail.com Cc: libc-alpha@sourceware.org Subject: [PATCH]: hurd: Do not hide rtld symbols which need to be preempted [Was: hurd: Hidden symbols in rtld] Message-ID: <20160320170528.GO3635@var.home> References: <20160320164214.GA21096@var.home> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20160320164214.GA21096@var.home> User-Agent: Mutt/1.5.21+34 (58baf7c9f32f) (2010-12-30) Samuel Thibault, on Sun 20 Mar 2016 17:42:14 +0100, wrote: > AIUI, this is because there are weak definitions in > sysdeps/mach/hurd/dl-sysdep.c which need to be preempted by the libc > one, right? Is __access perhaps missing in the list? There is a weak > definition for __access in dl-sysdep.c. > > Also, 6d56699d7e808419ccf244150ecba122156932ba ('Mark internal fcntl > functions hidden') made __open hidden, but dl-sysdep.c has a weak > definition, which AIUI needs to be preempted too, so that this commit > should be split to a dl-fcntl.h that sysdepas/mach/hurd/ can provide, > right? > > (Just asking the question, I'll handle commiting etc.) Just to explicit things, attached is the fix I'm considering. Samuel commit 627af5c461b01bf7fe13c707470afdcb5c8ea59c Author: Samuel Thibault Date: Sun Mar 20 17:56:47 2016 +0100 hurd: Do not hide rtld symbols which need to be preempted * sysdeps/generic/dl-fcntl.h: New file, hides __open and __fcntl. * sysdeps/mach/hurd/dl-fcntl.h: New file, hides __fcntl only. * include/fcntl.h [IS_IN (rtld)]: Include instead of hiding __open and __fcntl. * sysdeps/mach/hurd/dl-unistd.h: Do not hide __access. diff --git a/ChangeLog b/ChangeLog index ce46c6b..aa151cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2016-03-20 Samuel Thibault : + + * sysdeps/generic/dl-fcntl.h: New file, hides __open and __fcntl. + * sysdeps/mach/hurd/dl-fcntl.h: New file, hides __fcntl only. + * include/fcntl.h [IS_IN (rtld)]: Include instead of + hiding __open and __fcntl. + * sysdeps/mach/hurd/dl-unistd.h: Do not hide __access. + 2016-03-20 Samuel Thibault * sysdeps/mach/hurd/Makefile ($(common-objpfx)errnos.d): Strip diff --git a/include/fcntl.h b/include/fcntl.h index 4168ee4..3b2c887 100644 --- a/include/fcntl.h +++ b/include/fcntl.h @@ -31,8 +31,7 @@ extern int __openat64_2 (int __fd, const char *__path, int __oflag); #if IS_IN (rtld) -extern __typeof (__open) __open attribute_hidden; -extern __typeof (__fcntl) __fcntl attribute_hidden; +# include #endif /* Flag determining whether the *at system calls are available. */ diff --git a/sysdeps/generic/dl-fcntl.h b/sysdeps/generic/dl-fcntl.h new file mode 100644 index 0000000..ee3c49c --- /dev/null +++ b/sysdeps/generic/dl-fcntl.h @@ -0,0 +1,21 @@ +/* Functions with hidden attribute internal to ld.so, which are declared + in include/fcntl.h. Generic version. + Copyright (C) 2016 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 (__open) __open attribute_hidden; +extern __typeof (__fcntl) __fcntl attribute_hidden; diff --git a/sysdeps/mach/hurd/dl-fcntl.h b/sysdeps/mach/hurd/dl-fcntl.h new file mode 100644 index 0000000..0fef2f1 --- /dev/null +++ b/sysdeps/mach/hurd/dl-fcntl.h @@ -0,0 +1,22 @@ +/* Functions with hidden attribute internal to ld.so, which are declared + in include/fcntl.h. Hurd version. + Copyright (C) 2016 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 + . */ + +/* __open can't be hidden in ld.so on Hurd since they will be preempted by the + ones in libc.so after bootstrap. */ +extern __typeof (__fcntl) __fcntl attribute_hidden; diff --git a/sysdeps/mach/hurd/dl-unistd.h b/sysdeps/mach/hurd/dl-unistd.h index b3cfb61..88bdd80 100644 --- a/sysdeps/mach/hurd/dl-unistd.h +++ b/sysdeps/mach/hurd/dl-unistd.h @@ -17,10 +17,9 @@ License along with the GNU C Library; if not, see . */ -/* __close, __getcwd, __getpid, __libc_read and __libc_write can't be +/* __access, __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;