From patchwork Tue Apr 7 13:34:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 458678 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 4165D14027F for ; Tue, 7 Apr 2015 23:34:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=sourceware.org header.i=@sourceware.org header.b=bzQoY3FI; dkim-adsp=none (unprotected policy); 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:message-id:date:from:mime-version:to:subject :content-type:content-transfer-encoding; q=dns; s=default; b=inM gvp0Jgzz+YXoiHBxVd3zXwiCfO8HfH/RVmoaPHb00ldeRZ1f87CYYW9UuiWuRlpy Iu+gw0PcnEW84Iz3Bbo6qxhRSUnwmDU2Npr0G5Mn28YUpYDTea9+IIZAu8EVXUL7 UdhnZ4FQ69L7NV9PPVOv0pOS7ZvL7rMzY29zuzdk= 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:subject :content-type:content-transfer-encoding; s=default; bh=L6PXzMl5c lOBoVKce8X33AwO//E=; b=bzQoY3FI+RTeO63IxwvfmUh+q9JuMhcRrpMy9bZu8 +jWyMLxv7uVECZ2qV+XJEUCJRTmOHauaTMbrSmEN8Mc4fgn9Nl489ZOBGSujWYFI xYsQshFjUjhXDKjGZdq2DOuEXBdw7iRy5O65C0/PVtIzmJxvwJUMPSnY/9cCKEe3 jk= Received: (qmail 21331 invoked by alias); 7 Apr 2015 13:34:16 -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 21321 invoked by uid 89); 7 Apr 2015 13:34:15 -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, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-qg0-f49.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:content-type:content-transfer-encoding; bh=VwZJD88Ro+OnP1HM+HaZf6ujUnkaCjkmOeH9RyZnAPs=; b=eJAtXI+ZrnK1mZBndggXT8US6BCrGTfZFzR2xLg7E0cJfeHxd42gMf0eZtWsxMBmYY UL0HdKX0xGkvHoYi1Vt+qHGwIDDdSrCs3IafmhSOCgqXmO7j7gK3/5/A/M7AtaQ3CRhe QmyX3enx0WZI+X2WxZfmba0iSuHe4TtI0RAcVUFMdntLm6l09BJpZbFOmEh/LNLappKU y+UIZbFGYp0ucwlEScDwq2KXcLkOSBf/tCv0kn2fF1+2AyZ0n6fF+gGQNEVQiKTYogKu Z20jvzp5fJaXvsLtQw0untgA/AFpMVSn8rwW6Na6d+c1l4Vt3GqMqC+/1NXOKIRjzEIB PHBw== X-Gm-Message-State: ALoCoQl1m2YJ8Y5Y5/IY+7uuSV6zAoiPuCaz5WpU9EajLbrsKCxRKhk//dOQRw+42Jy9HqpnwMla X-Received: by 10.140.232.3 with SMTP id d3mr24187088qhc.46.1428413652394; Tue, 07 Apr 2015 06:34:12 -0700 (PDT) Message-ID: <5523DCD1.4050005@linaro.org> Date: Tue, 07 Apr 2015 10:34:09 -0300 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: libc-alpha@sourceware.org, Steven Munroe Subject: [PATCH] powerpc: Fix __wcschr static build Hi, I am reposting this patch with my new email address. This patch fix the static build for strftime, which uses __wcschr. Current powerpc32 implementation defines the __wcschr be an alias to __wcschr_ppc32 and current implementation misses the correct alias for static build. It also changes the default wcschr.c logic so a IFUNC implementation should just define WCSCHR and undefine the required alias/internal definitions. Tested on i386 and on cross powerpc32 build. Ok to apply? --- 2015-04-07 Adhemerval Zanella * wcsmbs/wcschr.c [WCSCHR] (wcschr): Define as __wcschr. Remove conditionals for weak_alias and libc_hidden_weak. * sysdeps/i386/i686/multiarch/wcschr-c.c [libc]: Undefine libc_hidden_weak and weak_alias. * sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c [libc]: Undefine libc_hidden_weak. Define libc_hidden_def for SHARED builds and weak_alias for static one. --- diff --git a/sysdeps/i386/i686/multiarch/wcschr-c.c b/sysdeps/i386/i686/multiarch/wcschr-c.c index 786c132..38d41d0 100644 --- a/sysdeps/i386/i686/multiarch/wcschr-c.c +++ b/sysdeps/i386/i686/multiarch/wcschr-c.c @@ -1,6 +1,12 @@ #include #if IS_IN (libc) +# undef libc_hidden_weak +# define libc_hidden_weak(name) + +# undef weak_alias +# define weak_alias(name,alias) + # ifdef SHARED # undef libc_hidden_def # define libc_hidden_def(name) \ @@ -8,9 +14,9 @@ strong_alias (__wcschr_ia32, __wcschr_ia32_1); \ __hidden_ver1 (__wcschr_ia32_1, __GI___wcschr, __wcschr_ia32_1); # endif -# define WCSCHR __wcschr_ia32 #endif extern __typeof (wcschr) __wcschr_ia32; -#include "wcsmbs/wcschr.c" +#define WCSCHR __wcschr_ia32 +#include diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c index df586a6..3b2ab3a 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/wcschr-ppc32.c @@ -18,16 +18,26 @@ #include #if IS_IN (libc) +# undef libc_hidden_weak +# define libc_hidden_weak(name) + +# undef weak_alias +# undef libc_hidden_def + # ifdef SHARED -# undef libc_hidden_def -# define libc_hidden_def(name) \ +# define libc_hidden_def(name) \ __hidden_ver1 (__wcschr_ppc, __GI_wcschr, __wcschr_ppc); \ strong_alias (__wcschr_ppc, __wcschr_ppc_1); \ __hidden_ver1 (__wcschr_ppc_1, __GI___wcschr, __wcschr_ppc_1); -# endif -# define WCSCHR __wcschr_ppc +# define weak_alias(name,alias) +# else +# define weak_alias(name, alias) \ + _weak_alias(__wcschr_ppc, __wcschr) +# define libc_hidden_def(name) +# endif /* SHARED */ #endif extern __typeof (wcschr) __wcschr_ppc; +#define WCSCHR __wcschr_ppc #include diff --git a/wcsmbs/wcschr.c b/wcsmbs/wcschr.c index a287283..77624be 100644 --- a/wcsmbs/wcschr.c +++ b/wcsmbs/wcschr.c @@ -17,17 +17,13 @@ #include -/* Find the first occurrence of WC in WCS. */ -#ifdef WCSCHR -# define wcschr WCSCHR -#else -# define wcschr __wcschr +#ifndef WCSCHR +# define WCSCHR __wcschr #endif +/* Find the first occurrence of WC in WCS. */ wchar_t * -wcschr (wcs, wc) - const wchar_t *wcs; - const wchar_t wc; +WCSCHR (const wchar_t *wcs, const wchar_t wc) { do if (*wcs == wc) @@ -36,9 +32,6 @@ wcschr (wcs, wc) return NULL; } -libc_hidden_def (wcschr) -#ifndef WCSCHR -# undef wcschr +libc_hidden_def (__wcschr) weak_alias (__wcschr, wcschr) libc_hidden_weak (wcschr) -#endif