From patchwork Tue Jun 19 15:44:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139212 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5409830lji; Tue, 19 Jun 2018 09:24:39 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLfL4bQ1iDhUS0wBVi8W4shnjjQuVvlsiLcpv2JNquDxlZsdas8CkXApaoyDclJ8/qAGOCZ X-Received: by 2002:ae9:efd8:: with SMTP id d207-v6mr13574657qkg.191.1529425479574; Tue, 19 Jun 2018 09:24:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529425479; cv=none; d=google.com; s=arc-20160816; b=kLvJps0O1MHFdDMDlh1zeEK8LGKb4pVCuzllze4UcLTp8R2Hrp0ZWD2tTByLrFQ5nS EOXOT4Izs+NonnMBE2AmJaxLT+X1sWpztjBQsnnXB7QE5O/PNAmqGRMH2GLwJCNtT31I fjiBm/ei5+1xVyRzgFT+gQ9pjLQT9UfqhP7jXm/0Uu3H0r2UvJkZjXu29VYp2qm6wdyw IJs7XzfjWGtpb1s7RHDGegaVTOxLErccXq0+ZxxaWsNYq3dT6ie1XncUAU+FTRwrUuJ+ dgI7apxpTLgGHsD6dfCQpwG3Il/P+RGEz3J/W6361VFTEFAA9v48mAOCalMTD8s+wqTv A/7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=m/iFfQYQo9T3IrAZZ9yOvMXVE8M4+kxH/inoLofQGG4=; b=NXvE9bwCYOL6tVIAvcS2Aa/D6IqnWrpuG4xM0bz3K5KsEZeNDKaLojc9Pb4Z3JG1Bp GwEsgtxCPe8Z92BPewDsX+RtjX4DTZvCZnigzQvBidVV387zsbaIyQ5zSxhdcxgDeSsa +I8dFrudeiLE2kQSDPDSNvwrZXU2aJMCfpx61NttX4+u3cdD4S1r8L/J7y0Y8xmA4sha mbvo4K4SBxhh7SU88MrAO3Tv1dFwTfGc8hHrmDmXV4kGJ3Wcva2hJ/xO2B5MjKAPEeh1 YNnRDC2ja0xDliQH+RUXwxr/oJcns3vsW1Fbfw8LtcF7Xiqpv0GQez6zmwn3Xzu0xr5N ozvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PJov64Tu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u7-v6si91683qvm.118.2018.06.19.09.24.39 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:24:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PJov64Tu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJQs-0005k9-Uv for patch@linaro.org; Tue, 19 Jun 2018 12:24:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ4s-0004YZ-JG for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJ4r-0007by-Ed for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:54 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35059) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJ4r-0007bL-8K for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:53 -0400 Received: by mail-wr0-x244.google.com with SMTP id l10-v6so219572wrn.2 for ; Tue, 19 Jun 2018 09:01:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m/iFfQYQo9T3IrAZZ9yOvMXVE8M4+kxH/inoLofQGG4=; b=PJov64TuJr/tcgyBEh1ub28lfho9/waubBpQxIvs5DF2tGlAQLMbHP8uhbBnJBus5X Xq2TpfSdQmIhP6xWkzNOenJ+4T5CngVXhrvckJFTS6VRaJ/smBud5toYRLSR7sX0Wih3 6AZCWWooKbEubMDX8ZCGWFDk86qwryOJoEt2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m/iFfQYQo9T3IrAZZ9yOvMXVE8M4+kxH/inoLofQGG4=; b=mJHdD6Spu3g+/nua7NVjlYT0Db5/oKOg2jLdZx0gzda9D8oiSJ1BlEWkkIbPXVp62n aHqmvTbX4uTqLGsi5X3W8VByeQ9DKiOKnjRlSm3dY8N43wYG6ZRZnEjZIJvS4FsOBR7o Yc54ePzw8Or92vaDoKw57jb+mecjTQ7WNOBKSpxooD1L9S/yPdssVn/7P4nidHpAn2y7 ApXmGPmQPaAmJu4M1iXyAhGJMvIZg1VJiT02UsgeAdSRqG8yxAqp9jWK0vFiCgeYkdj+ 9HZAV2H+yCx6+A2hPxecCM/VCdIMXrVx+QajJ7sJvg0jWEemFqc2K+ajPB9gmghB5F5v eY3A== X-Gm-Message-State: APt69E2hCRMhL8CPVurnpHITl03K4L8UVo+hTsxpwKqy1SYHmdH/2smA 1gLx2i4VaABr7VE9xy9plLRDvw== X-Received: by 2002:adf:b86b:: with SMTP id u40-v6mr14612072wrf.162.1529424112150; Tue, 19 Jun 2018 09:01:52 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s132-v6sm599204wmf.5.2018.06.19.09.01.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:01:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7EBDA3E0D7F; Tue, 19 Jun 2018 16:44:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:13 +0100 Message-Id: <20180619154435.18898-35-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL 34/56] tests/tcg/alpha: add Alpha specific tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These tests did use their own crt.o stub however that is a little stone age so we drop crt.S and just statically link to the cross compilers libraries. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v4 - drop crt.s - drop skipping of threadtest - drop write() hack, include unistd.h v5 - merge fixes -- 2.17.1 diff --git a/tests/tcg/alpha/Makefile b/tests/tcg/alpha/Makefile deleted file mode 100644 index 2b1f03d048..0000000000 --- a/tests/tcg/alpha/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -CROSS=alpha-linux-gnu- -CC=$(CROSS)gcc -AS=$(CROSS)as - -SIM=../../alpha-linux-user/qemu-alpha - -CFLAGS=-O -LINK=$(CC) -o $@ crt.o $< -nostdlib - -TESTS=test-cond test-cmov - -all: hello-alpha $(TESTS) - -hello-alpha: hello-alpha.o crt.o - $(LINK) - -test-cond: test-cond.o crt.o - $(LINK) - -test-cmov.o: test-cond.c - $(CC) -c $(CFLAGS) -DTEST_CMOV -o $@ $< - -test-cmov: test-cmov.o crt.o - $(LINK) - -test-ovf: test-ovf.o crt.o - $(LINK) - -check: $(TESTS) - for f in $(TESTS); do $(SIM) $$f || exit 1; done - -clean: - $(RM) *.o *~ hello-alpha $(TESTS) - -.PHONY: clean all check diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target index bedf1b6444..a585080328 100644 --- a/tests/tcg/alpha/Makefile.target +++ b/tests/tcg/alpha/Makefile.target @@ -2,5 +2,17 @@ # # Alpha specific tweaks +ALPHA_SRC=$(SRC_PATH)/tests/tcg/alpha +VPATH+=$(ALPHA_SRC) + +ALPHA_TESTS=hello-alpha test-cond test-cmov test-ovf +TESTS+=$(ALPHA_TESTS) + +test-cmov: EXTRA_CFLAGS=-DTEST_CMOV +test-cmov: test-cond.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) + +run-test-cmov: test-cmov + # On Alpha Linux only supports 8k pages EXTRA_RUNS+=run-test-mmap-8192 diff --git a/tests/tcg/alpha/crt.s b/tests/tcg/alpha/crt.s deleted file mode 100644 index 31af8825bc..0000000000 --- a/tests/tcg/alpha/crt.s +++ /dev/null @@ -1,26 +0,0 @@ - .text - - .globl _start - .ent _start,0 -_start: - .frame $15,0,$15 - br $29,1f -1: ldgp $29, 0($29) - .prologue 0 - ldq $27,main($29) !literal!1 - jsr $26,($27) - or $0,$0,$16 - .end _start - - .globl _exit -_exit: - lda $0,1 - callsys - - call_pal 0 - - .globl write -write: - lda $0,4 - callsys - ret diff --git a/tests/tcg/alpha/hello-alpha.c b/tests/tcg/alpha/hello-alpha.c index 79892e6522..84e43b2fc4 100644 --- a/tests/tcg/alpha/hello-alpha.c +++ b/tests/tcg/alpha/hello-alpha.c @@ -1,3 +1,5 @@ +#include + int main (void) { write (1, "hello\n", 6); diff --git a/tests/tcg/alpha/test-cond.c b/tests/tcg/alpha/test-cond.c index 74adffaa69..e625313b3e 100644 --- a/tests/tcg/alpha/test-cond.c +++ b/tests/tcg/alpha/test-cond.c @@ -1,3 +1,4 @@ +#include #ifdef TEST_CMOV diff --git a/tests/tcg/alpha/test-ovf.c b/tests/tcg/alpha/test-ovf.c index 01c80e7525..17892f1e89 100644 --- a/tests/tcg/alpha/test-ovf.c +++ b/tests/tcg/alpha/test-ovf.c @@ -1,3 +1,5 @@ +#include + static long test_subqv (long a, long b) { long res;