From patchwork Sun May 25 16:01:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 352250 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 01F4B14007D for ; Mon, 26 May 2014 02:01:43 +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:subject:date:message-id; q=dns; s= default; b=ych9JCBeTSSWH1Y4NAewme1vwjQxJzePHVcufSv7O6lmg6+HGjfGp KD2FUL4zTGQpIXqejw0ZtC6ZQXbrS6x6MkWtIKIBkwU6sceBBqKS5/Qrafex4OzB Wx4c/vItsUTDf+mDuj4nSXijusjsOqdGJ9FSQ6nCjiQjI638NgG0QE= 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; s=default; bh=/hTKdPuNKEZiJWOoi7lEA4FmbRg=; b=oesIZ90oqBBl/kJnWIR9RHmsSHkS M1PxqNGXUCpWzzyt4jEcqk1XM9anRACgEbjyvL0wufUa+3FsY1yNLZX3hL6EaGh1 /JaEh2geKwa+B/mbyqNz6UZhDCeFC1Cy58VH6yIuUdfqmKPJnMXljoeAG05cyjWG OUpyYwWnluzrzXk= Received: (qmail 9642 invoked by alias); 25 May 2014 16:01:37 -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 9630 invoked by uid 89); 25 May 2014 16:01:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-pa0-f51.google.com X-Received: by 10.68.197.39 with SMTP id ir7mr21687114pbc.78.1401033693664; Sun, 25 May 2014 09:01:33 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Subject: [COMMITTED] alpha: Do non-default symbols in pt-vfork.S Date: Sun, 25 May 2014 09:01:30 -0700 Message-Id: <1401033690-23110-1-git-send-email-rth@twiddle.net> Match up with the generic changes from Friday. r~ --- ChangeLog | 7 +++++++ sysdeps/unix/sysv/linux/alpha/pt-vfork.S | 9 +++++++++ sysdeps/unix/sysv/linux/alpha/vfork.S | 11 +++++------ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 271e31d..a126a4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-05-25 Richard Henderson + + * sysdeps/unix/sysv/linux/alpha/vfork.S (vfork, __vfork): Only + define if !NOT_IN_libc. + * sysdeps/unix/sysv/linux/alpha/pt-vfork.S (vfork, __vfork): Only + define with non-default symbol versions. + 2014-05-23 Richard Henderson * nptl/pt-vfork.c (vfork_resolve): Rename from vfork_ifunc. diff --git a/sysdeps/unix/sysv/linux/alpha/pt-vfork.S b/sysdeps/unix/sysv/linux/alpha/pt-vfork.S index 1d13736..18bf338 100644 --- a/sysdeps/unix/sysv/linux/alpha/pt-vfork.S +++ b/sysdeps/unix/sysv/linux/alpha/pt-vfork.S @@ -32,3 +32,12 @@ #include #endif + +#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_20) +compat_symbol (libpthread, __libc_vfork, vfork, GLIBC_2_0); +#endif + +#if SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_20) +strong_alias (__libc_vfork, __vfork_compat) +compat_symbol (libpthread, __vfork_compat, __vfork, GLIBC_2_1_2); +#endif diff --git a/sysdeps/unix/sysv/linux/alpha/vfork.S b/sysdeps/unix/sysv/linux/alpha/vfork.S index 0507d35..befcd78 100644 --- a/sysdeps/unix/sysv/linux/alpha/vfork.S +++ b/sysdeps/unix/sysv/linux/alpha/vfork.S @@ -18,7 +18,7 @@ #include #include -ENTRY(__vfork) +ENTRY(__libc_vfork) PSEUDO_PROLOGUE /* Load the thread pointer value in A1 across the vfork. */ @@ -47,11 +47,10 @@ ENTRY(__vfork) bne a3, SYSCALL_ERROR_LABEL ret -PSEUDO_END (__vfork) -libc_hidden_def (__vfork) - -weak_alias (__vfork, vfork) +PSEUDO_END (__libc_vfork) #if !NOT_IN_libc -strong_alias (__vfork, __libc_vfork) +weak_alias (__libc_vfork, vfork) +strong_alias (__libc_vfork, __vfork) +libc_hidden_def (__vfork) #endif