From patchwork Fri Jul 31 14:40:22 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: 51771 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 1E95222A8D for ; Fri, 31 Jul 2015 14:40:44 +0000 (UTC) Received: by labkf3 with SMTP id kf3sf7070275lab.0 for ; Fri, 31 Jul 2015 07:40:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mailing-list:precedence:list-id :list-unsubscribe:list-subscribe:list-archive:list-post:list-help :sender:delivered-to:message-id:date:from:user-agent:mime-version:to :cc:subject:content-type:content-transfer-encoding:x-original-sender :x-original-authentication-results; bh=T0f0DOoPaDYMkFcuolSFrZ6uExbp3fHngvAtKW85Wr0=; b=T4GG9dTlW4ZoCRi1+K5o2Y+xCG8CrkXcKA2l6J/HoNu0Wnh+QfLtYAvoO9pat2g9fK cBqGXPGntq4ljgGvuWhMA++gIFeQDkFN75pPoJYXDcUz6yo3ijNYAzWuasDhSqmV3t+x OWjwcxuI0XPnmweNmLoCrvirQ/TL+nmQ1LbcZ4KFK8t9FPLvV5+9P1azA/4hDpKqxDz5 WXQrxdKI+wlzXgyYIeVo9oS7JmDXr9MB/yUtCuGSTDQWsk2iHRTuU1eGZxzrDN7fYpoy IsavbUb569eC0b83Ei5P20ilsJKqZdQ83XhJXN0Al01b5xO2m/l6JGA2FU2wS+YrthC7 WRsQ== X-Gm-Message-State: ALoCoQm0RNNsW7o5Kbl8nqxrCHlK7QOfGeOhx4NTvmBhTojmfKvnYkFbuOjxAoOmSzw7F9sR+ewp X-Received: by 10.112.181.37 with SMTP id dt5mr1058194lbc.10.1438353643004; Fri, 31 Jul 2015 07:40:43 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.195 with SMTP id ao3ls348201lac.53.gmail; Fri, 31 Jul 2015 07:40:42 -0700 (PDT) X-Received: by 10.152.2.41 with SMTP id 9mr3076659lar.65.1438353642608; Fri, 31 Jul 2015 07:40:42 -0700 (PDT) Received: from mail-lb0-x235.google.com (mail-lb0-x235.google.com. [2a00:1450:4010:c04::235]) by mx.google.com with ESMTPS id dz8si3929535lac.4.2015.07.31.07.40.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 07:40:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::235 as permitted sender) client-ip=2a00:1450:4010:c04::235; Received: by lbbyj8 with SMTP id yj8so47564464lbb.0 for ; Fri, 31 Jul 2015 07:40:42 -0700 (PDT) X-Received: by 10.112.198.74 with SMTP id ja10mr3320637lbc.19.1438353642388; Fri, 31 Jul 2015 07:40:42 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp432032lba; Fri, 31 Jul 2015 07:40:41 -0700 (PDT) X-Received: by 10.66.157.195 with SMTP id wo3mr7633480pab.17.1438353640316; Fri, 31 Jul 2015 07:40:40 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id b8si10741323pas.112.2015.07.31.07.40.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 31 Jul 2015 07:40:40 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-61539-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 32933 invoked by alias); 31 Jul 2015 14:40:30 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list 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 32922 invoked by uid 89); 31 Jul 2015 14:40:29 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-yk0-f180.google.com X-Received: by 10.13.237.1 with SMTP id w1mr3604783ywe.132.1438353626482; Fri, 31 Jul 2015 07:40:26 -0700 (PDT) Message-ID: <55BB88D6.4080601@linaro.org> Date: Fri, 31 Jul 2015 11:40:22 -0300 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: GNU C Library CC: Steven Munroe , Tulio Magno Quites Machado Filho Subject: [PATCH] powerpc: Fix PPC64/POWER7 conform tests X-Original-Sender: adhemerval.zanella@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::235 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 When building with --disable-multi-arch the memmove and strstr POWER7 optimization create and uses symbols that conflict with expect conform tests. Checked on powerpc64. --- * sysdeps/powerpc/powerpc64/power7/memmove.S (bcopy): Changing to __bcopy and add a weak_alias to bcopy. * sysdeps/powerpc/powerpc64/power7/strstr.S (strstr): Use __strnlen for static build. -- diff --git a/sysdeps/powerpc/powerpc64/power7/memmove.S b/sysdeps/powerpc/powerpc64/power7/memmove.S index 3bd4b4b..43f0a48 100644 --- a/sysdeps/powerpc/powerpc64/power7/memmove.S +++ b/sysdeps/powerpc/powerpc64/power7/memmove.S @@ -823,9 +823,10 @@ libc_hidden_builtin_def (memmove) /* void bcopy(const void *src [r3], void *dest [r4], size_t n [r5]) Implemented in this file to avoid linker create a stub function call in the branch to '_memmove'. */ -ENTRY (bcopy) +ENTRY (__bcopy) mr r6,r3 mr r3,r4 mr r4,r6 b L(_memmove) -END (bcopy) +END (__bcopy) +weak_alias (__bcopy, bcopy) diff --git a/sysdeps/powerpc/powerpc64/power7/strstr.S b/sysdeps/powerpc/powerpc64/power7/strstr.S index 8dca31c..bfb0c49 100644 --- a/sysdeps/powerpc/powerpc64/power7/strstr.S +++ b/sysdeps/powerpc/powerpc64/power7/strstr.S @@ -39,7 +39,7 @@ # ifdef SHARED # define STRNLEN __GI_strnlen # else -# define STRNLEN strnlen +# define STRNLEN __strnlen # endif #endif