From patchwork Wed Dec 10 10:51:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 419546 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 CD4301400A0 for ; Wed, 10 Dec 2014 21:51:42 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type; q=dns; s=default; b= ZaA4k9GoLXZvmP0Mqmb0ZPQE8y+mO3VRIJu5KnW1GkTCqZJA5cvuzUJUJkqdqOcw Y9zjh6fXPsCm8i81JmcPlvqOhkRe3kxkylXonU01FkeORjAD4OP859ZK9YBLfh4J kmfyvpZ8fG9rmYI9iiDkxctA2rkTWE1m1HcVvyFRahQ= 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:message-id:date:from:mime-version:to:cc :subject:references:in-reply-to:content-type; s=default; bh=/hli Ib5nwjlxoI/zUiIXeDIE3Os=; b=bpwoY0N2gffv+LH3hfC7uaSGL0O7ATL8hnEk 9J69jJyA1N1hxyaeDA1ktfOEZv51QtULdl0EILLyJbOwr3Rh9WZLRhEGJVWUIGNc H4lwyTnI2mvbKlDd/3O96CA4hYoAc6h8M9XITkMm3WiviMFx2pLdkQDMJ0MFQKkt TNn8+Zc= Received: (qmail 16976 invoked by alias); 10 Dec 2014 10:51: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 16960 invoked by uid 89); 10 Dec 2014 10:51:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e24smtp02.br.ibm.com Message-ID: <548825AD.4050005@linux.vnet.ibm.com> Date: Wed, 10 Dec 2014 08:51:25 -0200 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Joseph Myers CC: libc-alpha@sourceware.org Subject: Re: Fix strftime wcschr namespace (bug 17634) References: <548788AE.50808@linux.vnet.ibm.com> In-Reply-To: X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14121010-0021-0000-0000-000001545187 On 09-12-2014 22:37, Joseph Myers wrote: > On Tue, 9 Dec 2014, Adhemerval Zanella wrote: > >> This patch breaks both powerpc32 and powerpc64 builds and I fixed it by using >> these changes over yours: > This doesn't apply cleanly to me - could you send it as an attachment? > > patching file sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c > Hunk #1 FAILED at 17. > 1 out of 1 hunk FAILED -- saving rejects to file sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c.rej > patching file sysdeps/powerpc/powerpc64/multiarch/wcschr.c > Hunk #1 succeeded at 32 with fuzz 1. > Sure, in attachments. diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c index d273d8d..ae5c517 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr.c @@ -17,23 +17,25 @@ . */ #if IS_IN (libc) +# define wcschr __redirect_wcschr # include # include # include "init-arch.h" -extern __typeof (wcschr) __wcschr_ppc attribute_hidden; -extern __typeof (wcschr) __wcschr_power6 attribute_hidden; -extern __typeof (wcschr) __wcschr_power7 attribute_hidden; +extern __typeof (__redirect_wcschr) __wcschr_ppc attribute_hidden; +extern __typeof (__redirect_wcschr) __wcschr_power6 attribute_hidden; +extern __typeof (__redirect_wcschr) __wcschr_power7 attribute_hidden; -libc_ifunc (__wcschr, +extern __typeof (__redirect_wcschr) __libc_wcschr; + +libc_ifunc (__libc_wcschr, (hwcap & PPC_FEATURE_HAS_VSX) ? __wcschr_power7 : (hwcap & PPC_FEATURE_ARCH_2_05) ? __wcschr_power6 : __wcschr_ppc); -weak_alias (__wcschr, wcschr) +#undef wcschr +weak_alias (__libc_wcschr, wcschr) #else -#undef libc_hidden_def -#define libc_hidden_def(a) #include #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c index d273d8d..658cd93 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wcschr.c @@ -32,6 +32,7 @@ libc_ifunc (__wcschr, ? __wcschr_power6 : __wcschr_ppc); weak_alias (__wcschr, wcschr) +libc_hidden_builtin_def (wcschr) #else #undef libc_hidden_def #define libc_hidden_def(a)