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: 138052 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp924821lji; Fri, 8 Jun 2018 07:12:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKImoV4Fe/uAYsOp5KK9AwHVjkUQhY7FLeTnYCdcoYhkenkcMkhz+CiqGCiqTyEC0aTAJN3m X-Received: by 2002:ae9:c105:: with SMTP id z5-v6mr5342759qki.320.1528467145541; Fri, 08 Jun 2018 07:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528467145; cv=none; d=google.com; s=arc-20160816; b=qYGE78lUkq7mn/Qbit0d8VH093FmdmPnArHXdtqSKTmxETgSyIEzPUSqDcsWrcaNLr 4O6AUk3HH9otee+efC44+6b22cQKC8MYOgxqe1HwTNlNzLF8PQ4/hx6shzixIsslTUtL 7jCROmci8gTU7JdNaUm9KdCksV39upt5VWyAdSaIaH263qSLolH4afvvxp6XRaK5nWht aHu2A4yd/UKfI1P5fNv4hi6zkAFUM1MwFmffpD4mwlajzcqwcyqyhbzR2/Qrw/3k6HSU tIPYITnonKx+YTfyGAjhErTCenmHLFMC9yYrcZxfLE6a1CsqUpoXK7V+tR3V8LjJDSI0 OVMA== 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=GJmbI+0cUdWKHmkWS3FIRBZE4wWpO6u7Uvaj01Fk6Rc=; b=BVIM6hFjOk5/MqEIB0C77VuFwmQoio2yPA6FLwVCjTPM2F1X/qNxBddMp1yi9sYJ/Y vY72/O4ygL1D1PH4FVQu6uf89Y45T6NPA6CTJ+6pQeNwTf69rrWFQhkvRpwi1ELooZr0 fKUiqHiIBDbh9ZqmzZ/um/Dh20e/ncwYqIBNL1xXCq0JtC/eLv844xLfH+tp5dYUN6ca s3saDQpe1Hie1d+L/N70rk1HBfj2YqcvSGu/tnLt+SY1Ew59VLet7ChhRDEwDhemSflq FKK7dmWFKUUIyUVdvxf8GybptgjfDtYZq3s7dPX4NML9UC1VKog6sAjLrk/DOda95/To RyBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UpRg9kE9; 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 l26-v6si1712331qtc.280.2018.06.08.07.12.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 07:12:25 -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=UpRg9kE9; 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]:35951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRI7s-0007qi-W7 for patch@linaro.org; Fri, 08 Jun 2018 10:12:25 -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-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+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.1 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)