From patchwork Fri May 23 23:15:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 352047 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 CA162140082 for ; Sat, 24 May 2014 09:15:54 +1000 (EST) 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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=vzbgYk/HoTgUo/8IqzynZDhXZTzJn88 hkuGS5ZA6zVnRUCNYgMJp1FmGS8WS+DBu9LXtlL/4cOVset3Cn9Z8hPtq+zyBOzW FiGai6L7eOwuB/L1gZXeHYgMWeWivsC4HK7Edx6Fvof+7XE4+A65bK+t2SmGGrdz KwDNv15oamJo= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=CGzqoc2/x0TW6exQ4G8XyR+S2Q8=; b=PFLRc yR5l+zdK1oPLcq7MLC1xGlbROnX3Kbmul0/96GaPDO5jiV3isPfR/nUyljZWcMgZ o3QkC9GfAYxcOKINEQ9Qz/NS22M4X5Ywt0L7B8gQjcdE/LQdcEoETfK4Q9yLNNfl gGPu/5RuB6U7hZw4frizF1YD1KTG032miz92mU= Received: (qmail 20065 invoked by alias); 23 May 2014 23:15:49 -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 20038 invoked by uid 89); 23 May 2014 23:15:47 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-qg0-f50.google.com X-Received: by 10.140.41.166 with SMTP id z35mr11031968qgz.20.1400886944192; Fri, 23 May 2014 16:15:44 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Cc: roland@hack.frob.com Subject: [PATCH 1/2] Only support ifunc in nptl/pt-vfork.c Date: Fri, 23 May 2014 16:15:35 -0700 Message-Id: <1400886936-16338-2-git-send-email-rth@twiddle.net> In-Reply-To: <1400886936-16338-1-git-send-email-rth@twiddle.net> References: <1400886936-16338-1-git-send-email-rth@twiddle.net> * nptl/pt-vfork.c: Error if !HAVE_IFUNC. [!HAVE_IFUNC] (vfork_compat): Remove. [!HAVE_IFUNC] (DEFINE_VFORK): Remove. --- nptl/pt-vfork.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/nptl/pt-vfork.c b/nptl/pt-vfork.c index 81d1b71..8beb121 100644 --- a/nptl/pt-vfork.c +++ b/nptl/pt-vfork.c @@ -28,13 +28,20 @@ vfork symbols in libpthread.so; so we define them using IFUNC to redirect to the libc function. */ +/* Note! If the architecture doesn't support IFUNC, then we need an + alternate target-specific mechanism to implement this. So we just + assume IFUNC here and require that the target override this file + if necessary. */ + +#if !HAVE_IFUNC +# error +#endif + #if (SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20) \ || SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20)) extern __typeof (vfork) __libc_vfork; /* Defined in libc. */ -# ifdef HAVE_IFUNC - attribute_hidden __attribute__ ((used)) __typeof (vfork) * vfork_ifunc (void) @@ -42,29 +49,16 @@ vfork_ifunc (void) return &__libc_vfork; } -# ifdef HAVE_ASM_SET_DIRECTIVE -# define DEFINE_VFORK(name) \ +# ifdef HAVE_ASM_SET_DIRECTIVE +# define DEFINE_VFORK(name) \ asm (".set " #name ", vfork_ifunc\n" \ ".globl " #name "\n" \ ".type " #name ", %gnu_indirect_function"); -# else -# define DEFINE_VFORK(name) \ +# else +# define DEFINE_VFORK(name) \ asm (#name " = vfork_ifunc\n" \ ".globl " #name "\n" \ ".type " #name ", %gnu_indirect_function"); -# endif - -# else - -attribute_hidden -pid_t -vfork_compat (void) -{ - return __libc_vfork (); -} - -# define DEFINE_VFORK(name) weak_alias (vfork_compat, name) - # endif #endif