From patchwork Mon Mar 10 20:56:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 25 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: siddhesh@wilcox.dreamhost.com Delivered-To: siddhesh@wilcox.dreamhost.com Received: from homiemail-mx22.g.dreamhost.com (caibbdcaabij.dreamhost.com [208.113.200.189]) by wilcox.dreamhost.com (Postfix) with ESMTP id E53A2360084 for ; Mon, 10 Mar 2014 13:56:33 -0700 (PDT) Received: by homiemail-mx22.g.dreamhost.com (Postfix, from userid 14307373) id 837AD4CEB2B9; Mon, 10 Mar 2014 13:56:33 -0700 (PDT) X-Original-To: glibc@patchwork.siddhesh.in Delivered-To: x14307373@homiemail-mx22.g.dreamhost.com 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 homiemail-mx22.g.dreamhost.com (Postfix) with ESMTPS id 5B97A4C899CD for ; Mon, 10 Mar 2014 13:56:33 -0700 (PDT) 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=rZ2 iJuGU0y/Rxg/fyYvHnPkOMdVcx6ul21SjswXnprFXrGs5/u5B2Kb5QmP1aGcRKUu 8zu2rLB5UagIJ2spajsDs4Y5Ik//uT5sZphgFEVCwQzm52PXgg/McW8tuUIlhjJL cHC5CfEbnGfA+7+qaECusUnSa/9Zg+9zq0sib/8g= 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=3ayZw9M5M sqg7DXcmCtol5/6a2c=; b=X8t03f2mojVdG1TxwGiiYokpdGB8j4dnf3TTBiHfy myGwlc2PQt/vH6zlUGvwmgXpfEEckAPDqCkVbho+XmF9mO+NveQEH7LUZF8T8yjo Hv4G3T3rJl3D2PMMS9oeykuh2ub7CSLXZqVh5LRp4BQYjOmsZByVNMYN+nHY6DOQ Z0= Received: (qmail 2630 invoked by alias); 10 Mar 2014 20:56:30 -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 2616 invoked by uid 89); 10 Mar 2014 20:56:29 -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: e24smtp05.br.ibm.com Message-ID: <531E26F2.202@linux.vnet.ibm.com> Date: Mon, 10 Mar 2014 17:56:18 -0300 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: "GNU C. Library" Subject: [PATCH] PowerPC: Fix bzero definition for static libc X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14031020-1798-0000-0000-000001F8C020 X-DH-Original-To: glibc@patchwork.siddhesh.in This patch fixes an issue for powerpc64[le] static build where __bzero is definied in multiple places (memset-ppc64.o and bzero.o). It is now defined only in bzero.o and memset-ppc64.o only defined __bzero_ppc for both dynamic and static library. Fixes BZ#16683. Tested on powerpc64 and powerpc64le. If no one oppose it, I will commit tomorrow. --- 2014-03-10 Adhemerval Zanella [BZ #16683] * sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S (__bzero_ppc): Define it for static builds as well. (NO_BZERO_IMPL): Likewise. --- diff --git a/NEWS b/NEWS index 64a0500..df126f3 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ Version 2.20 * The following bugs are resolved with this release: 15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610, - 16611, 16613, 16623, 16632, 16639, 16670, 16674. + 16611, 16613, 16623, 16632, 16639, 16670, 16674, 16683. * The am33 port, which had not worked for several years, has been removed from ports. diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S index 5b234d9e..65b3afe 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S +++ b/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S @@ -18,10 +18,9 @@ #include -#if defined SHARED && !defined NOT_IN_libc - /* Copied from bzero.S to prevent the linker from inserting a stub - between bzero and memset. */ + between bzero and memset. NOTE: this code should be positioned + before ENTRY/END_GEN_TB redefinition. */ ENTRY (__bzero_ppc) CALL_MCOUNT 3 mr r5,r4 @@ -29,6 +28,8 @@ ENTRY (__bzero_ppc) b L(_memset) END_GEN_TB (__bzero_ppc,TB_TOCLESS) + +#if defined SHARED && !defined NOT_IN_libc # undef EALIGN # define EALIGN(name, alignt, words) \ .section ".text"; \ @@ -48,9 +49,9 @@ END_GEN_TB (__bzero_ppc,TB_TOCLESS) # undef libc_hidden_builtin_def # define libc_hidden_builtin_def(name) \ .globl __GI_memset; __GI_memset = __memset_ppc +#endif /* Do not implement __bzero at powerpc64/memset.S. */ -# define NO_BZERO_IMPL -#endif +#define NO_BZERO_IMPL #include