From patchwork Fri May 25 14:18:56 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: 136901 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp3654037lji; Fri, 25 May 2018 07:19:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJc9nAam/oc5avIiAET2zjhLZc8Webd/OZuyzHQQmx+5VK4JdDIKmxrAbTQ/waYdwSwhXi2 X-Received: by 2002:ac8:5390:: with SMTP id x16-v6mr2242845qtp.81.1527257982550; Fri, 25 May 2018 07:19:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527257982; cv=none; d=google.com; s=arc-20160816; b=ZJLvUrcOGhItlLlku7EpRD4rWg3a1x1b44hbZsiCxXCtiBTgdFWXBMRfhXYQYLg7/c u+Yq/2OQPHhb5SH7rAnKP1K71FqBD9R0qYL8v1fJQ5E6TXdRlKkIcA7saytQrCblsVjF Avefz+810KiVyJSHoYh76aXJV1WjF8DYQ8a4EuMUwIZBX34sv2zTHOpKzEVzZRJQGsl7 b/q6ABx7SNR5K1a1XtSqsSquGHzO1/Y3e2BVfChmSyWOtiIQdjxfHxcU9oOUgDwFu+UZ ZKmDLeCQMjC/CZeYAYsFhhIN40X/23k9O1lF69fzRJO4vqIEudgDhhL2AqPji8bbXXqn 5iWA== 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=y6r9WYKaEaRjeDqHWCRQN+yElCmsJQkAngL9Hf2LX+I=; b=UCMrx53ksd0Eg2RDjpU+gS7bi0+5rP77VqBwcywwB6Ai/B2US7WBSH9LE8wmi2+N9J KGq9mMWFFYV7wIU3usl/JPZpDM1PhZFcKRzY7yAkgZdS11RtfMJyfnwvfADIhjsAIEBL pPZc5TmWOPvFoSnLVY/SNl7QTFneA3CoEN4gyXgzqtN5VBRrAm3+GxKIZ7P7Dxgv/Seq YomaiSNUYdEk8Ba4clztsTf+ERx3BgjBJyKD+zVgk5Na6X+IeZT6nZZpG6LFvDWgalA8 uC0Qot64IA2X6yeHbGKpjJXHfPu6W2jbTLEK2kiqPeSHdkntowd8QjQNUoOxjzL/EIxk /6Sw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=hse4I5va; 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 a16-v6si8668435qvj.236.2018.05.25.07.19.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 25 May 2018 07:19:42 -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=hse4I5va; 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]:44288 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMDZF-0000pT-Vy for patch@linaro.org; Fri, 25 May 2018 10:19:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMDYl-0000nq-6j for qemu-devel@nongnu.org; Fri, 25 May 2018 10:19:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMDYh-0000GQ-67 for qemu-devel@nongnu.org; Fri, 25 May 2018 10:19:11 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:39005) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMDYg-0000Fw-Va for qemu-devel@nongnu.org; Fri, 25 May 2018 10:19:07 -0400 Received: by mail-wm0-x243.google.com with SMTP id f8-v6so15092625wmc.4 for ; Fri, 25 May 2018 07:19:06 -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=y6r9WYKaEaRjeDqHWCRQN+yElCmsJQkAngL9Hf2LX+I=; b=hse4I5vaG49rhVQBaEiLhv3YTlc4zmg2snC2ZM06rhJlqpJmcMqMWZgmoBM9DkdCx1 6hElNvCJbOjNZ2IpgtCKC8RBfD6cXS0VwOWReJNKgniNLS58AI67kT4x8tWH83J53/b3 Oc7dzr6rxPUiVnY5ZiepcKNuFg62hiBUyjuEs= 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=y6r9WYKaEaRjeDqHWCRQN+yElCmsJQkAngL9Hf2LX+I=; b=jeCwcj7Sjp0J5kxYaGDdc+BIJ/6lEMr7+NKPefRbufsdHgbJcIdNFpI8KE3Kkgov5z FxM9zL8wJAAG3kWSUbO+Ibe75sY9DoN39c4aKzH+/9LSv/776kq0HqLo5LnPHVkTzOZS rE3KsrSlLaTDvbOD957KJj47Z5pl+jxMTkuGPoSVkqCn69wZ4vYWpk14IK/2gfOLbBIA 2q2TIm5a+5p76WiMaeD+FpHL2dFvk06krgqy1aBOJz5inBrOPKb2/pG9a2Ow7lflKG31 GXW9kuaFZ3TzuzUDC5INJbUVpn5W3HJl3HUTAuVJtw4moxgEPzMdwu5WiWaE9A4YPD73 L+6w== X-Gm-Message-State: ALKqPwf0Pvg91sQjO/Nig8GQ0PwP8/f1rytQ2ygJFPlqzc/hbFX5+Xlf YGL4UzFqRjquPrqxDSdUv6kMjQ== X-Received: by 2002:a1c:8e47:: with SMTP id q68-v6mr2132928wmd.104.1527257945846; Fri, 25 May 2018 07:19:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c18-v6sm8502992wrq.17.2018.05.25.07.19.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 May 2018 07:19:04 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CD6BB3E025C; Fri, 25 May 2018 15:19:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Fri, 25 May 2018 15:18:56 +0100 Message-Id: <20180525141903.6257-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180525133851.27161-1-alex.bennee@linaro.org> References: <20180525133851.27161-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:c09::243 Subject: [Qemu-devel] [PATCH v5 22/49] tests/tcg/x86_64: add Makefile.target 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: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The sources for x86_64 are shared in the i386 directory which will be included thanks to TARGET_BASE_ARCH. However not all sources build so we need to filter out the ones we can't build in the 64 bit world and those that can't be built for 32 bit. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v4 - update MAINTAINERS v5 - merge with disable i386 version of test-i386-ssse --- MAINTAINERS | 1 + tests/tcg/i386/Makefile.target | 4 ++-- tests/tcg/x86_64/Makefile.target | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 tests/tcg/x86_64/Makefile.target -- 2.17.0 diff --git a/MAINTAINERS b/MAINTAINERS index d5bcedfe1a..366f1c3694 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -284,6 +284,7 @@ M: Eduardo Habkost S: Maintained F: target/i386/ F: tests/tcg/i386/ +F: tests/tcg/x86_64/ F: hw/i386/ F: disas/i386.c T: git git://github.com/ehabkost/qemu.git x86-next diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 937d4de7f5..d5c6f32b93 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -7,9 +7,9 @@ VPATH += $(I386_SRC) I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c)) I386_TESTS=$(I386_SRCS:.c=) - +I386_ONLY_TESTS=$(filter-out test-i386-ssse3, $(I386_TESTS)) # Update TESTS -TESTS+=$(I386_TESTS) +TESTS+=$(I386_ONLY_TESTS) ifneq ($(TARGET_NAME),x86_64) CFLAGS+=-m32 diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target new file mode 100644 index 0000000000..74f170b9ed --- /dev/null +++ b/tests/tcg/x86_64/Makefile.target @@ -0,0 +1,15 @@ +# -*- Mode: makefile -*- +# +# x86_64 tests - included from tests/tcg/Makefile.target +# +# Currently we only build test-x86_64 and test-i386-ssse3 from +# $(SRC)/tests/tcg/i386/ +# + +X86_64_TESTS=$(filter-out $(I386_ONLY_TESTS), $(TESTS)) +X86_64_TESTS+=test-x86_64 +TESTS:=$(X86_64_TESTS) + +test-x86_64: LDFLAGS+=-lm -lc +test-x86_64: test-i386.c test-i386.h test-i386-shift.h test-i386-muldiv.h + $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)