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: 7954 X-Patchwork-Delegate: tuliom@linux.vnet.ibm.com Received: (qmail 32933 invoked by alias); 31 Jul 2015 14:40: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 32922 invoked by uid 89); 31 Jul 2015 14:40:29 -0000 Authentication-Results: sourceware.org; auth=none 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-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 :cc:subject:content-type:content-transfer-encoding; bh=T0f0DOoPaDYMkFcuolSFrZ6uExbp3fHngvAtKW85Wr0=; b=gN0zRcCSiH+L81AyiXSGCYYq9m2vh7F6I1+X341pVKTLE2UlPZ1nIlcJJHgeE/+zIy 4hM3d4WyZbJb1O6xkPajFaQJML9eZcOzb5G2M4vLT2blyGzftJa378oIZaFSI4pF3vvS 8w35c3U9iHp54P2SrAgsrFE/IpQS6rE9Dij0WmBwUd9f8g87YwuCXW/EtayPl45dI7Zf sJvVWDxrE9uGywp7kQky5KddpOxgQtYiTqNBq6VQBk0siX0Sy3kKK5/6YueKmkzuW8q9 IUToXT0qNwUJX6VPHzsqRqkBKh8oJ1k/Y+KMZxLB62afvIv12aT5CACGFoggLM52m4aT zAUw== X-Gm-Message-State: ALoCoQk6c8S4BuI3z/eTJMtbr9eNa3Z7kJIT69TJLS9GY5HOgJAu5ll2te8x/Dydi6iCQBoQd2m1 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 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