From patchwork Thu Dec 1 18:09:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 86139 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp816372qgi; Thu, 1 Dec 2016 10:09:49 -0800 (PST) X-Received: by 10.99.103.1 with SMTP id b1mr72177640pgc.58.1480615788942; Thu, 01 Dec 2016 10:09:48 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id d30si1026117pld.187.2016.12.01.10.09.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Dec 2016 10:09:48 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-75394-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org; spf=pass (google.com: domain of libc-alpha-return-75394-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-75394-patch=linaro.org@sourceware.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org 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=UO9vxaT8Ces4LWPVY4UpIwo128PIvFgiDCn0Ng3s/5Jbnr7nIG4M0 R7veOLY5c6W45pOtE8xX8zwKNnqtQkCks/CBzEjm87vuQvAqDc0LtAKtNCUdBlVW 2+RTQBp7DJeRx8bFvjZtzC7FO8DsMkIct7g8vO2XWgTQDSkDvw+mik= 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=nfPgefZiRrmJZnhHJTPEZOsQtJs=; b=nxip/H2niyTUJyKWihlRIaenJFje vcbS2XMc+phfeEiYLlZbloZ8HOAD0FDAGX8gO776EOXKoEOOE7Un+UqUwpZOjA96 q6Yjt+k3Bfs+ZKl6FwnO4k/jFXvi3z7vM5gzTV/fFaJaps6Bqx8UsYM7PpqcqMww zMOxwTdEnQET6mI= Received: (qmail 16243 invoked by alias); 1 Dec 2016 18:09:40 -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 16197 invoked by uid 89); 1 Dec 2016 18:09:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=Hx-languages-length:1553 X-HELO: mail-vk0-f51.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=ErtJsBGouMUGC6clg9BnZPamSOSBbJEzGuw4BjgJwbc=; b=nJyuM2UNSvK7gH+fzMbxrOmyPQH5sKGFUWbYDnf5jj41Qktv3vqoTN1d8PApRPGg/P j3Pi14Q1q8Jh6nogHDS5A/45/SsuipOPTJCpK72R/JptMKWViDjCaMh8X5pwX581QkHy x5h8YhtUmrzsg7PJmwgxai55e8wW7sLr/xx9M2hmyZHyjDCGhuzuNkdSEy7N4dH0Z6yR galsmNFiPNs0afFGcX6W9TRc0RGDsFGgV2NlIjAaXfI283iKIftip9QPTJne3aVYWjBP lY6EP6QQCD0ygbOPBkTPLSG+GuQeHzogEqsEbUi98Cw8Sz4LZQVYW8AgyUvL2R2yyNGO xNYg== X-Gm-Message-State: AKaTC01JFhBKyh/TQBF9fb0HgRwjRDdZ7qR0VFIJVgCqv0VOgpsBM1MWsE4oX2hId9djL3zm X-Received: by 10.31.48.85 with SMTP id w82mr5304196vkw.69.1480615767216; Thu, 01 Dec 2016 10:09:27 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] powerpc: Remove stpcpy internal clash with IFUNC Date: Thu, 1 Dec 2016 16:09:20 -0200 Message-Id: <1480615760-22153-1-git-send-email-adhemerval.zanella@linaro.org> Commit c7debbdfacb redirected the internal strrch to default powerpc64 implementation by redefining the weak_alias at sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.c: #undef weak_alias #define weak_alias(name, aliasname) \ extern __typeof (__strrchr_ppc) aliasname \ __attribute__ ((weak, alias ("__strrchr_ppc"))); This creates a __GI_strchr alias that clashes with the IFUNC symbol in stprchr.os. There is not need to define the default version for internal version, since ifunc should work internally for powerpc64. This patch removes the weak_alias indirection. Checked on powerpc64le. * sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c (weak_alias): Remove redirection to __strrchr_ppc. --- ChangeLog | 5 +++++ sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c index 151bd35..937c5ea 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c @@ -18,10 +18,10 @@ #include #define STRRCHR __strrchr_ppc + #undef weak_alias -#define weak_alias(name, aliasname) \ - extern __typeof (__strrchr_ppc) aliasname \ - __attribute__ ((weak, alias ("__strrchr_ppc"))); +#define weak_alias(name, aliasname) + #if IS_IN (libc) && defined(SHARED) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \