From patchwork Wed Jan 21 16:14:35 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: 4749 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Received: (qmail 21342 invoked by alias); 21 Jan 2015 16:14:50 -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 21311 invoked by uid 89); 21 Jan 2015 16:14:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e24smtp02.br.ibm.com Message-ID: <54BFD06B.5060206@linux.vnet.ibm.com> Date: Wed, 21 Jan 2015 14:14:35 -0200 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: "GNU C. Library" Subject: [PATCH 1/6] powerpc: multiarch Makefile cleanup for powerpc64 References: <54BFCE9B.3030602@linux.vnet.ibm.com> In-Reply-To: <54BFCE9B.3030602@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15012116-0021-0000-0000-000001AC42CC This patch cleanups the multiarch Makefile by putting the wide chars implementation to correct wcsmbs rule. Tested on powerpc64 and powerpc64le. --- * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: Remove wide chars objects. [wcsmbs]: New rule for wide char objects. -- diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile index b7ea284..fe4f255 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile @@ -10,9 +10,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strncase-power7 strncase_l-power7 \ strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \ strchr-power7 strchr-ppc64 \ - strchrnul-power7 strchrnul-ppc64 wcschr-power7 \ - wcschr-power6 wcschr-ppc64 wcsrchr-power7 wcsrchr-power6 \ - wcsrchr-ppc64 wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \ + strchrnul-power7 strchrnul-ppc64 \ wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \ strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \ stpcpy-power7 stpcpy-ppc64 \ @@ -25,12 +23,19 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops +CFLAGS-wordcopy-power7.c += -mcpu=power7 +CFLAGS-wordcopy-power6.c += -mcpu=power6 +endif + +ifeq ($(subdir),wcsmbs) +sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc64 \ + wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc64 \ + wcscpy-power7 wcscpy-power6 wcscpy-ppc64 \ + CFLAGS-wcschr-power7.c += -mcpu=power7 CFLAGS-wcschr-power6.c += -mcpu=power6 CFLAGS-wcsrchr-power7.c += -mcpu=power7 CFLAGS-wcsrchr-power6.c += -mcpu=power6 CFLAGS-wcscpy-power7.c += -mcpu=power7 CFLAGS-wcscpy-power6.c += -mcpu=power6 -CFLAGS-wordcopy-power7.c += -mcpu=power7 -CFLAGS-wordcopy-power6.c += -mcpu=power6 endif