From patchwork Tue Jun 19 15:43:58 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: 139221 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5427383lji; Tue, 19 Jun 2018 09:40:21 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIQf6t03XYY57wBjwQg6y4p31N0Zd7ydpGOMY9ii0XIRAHuaFMSAFoaf+4mqh/DmBRCORQf X-Received: by 2002:a37:2150:: with SMTP id h77-v6mr14949685qkh.424.1529426420966; Tue, 19 Jun 2018 09:40:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529426420; cv=none; d=google.com; s=arc-20160816; b=qAh3G+iIhlbK84sF0hAmVZOR6+vVBSb108Tjum4wSUe6KfE3bcQUhJDllUz3TIWJDG sA+55/7urriREw8nC3Y1Yfg7NXn2vKIJ+nMVuyZxmZb8Nmz6GlEIdaN/RFECr3C009JB OIkeFjQAllaIUHuPZLnoxkdYj/LcpxWZBGrLf7T9/81x+qE822jCFj9/f/BYRf0nqnnt DFO10Mug4GjWVU1Vxq+r3dJM+sJFsrNvvCmU2KhoLvBsCGZuG4DB959S8zHg+wewUMEo 3mSTJ8qRDI4/J7D8w74QacOSsPDhTlvlW0LFfI8U/gPQk+4c+zIbW8i99AgbXsNUvbHh ujfA== 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=sne9Xo1jNejjawySnCbDfbqgOz2Sdg2bMObbr732IZo=; b=t8CIXI/DvPDUwmkmQe24JxBCVbYxYqZ7AOCoeVCkpNZRJC3knZbwfdGTPNwwe7ssBl tnXqbnG17/iucdVGAHUfMy9/iMWhL87KjTbh8KZX0zVrGtFpbmNcgWGP483XNyd3RqR3 Udrn5jccfxy/bnQwH7O4jfxscLGKc/nUsdbOnH0KXC+2MZrnWfivv2UbCr1zWePs/9Rg A2dgDW8QcvbVky7Ua2usLdzk4PmoLrPy6CAwgUYTX/8d8RuMY4m4D1PnvrXtHhLw4Ozv 2HrgvoS0zKnI6gVgoyurCfs/mfVlk4cHXWBKo4TEV9Bn4fYD4wk5rzU0R3cP+9JM4byB dQUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DlQAUsX3; 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 r68-v6si132477qki.213.2018.06.19.09.40.20 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:40:20 -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=DlQAUsX3; 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]:43743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJg4-00012n-Dj for patch@linaro.org; Tue, 19 Jun 2018 12:40:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJ4r-0004Xw-VO for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVJ4m-0007ZT-8Y for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:54 -0400 Received: from mail-wm0-x22f.google.com ([2a00:1450:400c:c09::22f]:39453) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVJ4m-0007Z3-1J for qemu-devel@nongnu.org; Tue, 19 Jun 2018 12:01:48 -0400 Received: by mail-wm0-x22f.google.com with SMTP id p11-v6so1407498wmc.4 for ; Tue, 19 Jun 2018 09:01:47 -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=sne9Xo1jNejjawySnCbDfbqgOz2Sdg2bMObbr732IZo=; b=DlQAUsX3wg3hoOm0eg/vlnvUK5ZEhsCu9l2O7/Bu6zdMxU1V+CGJXsNilCC2nk+S5m Y1TBoRkDsMhvyk7OgAyrE1gMXniRZ5AgWOYM8wwWIIv+C6IDNTmDa/p0EVxQkmPncEjH lQ4/ijo5LNa/1e8kPf2t/CXuMJpg7G49+LwlQ= 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=sne9Xo1jNejjawySnCbDfbqgOz2Sdg2bMObbr732IZo=; b=efVskwtaSxaPX/htheFMpPZRR6yuMznp9SGUjIx96wvhHxSCFByeh/GWPGz+59fhQq B0wPN6I3qu5VvBLkmpZ1sk7Gz85Lsvx3D6e/FVgD6jT2NavAcLZLBk+yw8Bom9Yz1CKH 5VPjdyyzvk7dCOKpIIBu+RXPFCFkqq2RNv/Vm1YMo0Z7LtWkXvU+0FYG59uXL8lsaeYv aA1zAGV06HijbVy7+IMvjIiuu00iH2UJcl7rwE2t0ehKQ3NU08pigrjyeSRxxOHsXQJM +zQPaxpAygf7NbtTOl/WJF9gVYp/gdfM7AJNlOdZMwlojLTMOavxUhsGFlO8zMkF1i/y DsNQ== X-Gm-Message-State: APt69E3oEWw5N7xLdxkWjmexB/sOHv+KwcdYd0OLwXFb91AVYFdb29Df ioa1wDzuVbDb+GioRYiYxfaWAA== X-Received: by 2002:a1c:3fd1:: with SMTP id m200-v6mr13364984wma.88.1529424106827; Tue, 19 Jun 2018 09:01:46 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n7-v6sm39234wrr.39.2018.06.19.09.01.45 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 09:01:45 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 17A853E0BB0; Tue, 19 Jun 2018 16:44:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:43:58 +0100 Message-Id: <20180619154435.18898-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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::22f Subject: [Qemu-devel] [PULL 19/56] 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é --- v4 - update MAINTAINERS v5 - merge with disable i386 version of test-i386-ssse -- 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)