From patchwork Thu Jun 1 12:55:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 769706 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 3wdnQb6X5gz9s78 for ; Thu, 1 Jun 2017 22:56:07 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="OXaRssm5"; 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:from:to:subject:date:message-id:mime-version :content-transfer-encoding; q=dns; s=default; b=OS4+UgU8Z2zk3fgf /0WmFnJuAQSVKVQm12i7MtPbjaQb1aGfODQY3N+GD6/5ZjHssmJD9fn4Z5RZogkE kMBYetH0fcwu3hYK8WgxJx3YcNRfK6TGjiUcNc/oKsy6VUshVqxl6Wo0oAigLCCR wE6wGXqfe40SqMde8M1txpqsdzE= 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:mime-version :content-transfer-encoding; s=default; bh=MJ3K6Yn5tIb60wGO/cNkBb s+qmI=; b=OXaRssm5YnuODXs5hdn9c/v8qlTR7A1rxcG7iUFb2NGUW0P1SIMhpS wX6q1aR/u/g3WYZ/rz3JlzP0bf0mcdizOfXCWBtclvZL0MGCMOINVweifpbaP5rG em/vZtLwiF2pR3NzoLKT79xzAho6Mxvk6owdX93+zXlfU5Mt8PXhM= Received: (qmail 2034 invoked by alias); 1 Jun 2017 12:55:55 -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 2006 invoked by uid 89); 1 Jun 2017 12:55:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mailbackend.panix.com From: Zack Weinberg To: libc-alpha@sourceware.org Subject: [PATCH COMMITTED] Avoid tickling a linker bug from microblaze pt-vfork.S. Date: Thu, 1 Jun 2017 08:55:54 -0400 Message-Id: <20170601125554.4962-1-zackw@panix.com> MIME-Version: 1.0 libpthread used to have its own vfork implementation that differed from libc's only in having a pointless micro-optimization. There is no longer any use to having a separate copy in libpthread, but the historical ABI requires a compatibility shim. microblaze was trying to be slightly too clever about how it did this, and tickled a linker bug. The linker bug should get fixed eventually, but there's no reason for us to keep tickling it in the meantime. This doesn't reuse the generic pt-vfork.c because microblaze doesn't have IFUNC support yet, and it doesn't reuse aarch64/pt-vfork.c because that fails to generate a tailcall (with GCC 7.1.1). * sysdeps/unix/sysv/linux/microblaze/pt-vfork.S: Don't include alpha/pt-vfork.S. Provide own compat shim for vfork and __vfork. * sysdeps/unix/sysv/linux/microblaze/vfork.S: Add __libc_vfork alias. * sysdeps/unix/sysv/linux/microblaze/localplt.data: libpthread.so no longer references __errno_location. --- sysdeps/unix/sysv/linux/microblaze/localplt.data | 1 - sysdeps/unix/sysv/linux/microblaze/pt-vfork.S | 50 +++++++++++++++++++++++- sysdeps/unix/sysv/linux/microblaze/vfork.S | 1 + 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/microblaze/localplt.data b/sysdeps/unix/sysv/linux/microblaze/localplt.data index a61b94dfb8..ca476bedd8 100644 --- a/sysdeps/unix/sysv/linux/microblaze/localplt.data +++ b/sysdeps/unix/sysv/linux/microblaze/localplt.data @@ -5,7 +5,6 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -libpthread.so: __errno_location # The dynamic loader needs __tls_get_addr for TLS. ld.so: __tls_get_addr ? # The main malloc is interposed into the dynamic linker, for diff --git a/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S b/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S index 65cc3823ac..f201f0429f 100644 --- a/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S +++ b/sysdeps/unix/sysv/linux/microblaze/pt-vfork.S @@ -1 +1,49 @@ -#include +/* vfork ABI-compatibility entry points for libpthread. + Copyright (C) 2014-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 + +/* libpthread used to have its own vfork implementation that differed + from libc's only in having a pointless micro-optimization. There + is no longer any use to having a separate copy in libpthread, but + the historical ABI requires it. For static linking, there is no + need to provide anything here--the libc version will be linked in. + For shared library ABI compatibility, there must be __vfork and + vfork symbols in libpthread.so. + + As of GCC 7, microblaze can *not* rely on the compiler to generate + a tail call from this vfork to __libc_vfork. */ + +#if (SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20) \ + || SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20)) + +ENTRY (vfork_compat) + bri __libc_vfork +END (vfork_compat) + +#endif + +#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20) +compat_symbol (libpthread, vfork_compat, vfork, GLIBC_2_0) +#endif + +#if SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20) +strong_alias (vfork_compat, vfork_compat2) +compat_symbol (libpthread, vfork_compat2, __vfork, GLIBC_2_1_2) +#endif diff --git a/sysdeps/unix/sysv/linux/microblaze/vfork.S b/sysdeps/unix/sysv/linux/microblaze/vfork.S index 1ad86229a9..f1e4508d20 100644 --- a/sysdeps/unix/sysv/linux/microblaze/vfork.S +++ b/sysdeps/unix/sysv/linux/microblaze/vfork.S @@ -43,3 +43,4 @@ PSEUDO_END (__vfork) libc_hidden_def (__vfork) weak_alias (__vfork, vfork) +strong_alias (__vfork, __libc_vfork)