From patchwork Wed Nov 30 17:14:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 85900 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp324329qgi; Wed, 30 Nov 2016 09:15:06 -0800 (PST) X-Received: by 10.84.196.164 with SMTP id l33mr75365097pld.150.1480526106073; Wed, 30 Nov 2016 09:15:06 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id h5si61312282pgg.22.2016.11.30.09.15.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Nov 2016 09:15:06 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-75367-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-75367-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-75367-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=U0VEKjIWydz9h4wEwcJJUVvIyEIR0NYnKJ4+6f5bFVhMAH/U/kShH 3fvy4aFR4kgArF1cxvS6/qRy8uc75rW9UjHEJu+LKg8MyMMwHTWr2h1L4YaXBs9V V1lGmVDcBF4Bu5HTMw7dcy2rpclp242T15qphyHNB9iaR+mDBpoYOQ= 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=F7PHVm663Aw+N1id/FQwIh8+rsw=; b=Q6V1QcTe2iuXazUJVWiBSkZrxmtj 36LfDI+EDQ4nsJo38GRFkQP47awWZLyikP1+NpYa0Fmrj5yRNd03R+XxZIfLDJsE +cb2COZ2CbCaOpxJbOf3ztYKQEbpC1+pJtgzkCjIM5YhmPxzcJAStrz8CL+0bZms IbnvCXgu8ikvU6o= Received: (qmail 55419 invoked by alias); 30 Nov 2016 17:14:54 -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 55394 invoked by uid 89); 30 Nov 2016 17:14:54 -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=H*MI:23879, H*m:23879 X-HELO: mail-vk0-f53.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=NgkgxoN70m4kfw4UGvze+Pj06FdfwiMEHyG35IB3CX4=; b=L5/5n7DZoKgt+0pJ/rivuCz5DuXiD14mTEvNwQ6tU7nTe99qv6KYzgfWyLZWJiufB+ SdWuhMywzAP0uUdDcffQFpqdKM0qZXHBf4+5H0n1WAVhheAOj6AhgN9VtVu3em9frn3n kdGj9pr735BWsOQzSbRNS62vX2cuBTvxRmEOStOqevvi0/B1h0y95Nbrgq0vmo9wy2mN xoWeRdFUTtjNIxsquIg8uJaS4ycfKX+UDkrfd5HbEB52GXefImc1UiZHZLF/mouSQkJR vdBX/Hcm8se0G7IzY38ApoQ2D6+701u1m9nkMLBFqCb4US6Cf9SZkqaiv0bCcDtqSrl5 NhIQ== X-Gm-Message-State: AKaTC00cyZhCROxDejJSh6D1uaQO2LuSHx+eAg/Nk1RyRENwYS0lceXYE2JQl5iUQK2VYm9P X-Received: by 10.31.248.131 with SMTP id w125mr12921837vkh.10.1480526082020; Wed, 30 Nov 2016 09:14:42 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] powerpc: Remove stpcpy internal clash with IFUNC Date: Wed, 30 Nov 2016 15:14:29 -0200 Message-Id: <1480526069-23879-1-git-send-email-adhemerval.zanella@linaro.org> Commit 142e0a99530 redirected the internal stpcpy to default powerpc64 implementation by redefining the weak_alias at sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c: #undef weak_alias #define weak_alias(name, aliasname) \ extern __typeof (__stpcpy_ppc) aliasname \ __attribute__ ((weak, alias ("__stpcpy_ppc"))); This creates a __GI_stpcpy alias that clashes with the IFUNC symbol in stpcpy.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/stpcpy-ppc64.c (weak_alias): Remove redirection to __stpcpy_ppc. --- ChangeLog | 5 +++++ sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c index d607d8a..37a2325 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c +++ b/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c @@ -27,9 +27,7 @@ extern __typeof (stpcpy) __stpcpy_ppc attribute_hidden; #define strlen __strlen_ppc #undef weak_alias -#define weak_alias(name, aliasname) \ - extern __typeof (__stpcpy_ppc) aliasname \ - __attribute__ ((weak, alias ("__stpcpy_ppc"))); +#define weak_alias(name, aliasname) #undef libc_hidden_def #define libc_hidden_def(name)