From patchwork Fri Jun 8 12:32:36 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: 926837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="UpRg9kE9"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 412PSl6BByz9s1R for ; Sat, 9 Jun 2018 00:10:30 +1000 (AEST) Received: from localhost ([::1]:35931 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRI5y-0005Ug-UO for incoming@patchwork.ozlabs.org; Fri, 08 Jun 2018 10:10:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGpU-0005x2-4N for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:49:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGpT-0006kt-2o for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:49:20 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:45017) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGpS-0006kO-SP for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:49:19 -0400 Received: by mail-wr0-x22f.google.com with SMTP id x4-v6so5138568wro.11 for ; Fri, 08 Jun 2018 05:49:18 -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=GJmbI+0cUdWKHmkWS3FIRBZE4wWpO6u7Uvaj01Fk6Rc=; b=UpRg9kE9YVs2NQza2/VlC9yv6SYFMGJK1I36VEH0ctFDWYRwLo7sMUzB3F9lIpn6Dq KLbmmNLnd9sfYgBY+TJBSDOwgFPpCbno3WBN82mAOgS0dnFKJxcJF9msLAxhCrHsSb5O Y+UAyENOb0OWU0NuiHV0uuFd5a96YaUpEDxUc= 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=GJmbI+0cUdWKHmkWS3FIRBZE4wWpO6u7Uvaj01Fk6Rc=; b=dkUltv1UqPicfnNfcm6ZiFJS1F3GeJFMQAwUyuEHN/mmYYllfLvP0qavxiejTtbq09 /IgEjRphF8a9BeQrk8GrsmNXixfZnHxKrcv/YCOBx9s0jBH3t/wvcrUsEHuMGvjz1BWH 3Czzz0vHrEH9N4MjYsg1vgUqMd7GnAuWU1HvZmjIU/LAk1DMkFKUWB2XJ4WzkRndx/ho UBdPrsSBe2TWVFxwulmlPi4cbTxG/6v0Mvp7PsURVNRB8p87Y+j8kQAK/FYrL3Jy5+zv wj80DjcA3ng+fOkD1I6mUCNHSaCMaiS7Gv2MutPzXXJ7PBZTCAdgsb3PXn9XRL/Rph/9 eT3Q== X-Gm-Message-State: APt69E2TJ4qXiJO/4JWA1fhfuYvmTF87FK64t6NcLnH5xrH5TV0Wwsyw rKAne3lYzzcvpEgRyJxd6YgegA== X-Google-Smtp-Source: ADUXVKJcS9Qxyb15EOXcFBVep4reijbGJHNt2ctZaAW1ig/ZAYZwrkhOlEhBKnrVV5Q8jAIhrEgOjg== X-Received: by 2002:adf:ab96:: with SMTP id s22-v6mr5329834wrc.90.1528462157737; Fri, 08 Jun 2018 05:49:17 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g11-v6sm3373521wrr.46.2018.06.08.05.49.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:49:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 903A13E0655; Fri, 8 Jun 2018 13:33:08 +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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:36 +0100 Message-Id: <20180608123307.24773-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-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::22f Subject: [Qemu-devel] [PATCH v6 18/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: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Eduardo Habkost , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 diff --git a/MAINTAINERS b/MAINTAINERS index e795b8186e..1063c4d60f 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)