From patchwork Fri Jun 15 19:46:30 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: 138796 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1278635lji; Fri, 15 Jun 2018 13:21:19 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJXBJ4bK1qtbuBB+p6DYcbRLIjH37Hl3SVo2KcYM4KtYlHJzuVunrlaae/8dX/6YbAuVyso X-Received: by 2002:a0c:b116:: with SMTP id q22-v6mr2809956qvc.19.1529094079703; Fri, 15 Jun 2018 13:21:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529094079; cv=none; d=google.com; s=arc-20160816; b=vGy+5wBqSHubwNeUzF57mhTuX9rXTcoldMuYMHEOfme6msZefI89ijII6cUOX8RCFd J9AmiyfMAfPy96S4sDzuuhG7/ZTQp3zJN78aFpzz6mvpeZzgOM4B72K3HozfAmWmnXJ6 E4XhkuRAbFZHs5AlcqnCbkaeng6pPcrp57SzNOBXBg+SWem1evslnjEapNHC7RPh92A+ 1IOyLRBl1Gn79eL70H6lBcLWmk2o+CcjZeuiDHRTUp77Ai7HDpn9GdRCiR5t9vn5ilkI tkZtrmjdDAsimtX33qcleT/XJuGanfEGohS1ST73TgHqg7+WqYa7HZiY/rpFQi0y0iYX s8JQ== 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=VzhHK30nduws/7x9c5NaKc0XTZDanmjobaqX31IFN8U=; b=ogcQtKXF1Jn891+41z1NvgDSIilATltqBaR3PXgSepilRbzq17I2n+90ajnYO8GgQD 8DSW+5+ZVQQfL+Mw4mGKgG4vIzCrZKE6A+0dZl1hVQZbx1CapXJgookG2c+inRa9Z6MA SuI5k2PohZKfgZxkR0xLA0kYRUBpBJp8tZR0mTThKCVEEp61AkLLs7L69KZKYC2MSFhv NlczgD22mj6YcyAxGiZre7YuoZOA2DT+hqfc0Hg/Bwr4bttYL8SFM1OIYVt5DAxt+obl 4WGtfYj1Nz0x5VEgxPHq0ciFhBdFPK3CUOdZOCIo0u3zC1W27863XNZrSq0QjlelD/QN C1/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZXXjl+qf; 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 t3-v6si1646912qvl.124.2018.06.15.13.21.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:21:19 -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=ZXXjl+qf; 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]:49166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvDj-0004DY-4S for patch@linaro.org; Fri, 15 Jun 2018 16:21:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuoW-0000WG-Ba for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuoS-0006QV-9D for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:16 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:38949) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuoS-0006P0-2G for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:12 -0400 Received: by mail-wr0-x244.google.com with SMTP id w7-v6so10981487wrn.6 for ; Fri, 15 Jun 2018 12:55:11 -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=VzhHK30nduws/7x9c5NaKc0XTZDanmjobaqX31IFN8U=; b=ZXXjl+qfkKR5udc1lGIaqW9e30GxJyjQyhZ0nF0D8zJXo+XchjNWZqnAWXRkOFM+Dw gBiy+h3fdhUpjZGhF7fhILHcghmGGgSxo1NMR8KCUlzO8L2SHhXG6P7IqRjirkZ7QzdL wrgh1dpU67Os5vYe0X1ZSgXRkfebA2hsgEmMk= 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=VzhHK30nduws/7x9c5NaKc0XTZDanmjobaqX31IFN8U=; b=d7f6njSH+7e1hsLbmVzKpwb42DUt2923J3f5YBSTUD14YaRyzAyYb/hM8DdOC1QAGr tCl8YnEwFnjnfaEx2ZcmR/8Yli+4JF7raXKfpq6bAUeTFkyB9FKwztUx8oHsVw9gAFqv i9sv/SXuMttEhSji5UjpTpDcop2pSzQOtYOo/09wo3JqIhhILosyypsHb3/mJ9Vsd2p1 zO+rtLbWkMUScjh4WehGc3hGb0AxiH+n1FRcgv6npMhOMPRclPiyKqSQ90jBc4AQgOwk 12bKfSqtuNSe62aBc79KQcwazLOBuq3ldMPuuiIWfVu2emXzmdQjB1f5PTlXsQkvYsqC UiFg== X-Gm-Message-State: APt69E1nWqED/Db898ItQrcAAopA0oWZ0IxMAnUxAaMb5WvgzaIlJESq RVC0MwBS0ABN//w8IhYkIIUlPw== X-Received: by 2002:adf:c546:: with SMTP id s6-v6mr2938305wrf.46.1529092510885; Fri, 15 Jun 2018 12:55:10 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x5-v6sm9695623wrr.3.2018.06.15.12.55.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:55:10 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 081083E0BC6; Fri, 15 Jun 2018 20:47:07 +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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:30 +0100 Message-Id: <20180615194705.28019-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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] [PATCH v7 19/54] 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.1 diff --git a/MAINTAINERS b/MAINTAINERS index ea298cc910..57c828644f 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)