From patchwork Tue Apr 10 19:39:09 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: 133112 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1643584ljb; Tue, 10 Apr 2018 12:56:14 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/3X0aqdYHuNN0WR+Guz88qJlFasodoGsuKJdlUzI7YvADm925Yczu23ybTk/gdzpbBqMAl X-Received: by 10.55.47.194 with SMTP id v185mr2720511qkh.301.1523390174250; Tue, 10 Apr 2018 12:56:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523390174; cv=none; d=google.com; s=arc-20160816; b=EaLi7ucLkXpZuZg1uFARxIW+8kWfPoITMdsII34zpUn/Jth6w178Oju2LqTFMfR8we ToiWu7rriB1spc5HGOfMUNNYdoWhLAGkYApnLE/VFmnNtNyb8Mx0r+EO+iCNOYtDBKS6 fV9pRogHEGqMqiewsc1INqdqAeAPhQ17NQLEMaRcZzbZF5XDIa3pNo+qZWPepAsfiQnz L06qSm4Jow+nu+1bpGtwuT5io790IZVRpfVdIXv8gkfd69GK9FrhfljBqhwW5SNxnNeL Uq1SOuNwgSMIip2Kwrzng44uSYTIMq572hqkdJrLWZQ/7tM7hLJg1o63wboGOZNlHHRo rBFw== 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=VZHJFI2Z/kEHQnIs5xsn5HSO5K/+tvRWixcGwYN0iX8=; b=R9R9rDcmoI07n8nNL0+MsL+BqXKU6Q8Xqy/oOsnE2wmW/gJ0+M5AuwuIwk6XgmjaQQ xrLgpSuq3er+UGZsT/Ubiv0fGCKftAVj1nffGt1pJ++Ymv0wv5G3QmfJDVSoY7QPA1XK FnQCOeRqUl2KxYCmkmdpJCffZ0m4FSeUtB4+W8eJ4fqpeAkeWrRE5QL3GpiYsv5mJApd 2KA9iCchkxUNS4OZv0sQ3475GaPzR4YpPEaF0ZHTipoIDvKpEZJhZykLs0NJ8xR1NUdf 4snpBm6XsTnIzTHhSBo3i060JFR5aw+paC0IMYvx3+SAiuti9adx3Nd8wmLSuz7S05g9 pvcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=h8198Sdv; 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 m91si4150014qte.151.2018.04.10.12.56.14 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 10 Apr 2018 12:56:14 -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=h8198Sdv; 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]:40134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5zNF-0006Cs-NI for patch@linaro.org; Tue, 10 Apr 2018 15:56:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f5z7C-0000Kw-6j for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f5z7B-0006RV-3K for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:38 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:56055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f5z7A-0006Qi-T7 for qemu-devel@nongnu.org; Tue, 10 Apr 2018 15:39:37 -0400 Received: by mail-wm0-x244.google.com with SMTP id b127so28590110wmf.5 for ; Tue, 10 Apr 2018 12:39:36 -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=VZHJFI2Z/kEHQnIs5xsn5HSO5K/+tvRWixcGwYN0iX8=; b=h8198SdvMoyGn4jzm4baGYZdW0blXusAGqd9Hy+luFxDPEN4OQDbaUnXEMJyV4cpQX eOHWhY4zLJev0kRJqIFD+41dwkF0AyLmspVfWhbxhzjUDOPKTDsX5C/F6qqz7RZSfMQj Qkl8me0pcSycOfloIsLWUQtzEYxPSV2d3+Fio= 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=VZHJFI2Z/kEHQnIs5xsn5HSO5K/+tvRWixcGwYN0iX8=; b=M+OeYVYB4jOWkfaY1AqEQ7CnWyFvbLMFfdeyk6Pzu0vDI6Z5hd/uBUm8c1RmayhsMH bfIIS08W+tl5SYrsXpbwPQ1xlNlH76KIoGanCEnkQr97//Cfh/riEBJg2ixPjD+tFE++ nceJEUuXf1RBml1BRT4DtCIO/xLyAeVjanf+peEznX5Bq4sznZrwOYGKP5zzzNbL5K+4 4r1iNjE+vcuC1ZOV9obKYtWR0GPKE6MhLfWGI+T3pruWpGjb6/nFZkGMe63hRlqyzHPb qIGlKH9GW9qBSekMaurjDo0vKEyi+13oDeZuxeQ/VnDHaPKJB24oxmxSadv5bkyDhcVH 7ovg== X-Gm-Message-State: ALQs6tBq++3flcYpfYbdANWyZx1IwOpLaU8EB2pJTrzbzYLaY7xz55qz j3J3gCr94zbvlCMqYiqrKsY+pg== X-Received: by 10.28.105.19 with SMTP id e19mr558350wmc.3.1523389172861; Tue, 10 Apr 2018 12:39:32 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d28sm2894899wra.37.2018.04.10.12.39.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 12:39:28 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6DBC43E0BBC; Tue, 10 Apr 2018 20:39:20 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 10 Apr 2018 20:39:09 +0100 Message-Id: <20180410193919.28026-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180410193919.28026-1-alex.bennee@linaro.org> References: <20180410193919.28026-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::244 Subject: [Qemu-devel] [PATCH v1 14/24] tests/tcg/i386: fix test-i386 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?= , famz@redhat.com, cota@braap.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The test-i386 test case is a little special as it includes assembler files. Add the additional compile magic to assemble these bits and link them to the final binary. Signed-off-by: Alex Bennée --- tests/tcg/i386/Makefile.target | 19 +++++++++++++++++++ tests/tcg/i386/test-i386.c | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) -- 2.16.2 Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 7dbb7992e7..1df69e0dab 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -8,3 +8,22 @@ ifdef CROSS_CC_GUEST_CFLAGS CFLAGS+=$(CROSS_CC_GUEST_CFLAGS) endif endif + +# +# test-386 includes a couple of additional objects that need to be linked together +# + +TEST_I386_DEPS=test-i386-code16.o test-i386-vm86.o + +# override the default compile and link in one go rule +test-i386.o: test-i386.c + $(CC) $(CFLAGS) -c $< -o $@ + +# and provide a rule to compile .S files +%.o: %.S + $(CC) $(CFLAGS) -c $< -o $@ + +test-i386: LDFLAGS+=-lm -lc +test-i386: test-i386.o $(TEST_I386_DEPS) + $(LD) -melf_i386 $(LDFLAGS) $< $(TEST_I386_DEPS) -o $@ + diff --git a/tests/tcg/i386/test-i386.c b/tests/tcg/i386/test-i386.c index 9599204895..cae6a7773a 100644 --- a/tests/tcg/i386/test-i386.c +++ b/tests/tcg/i386/test-i386.c @@ -17,7 +17,6 @@ * along with this program; if not, see . */ #define _GNU_SOURCE -#include "qemu/compiler.h" #include #include #include