From patchwork Mon Aug 18 07:04:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 380685 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8AB7A1400A8 for ; Mon, 18 Aug 2014 17:04:43 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 7EA428AFFC; Mon, 18 Aug 2014 07:04:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mHtOT3y74UfW; Mon, 18 Aug 2014 07:04:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1475287C84; Mon, 18 Aug 2014 07:04:40 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 349F11C2862 for ; Mon, 18 Aug 2014 07:04:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2FC728910D for ; Mon, 18 Aug 2014 07:04:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id isiBvllPzlK2 for ; Mon, 18 Aug 2014 07:04:37 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (smtprelay4.synopsys.com [198.182.44.111]) by hemlock.osuosl.org (Postfix) with ESMTPS id E6A3B89104 for ; Mon, 18 Aug 2014 07:04:36 +0000 (UTC) Received: from us01secmta1.synopsys.com (us01secmta1.synopsys.com [10.9.203.100]) by smtprelay.synopsys.com (Postfix) with ESMTP id 2B42024E098F; Mon, 18 Aug 2014 00:04:34 -0700 (PDT) Received: from us01secmta1.internal.synopsys.com (us01secmta1.internal.synopsys.com [127.0.0.1]) by us01secmta1.internal.synopsys.com (Service) with ESMTP id 1E4E027113; Mon, 18 Aug 2014 00:04:34 -0700 (PDT) Received: from mailhost.synopsys.com (mailhost2.synopsys.com [10.9.202.240]) by us01secmta1.internal.synopsys.com (Service) with ESMTP id EE22527102; Mon, 18 Aug 2014 00:04:33 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id DDAC5B2F; Mon, 18 Aug 2014 00:04:33 -0700 (PDT) Received: from abrodkin-8560l.internal.synopsys.com (abrodkin-8560l.internal.synopsys.com [10.121.8.95]) by mailhost.synopsys.com (Postfix) with ESMTP id ECE0CB20; Mon, 18 Aug 2014 00:04:31 -0700 (PDT) From: Alexey Brodkin To: uclibc@uclibc.org Subject: [PATCH v2] test/math: fix for MIPS that takes 32/64 suffix into account Date: Mon, 18 Aug 2014 11:04:28 +0400 Message-Id: <1408345468-8328-1-git-send-email-abrodkin@synopsys.com> X-Mailer: git-send-email 1.9.3 Cc: Vineet Gupta X-BeenThere: uclibc@uclibc.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Discussion and development of uClibc \(the embedded C library\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: uclibc-bounces@uclibc.org Sender: uclibc-bounces@uclibc.org This fixes a breakage for MIPS32/64 introduced in: http://git.uclibc.org/uClibc/commit/?id=c02bc5763ba9c8f8b464bca89fba28e091ce1ffc Now ULP_SUFFIX is taken into account when searching for existing libm-test-ulps-ARCH Signed-off-by: Alexey Brodkin Cc: Waldemar Brodkorb Cc: Vineet Gupta Cc: Anton Kolesov Cc: Bernhard Reutner-Fischer --- Compared to v1 this patch doesn't modify TARGET_ARCH as requested by Bernhard test/math/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/math/Makefile.in b/test/math/Makefile.in index b495c0b..89bc926 100644 --- a/test/math/Makefile.in +++ b/test/math/Makefile.in @@ -31,12 +31,12 @@ PERL := /usr/bin/perl MDEPS := $(wildcard test-*.c) $(MDEPS): libm-test.c -TARGET_ULP := $(if $(wildcard libm-test-ulps-$(TARGET_ARCH)),$(TARGET_ARCH),generic) ULP_SUFFIX := ifeq ($(TARGET_ARCH),mips) ULP_SUFFIX:=$(if $(CONFIG_MIPS_ISA_MIPS64R1)$(CONFIG_MIPS_ISA_MIPS64R2),64,32) endif -TARGET_ULP:=$(TARGET_ULP)$(ULP_SUFFIX) + +TARGET_ULP := $(if $(wildcard libm-test-ulps-$(TARGET_ARCH)$(ULP_SUFFIX)),$(TARGET_ARCH)$(ULP_SUFFIX),generic) libm-test.c: libm-test-ulps-$(TARGET_ULP) libm-test.inc gen-libm-test.pl $(Q)$(PERL) ./gen-libm-test.pl -u libm-test-ulps-$(TARGET_ULP) ./libm-test.inc -o "." 2>&1 > /dev/null