From patchwork Wed Jul 30 08:53:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Brodkin X-Patchwork-Id: 374701 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6B5851401A8 for ; Wed, 30 Jul 2014 18:53:21 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1E6CF31C28; Wed, 30 Jul 2014 08:53:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6Se0RG6om8CB; Wed, 30 Jul 2014 08:53:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 03137321D9; Wed, 30 Jul 2014 08:53:19 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 15BD11BF985 for ; Wed, 30 Jul 2014 08:53:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 106FB321D9 for ; Wed, 30 Jul 2014 08:53:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6CNbpRnUF+lZ for ; Wed, 30 Jul 2014 08:53:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (smtprelay2.synopsys.com [198.182.60.111]) by silver.osuosl.org (Postfix) with ESMTPS id 2124531C28 for ; Wed, 30 Jul 2014 08:53:14 +0000 (UTC) Received: from us02secmta1.synopsys.com (us02secmta1.synopsys.com [10.12.235.96]) by smtprelay.synopsys.com (Postfix) with ESMTP id 75BB110C0AC8; Wed, 30 Jul 2014 01:53:11 -0700 (PDT) Received: from us02secmta1.internal.synopsys.com (us02secmta1.internal.synopsys.com [127.0.0.1]) by us02secmta1.internal.synopsys.com (Service) with ESMTP id 6959E4E213; Wed, 30 Jul 2014 01:53:11 -0700 (PDT) Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by us02secmta1.internal.synopsys.com (Service) with ESMTP id 447444E202; Wed, 30 Jul 2014 01:53:11 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 3666DEE6; Wed, 30 Jul 2014 01:53:11 -0700 (PDT) Received: from abrodkin-8560l.internal.synopsys.com (abrodkin-8560l.internal.synopsys.com [10.121.8.76]) by mailhost.synopsys.com (Postfix) with ESMTP id 7C677EDE; Wed, 30 Jul 2014 01:53:09 -0700 (PDT) From: Alexey Brodkin To: uclibc@uclibc.org Subject: [PATCH] test/math: fix for MIPS that takes 32/64 suffix into account Date: Wed, 30 Jul 2014 12:53:01 +0400 Message-Id: <1406710381-7723-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 Solution is simple - just modify TARGET_ARCH so it includes suffix already. Signed-off-by: Alexey Brodkin Cc: Waldemar Brodkorb Cc: Vineet Gupta Cc: Anton Kolesov Cc: Bernhard Reutner-Fischer --- test/math/Makefile.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/math/Makefile.in b/test/math/Makefile.in index b495c0b..b48916c 100644 --- a/test/math/Makefile.in +++ b/test/math/Makefile.in @@ -31,12 +31,11 @@ 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) +TARGET_ARCH := $(TARGET_ARCH)$(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)),$(TARGET_ARCH),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