From patchwork Wed Jan 21 16:15:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 431542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 4EA171401D0 for ; Thu, 22 Jan 2015 03:15:58 +1100 (AEDT) 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 :references:in-reply-to:content-type:content-transfer-encoding; q=dns; s=default; b=r2MqjUloy2zXa0Vfy2jR2xzU9DM23cT3AhShZ8nDydy yHtQT4jAyoSKvvXTDOWYxvPHPhFA2sWz9YqxdQFtVqARoybZOnBxEdpzPtPf6w/a Vv/pMJJhF8XnP+pgyPsZlIg678vl+pNLAAwUQ9Tr0FoJjjD9H009R8GyWLoMU8o4 = 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 :references:in-reply-to:content-type:content-transfer-encoding; s=default; bh=HpWBky/VcAyoMNvB/+D8npVT7tM=; b=c1hPPbheP5/0HxP8l 8JYQBbraXADCx4C5+Auj0qraTWdlD/MNXfXQNQCbDRwIzGGhGpHmUVvZapQ+0ZZu zLhch2/ZnNbvjKuUEMch/R8h5CI8I50aR5YonsSoYutYBJAljSk9o7lr0AzsIb0W lWpYEE0IAu64n0hwtksvM4dtFo= Received: (qmail 24191 invoked by alias); 21 Jan 2015 16:15:23 -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 24045 invoked by uid 89); 21 Jan 2015 16:15:21 -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: <54BFD08D.5040902@linux.vnet.ibm.com> Date: Wed, 21 Jan 2015 14:15:09 -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 5/6] powerpc: multiarch Makefile cleanup for powerpc32 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-000001AC4321 This patch cleanups the multiarch Makefile by putting the wide chars implementation to correct wcsmbs rule. Tested on powerpc32-fpu. --- * sysdeps/powerpc/powerpc32/power4/multiarch/Makefile [sysdep_routines]: Remove wide chars objects. [wcsmbs]: New rule for wide char objects. -- diff --git a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile index a7d33b9..2271d57 100644 --- a/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/power4/multiarch/Makefile @@ -8,13 +8,19 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strnlen-ppc32 strncmp-power7 strncmp-ppc32 \ strcasecmp-power7 strcasecmp_l-power7 strncase-power7 \ strncase_l-power7 strchrnul-power7 strchrnul-ppc32 \ - strchr-power7 strchr-ppc32 wcschr-power7 wcschr-power6 \ - wcschr-ppc32 wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \ - wcscpy-power7 wcscpy-power6 wcscpy-ppc32 wordcopy-power7 \ - wordcopy-power6 wordcopy-ppc32 memmove-power7 memmove-ppc + strchr-power7 strchr-ppc32 \ + wordcopy-power7 wordcopy-power6 wordcopy-ppc32 \ + memmove-power7 memmove-ppc CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops +endif + +ifeq ($(subdir),wcsmbs) +sysdep_routines += wcschr-power7 wcschr-power6 wcschr-ppc32 \ + wcsrchr-power7 wcsrchr-power6 wcsrchr-ppc32 \ + wcscpy-power7 wcscpy-power6 wcscpy-ppc32 + CFLAGS-wcschr-power7.c += -mcpu=power7 CFLAGS-wcschr-power6.c += -mcpu=power6 CFLAGS-wcsrchr-power7.c += -mcpu=power7