From patchwork Fri Jun 7 09:05:28 2019 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: 166104 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp415177ili; Fri, 7 Jun 2019 02:49:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqxtEq6S9Fl9NFnEoWEfhVh6umTI5j8SH50m+RhgZ16tK41hVBhnhhmstSIKNQPmHulVurXo X-Received: by 2002:ac8:2c6a:: with SMTP id e39mr46235743qta.179.1559900962862; Fri, 07 Jun 2019 02:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559900962; cv=none; d=google.com; s=arc-20160816; b=QxpXpW9sb47NOvDo/eNwlUZcOWKeYeKAa1hJr9mhdjk0Tqb8P7HZrV0GCcr5bwmZwp aQVRD+dnASFQYHh0dxPUTaPRBeE3U9ZXb0wkHa9Z+mfwamdlEM3w67pok+nL21ARPoqh lvB/VknkZ4VypG14hPRWmWkzwyVCvMrhqw0ofvaaEKY/omvy4G09I0nhtaY5oi8nYbO2 Tqs+1LpXeIvByGfC5X36xUTAgrPb7LVnLcP438CTC7CH+S+V2tyKLi0Fh6U0Dh0QqiY9 sepe2hvzQMogrCh34PdjCESbIExAgOfqrUNCFz8WxY8DsEHzQo55rbp1ShaBzYUKM81G qkcw== 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; bh=2ORtsrdcOtlazSV007+SAu/zrWhHGlOaKswTJZUeVrI=; b=tA0Ez3sgzS1GmLJfOLuNFC5LpFXdeqD6X68rgQHHWo+IHLr1ij591yYotXrdNwhdtp 6oFK5ZBcpE0YMpyEl1NyGL1ogJn2a3O2qZE3IjxDH15kBr3bIyqHawojXhGZwsAQe1jZ Fzx27Irpvb9kOppymEPMt1qlHTqYVYHndDkJ8WYXgaMjB8Nz5QGCM0PFyrrqpxePmkfD GYdnatj6LrLJ+LlnkFQund+eEeNhpAowoCehe83GErp3g+WthKJxv9Sky8P0U+uMf8io cIhcjusdk/FEwaLpgboQYOzmK18iES0vLFYcnQ/XDDfDbLLwFoaMtjzpZhlL3M882IYq 98CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pME6FuNH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.47 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. [209.51.188.47]) by mx.google.com with ESMTPS id m13si869831qkk.222.2019.06.07.02.49.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Jun 2019 02:49:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.47 as permitted sender) client-ip=209.51.188.47; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=pME6FuNH; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.47 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]:47636 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZBUw-0005pu-El for patch@linaro.org; Fri, 07 Jun 2019 05:49:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42101) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZAvQ-0002Bt-7S for qemu-devel@nongnu.org; Fri, 07 Jun 2019 05:12:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZAvK-0004lL-6K for qemu-devel@nongnu.org; Fri, 07 Jun 2019 05:12:37 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:43834) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hZAvI-0004ef-3m for qemu-devel@nongnu.org; Fri, 07 Jun 2019 05:12:32 -0400 Received: by mail-wr1-x441.google.com with SMTP id r18so1351378wrm.10 for ; Fri, 07 Jun 2019 02:12:30 -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=2ORtsrdcOtlazSV007+SAu/zrWhHGlOaKswTJZUeVrI=; b=pME6FuNHoGE2J2PTCtiwuV1NhW5fxi1kNlW/LBAi2EuD5xjL1kvNapVP738Cmx1Jqr k90bEBqlKktqp35L7KhxZX/kH+QwgubJK9ZUovIDnzJ4w4PHcPjCGENE3eaNXMC7B6rt jr9aDyjMCXfa7NyLBiQN333Et0uyLjmVtnMOMOju5pBiqHVmfLnR+LKxZIOh6TFnaXSc kY0SJhRTl/FamMUOQuHTNArILU/znaClY4yUqNkpxofoFm4/Bm4jaWuKuzQ9CEVDNGKS +UYQmNxal+J1srgTYlRXprygl23dtosZso8lNcHbIW7iSooLDPwlE/K4WLljACzj7LAT +MYA== 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=2ORtsrdcOtlazSV007+SAu/zrWhHGlOaKswTJZUeVrI=; b=YLwWqsgoHAAG0shDpPfBwHfDRNsbyXp8/kQFNq8sGkZWRSJ0cZ+EMmpDfcuTymiL5N R63gFO4Jo3V9AI5psMy6oehmDafIWIJuxgh4PeE5wmUIMtNNuR+Z/t/XsWIGtXNLRTJn OJc5I9gkKhkWzC4Ol6vblKqC+VSL9skydrCO0AUlxLPrsBlMNXAjHDtK8grXjuG/QgoZ 4uVKkkA47lizmoH+rpQt4PTnGGI10EgGT9QZYizZtPz84m1PVRUoG3bUJAQkHEID5+0e sEvHngQvEhSPh6WalkREEQBCbgiIZOkWXkzRF48GjFkANNXG58/48rxfmmp5zGybVSMd 9zEw== X-Gm-Message-State: APjAAAXNQQFJ/ExbeBobhnZiLJy71VWpr0x6ZKZOIQcIwikcCSxKBmeS o/KmVvj0Evog9L4h+wdmNpoi4g== X-Received: by 2002:a5d:4a0b:: with SMTP id m11mr23256095wrq.251.1559898749728; Fri, 07 Jun 2019 02:12:29 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g5sm1694727wrp.29.2019.06.07.02.12.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 07 Jun 2019 02:12:27 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 57ACB1FFB4; Fri, 7 Jun 2019 10:05:54 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Fri, 7 Jun 2019 10:05:28 +0100 Message-Id: <20190607090552.12434-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190607090552.12434-1-alex.bennee@linaro.org> References: <20190607090552.12434-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:4864:20::441 Subject: [Qemu-devel] [PULL 29/52] tests/tcg: clean-up VPATH/TESTS for i386 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" Since we only run build the multiarch tests and we use a fully resolved path for the crt object we don't need the wildcard or VPATH messing about. Signed-off-by: Alex Bennée -- 2.20.1 diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target index e1f98177aa..e1d880f9b5 100644 --- a/tests/tcg/i386/Makefile.softmmu-target +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -8,15 +8,10 @@ I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system -# Set search path for all sources -VPATH+=$(I386_SYSTEM_SRC) # These objects provide the basic boot code and helper functions for all tests CRT_OBJS=boot.o -X86_TEST_SRCS=$(wildcard $(I386_SYSTEM_SRC)/*.c) -X86_TESTS = $(patsubst $(I386_SYSTEM_SRC)/%.c, %, $(X86_TEST_SRCS)) - ifeq ($(TARGET_X86_64), y) CRT_PATH=$(X64_SYSTEM_SRC) LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld @@ -26,12 +21,12 @@ CRT_PATH=$(I386_SYSTEM_SRC) CFLAGS+=-m32 LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 -# FIXME: move to common once x86_64 is bootstrapped -TESTS+=$(X86_TESTS) $(MULTIARCH_TESTS) endif CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc +TESTS+=$(MULTIARCH_TESTS) + # building head blobs .PRECIOUS: $(CRT_OBJS)