From patchwork Thu Jun 21 06:25:28 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: 139504 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1718030lji; Thu, 21 Jun 2018 00:23:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKL6tHrI7pWs1TlFzZy3TzNNOAEWxKjzn7XRNdDuzluT+SWeINsuT1aXrqLJFtD8xc2wQY4+ X-Received: by 2002:a37:106a:: with SMTP id a103-v6mr4665654qkh.117.1529565780345; Thu, 21 Jun 2018 00:23:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529565780; cv=none; d=google.com; s=arc-20160816; b=UVa6DYbM1KuZCiLv04uFON0B/4EaCH3NIPRy7//GwaDzUWPouETC+oOHRJxOFY+Ban z2hSQKShglC9LUEUkTsgktGtsbLFZNvg5NLfUn3mSK/+3JuNtCb5soVXIyh4Xal+2kV5 SXWREXbTH7NaNnEfud5xPVqkf3Sva3zCWelaaB39O4wMo/N8rMe+CZzCDd6lNzjc9xcK wo+vUCmk+3h/Il9X+F4dKZzzrQ5fUsdg9CX9wy66hejULf8uVj9M+nh5+tGu8DkUXb31 uJ+dzOG/ap58GzX66ptIjbAMUrBLB1COu00tOJVZK1O7Q8wapk2BP6NDjieVQpfiw1Dt 4HSw== 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=T7FtWFgAFI0p+zca0z3pYTMJQ35FCcGWJx4KJgKVp+M=; b=lr3l4OTnXCXx0k62mnteTrslXZrF678uBT+d5ISfED+maaJcCESmJ5CBmmcSXf1oJC vKX51qBGT1hwELxxuMU8pPvqlyxxUkUG4SCMqdB1GMU24E5luunw9hMxPHlqE94SWktF ZJ3H4gNOjwS2kXgFlxFRD/WP1ZiM6nYzZJZKZRoZQ76IhjXHjlU0g9VTau54yemhqj6L TY/FwA+x/aTgHEt9G0rvHeAdBSNe8ppqFz2HLvzuLqbU+mUOIOZ3tx+yI6xf7D4Bl3/L W2Rrf8AKs4CUhHMUwIfi6heI41lEauxMv7asOraEhAyGxK8rWf7g4fVSKQgLMu80x6qI H4ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=AK0V1HiP; 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 e7-v6si278139qkf.217.2018.06.21.00.23.00 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jun 2018 00:23:00 -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=AK0V1HiP; 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]:53565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtvn-0002iA-Nj for patch@linaro.org; Thu, 21 Jun 2018 03:22:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVtIH-00055m-14 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:42:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVtIE-0003Sh-GH for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:42:09 -0400 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]:40582) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVtIE-0003Rw-9v for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:42:06 -0400 Received: by mail-wm0-x22b.google.com with SMTP id n5-v6so3643687wmc.5 for ; Wed, 20 Jun 2018 23:42: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=T7FtWFgAFI0p+zca0z3pYTMJQ35FCcGWJx4KJgKVp+M=; b=AK0V1HiPInYTJ6u4bltnBp9qusAA/aOiLzupEMQ+3RRUQ/TXgMqraUdwtCqT0h142K aVPxhvBXnHflbKz5fcyiiDiMXTyYhJA1bdGtQTmFAbuRYI7UYwqc1+MAEYkPvsfwLtC+ ywcOqb/cA/w9w0osEMJtp48YCWprbU110+8VQ= 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=T7FtWFgAFI0p+zca0z3pYTMJQ35FCcGWJx4KJgKVp+M=; b=OnoIo6+BdRVHOmFL++CJkGGxwQ+ZtR93fhnUY1IOF5LxPp/Wimwjz1AnAW8/SVDGMF msqqs0ue0ap7HslOICEMwDEJZPx1EI8z+KKOCQL1JxDy1D/lNPU+qvb1KMeKDrSN+a0i 8ZkX490Up0Bx6cYsr//69T4EowQKeHOc+h3IxR/AjWTQ02dVUUtM+udi1h9tbA+UrAWY vYC7GbH5lJ10169/Z4b73q7+fFmny1GvgMzFhkOracDlUEBcfgnUuLHjzJ1zt0PpBnfI UHoi4WdIIxNq6YxQRbDzzMhhA0Nam9cvkP4/TCwYqVTut165ZtiLr5EiaZKiBzvaGNgY D0nw== X-Gm-Message-State: APt69E2NQPVF5ffxPqk9x7Nu2dHJ3+L7Vx7Th/2zdMd2WSugB3qV4hkr +TjXv4dahLnrDVlMO87hrVZA9g== X-Received: by 2002:a1c:e146:: with SMTP id y67-v6mr3982613wmg.17.1529563325245; Wed, 20 Jun 2018 23:42:05 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l78-v6sm7493431wmb.39.2018.06.20.23.41.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:42:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E9CE03E0BF4; Thu, 21 Jun 2018 07:26:06 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:28 +0100 Message-Id: <20180621062605.941-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-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::22b Subject: [Qemu-devel] [PULL v2 20/57] 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: agraf@suse.de, Eduardo Habkost , =?utf-8?q?Alex_B?= =?utf-8?b?ZW5uw6ll?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, Paolo Bonzini , famz@redhat.com, aurelien@aurel32.net, 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é -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index 590c24377c..096b5bbf61 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 64d241cfdf..cd173363ee 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)