From patchwork Wed Apr 2 01:12:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Fong X-Patchwork-Id: 336220 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id A4B001400E7 for ; Wed, 2 Apr 2014 12:12:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B2A738A482; Wed, 2 Apr 2014 01:12:52 +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 nl4-U+cTznRc; Wed, 2 Apr 2014 01:12:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DD52C8A18E; Wed, 2 Apr 2014 01:12:51 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 119661C1117 for ; Wed, 2 Apr 2014 01:12:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0D5498BC83 for ; Wed, 2 Apr 2014 01:12:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lWFkK4iISy6w for ; Wed, 2 Apr 2014 01:12:49 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qc0-f178.google.com (mail-qc0-f178.google.com [209.85.216.178]) by whitealder.osuosl.org (Postfix) with ESMTPS id 1BC948BC7E for ; Wed, 2 Apr 2014 01:12:49 +0000 (UTC) Received: by mail-qc0-f178.google.com with SMTP id i8so11766781qcq.9 for ; Tue, 01 Apr 2014 18:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9TqkRvGdLecws+TCKGEEhy0WDcqJ87HTeeeiPRYzWp0=; b=HCc2oExJIw2nBpHsWdtOYzBvUWFBCWlYxjwtm9njofI7PzKuIGruH3gtk7cjLBIPYQ HVKsgCyIKzoqkWHfmPofbpybfwfLigfDohpUwVY6ihdRVwnS6YKjWiGBfiGd3Z/s5gTG 9tl2Sk5Y+VnnaG64SMCG/Uhht/wCRZ3QkuDd2nBY/5OSM2OmaWCyrtZtJSb3yqrYbJTJ i6XN79oe5VDn/cDbche1swSoSH407bq5CblWY4RzxrYt9KMZaAu1rf06mj6LmI3UVz9V bJ5qpbNEnsyU4bALL0MgwTXDosjE3SOSKu/W2OvFCeCL2mpBoDNgFmeHi7m5QPdu8t4J tdYg== X-Received: by 10.140.96.182 with SMTP id k51mr17747320qge.60.1396401168329; Tue, 01 Apr 2014 18:12:48 -0700 (PDT) Received: from gregory-irv-00.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id z96sm531692qge.10.2014.04.01.18.12.47 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 01 Apr 2014 18:12:47 -0700 (PDT) From: Gregory Fong To: uclibc@uclibc.org Subject: [PATCH 2/3] test/math: Select correct ULPs for mips32/mips64 Date: Tue, 1 Apr 2014 18:12:13 -0700 Message-Id: <1396401134-21858-2-git-send-email-gregory.0xf0@gmail.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1396401134-21858-1-git-send-email-gregory.0xf0@gmail.com> References: <1396401134-21858-1-git-send-email-gregory.0xf0@gmail.com> 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 Using TARGET_ARCH isn't sufficient when ISA can differ. Add variable TEST_ARCH for selecting the correct ULPs file for mips32 and mips64. Signed-off-by: Gregory Fong --- This is a bit clunky, anyone know how to better handle this? test/math/Makefile.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/math/Makefile.in b/test/math/Makefile.in index 0285b66..ed0a0d6 100644 --- a/test/math/Makefile.in +++ b/test/math/Makefile.in @@ -28,7 +28,17 @@ PERL := /usr/bin/perl MDEPS := $(wildcard test-*.c) $(MDEPS): libm-test.c -libm-test.c: libm-test-ulps-$(TARGET_ARCH) libm-test.inc gen-libm-test.pl - $(Q)$(PERL) ./gen-libm-test.pl -u libm-test-ulps-$(TARGET_ARCH) ./libm-test.inc -o "." 2>&1 > /dev/null +ifeq ($(TARGET_ARCH),mips) +ifneq ($(CONFIG_MIPS_ISA_MIPS64R1)$(CONFIG_MIPS_ISA_MIPS64R2),) +TEST_ARCH := mips64 +else +TEST_ARCH := mips32 +endif +else # ($(TARGET_ARCH),mips) +TEST_ARCH := $(TARGET_ARCH) +endif + +libm-test.c: libm-test-ulps-$(TEST_ARCH) libm-test.inc gen-libm-test.pl + $(Q)$(PERL) ./gen-libm-test.pl -u libm-test-ulps-$(TEST_ARCH) ./libm-test.inc -o "." 2>&1 > /dev/null EXTRA_CLEAN := libm-test.c libm-test-ulps.h