From patchwork Tue Jun 7 09:40:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=FrzbSpfX; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQl25JCZz9sFw for ; Tue, 7 Jun 2022 19:57:34 +1000 (AEST) Received: from localhost ([::1]:55658 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVxs-00080q-Il for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 05:57:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhd-0007sH-Go for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:47237) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhZ-0008NC-C5 for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594839; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LIJcs0zDFOcbc9kvJopi8n/1vIGjhg7JpZGVlXurn6M=; b=FrzbSpfXNKpFRiErGNSyyGsY15xuFR4anuoovGG9gjjeoprzHwF3tp5U8T5kMo/EXSxoj1 2maCQSWFw8daRpaLfbDLFxJrI94KN3u1Zt8UNhLd7CQJnYSDN+TQwPvAwVjz9wUGZLN72v nL9WW4A7f4F1+xR3ZeICUBnjbwHHZ+M= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-358-jeeIrpmCPu2Qs3GmcdIgZQ-1; Tue, 07 Jun 2022 05:40:38 -0400 X-MC-Unique: jeeIrpmCPu2Qs3GmcdIgZQ-1 Received: by mail-wm1-f72.google.com with SMTP id c125-20020a1c3583000000b003978decffedso12530760wma.5 for ; Tue, 07 Jun 2022 02:40:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LIJcs0zDFOcbc9kvJopi8n/1vIGjhg7JpZGVlXurn6M=; b=EmhHq/o0sUkioVaITlGhP175Sr5uG1xQSaRFy+cRzmL+RFB+HXAq5A+niSZD9XebkK tvPiQRaQSNh/t1ejgwsfK4/sz7cxsKyflpeFGPKz9zc7gWYc9rMYNXsIjJtmxHntfN1y JWJSv/WrMOaAI7uckG2iMDM3dqxBca0F0tKucBrvLeAlKFwSH8cPQ3kqgoAhYFWBJAFR jSBdd2vtcn/K8Wblyp+L1AanAqXA7dHwnvHfW5traxkTO/9v3gHXXNEr2wSmMQluRcl9 K009sdZf2xQb11YjCM5EL0dCwlZcNZ0XztbV+rsqczIuxgq6fzRM1DmjE9F+6Um3yd5B mdzg== X-Gm-Message-State: AOAM533syGdagXw4caTlhP//tUo1cI5l37AAdWH5ci38Qpdi5cCebh8T lIx1hjkmLYT2vEjuCMFza4l+Aicr6w7l4fGobvE6m1RO/XCs5SbOW3bMNAFqAA1BNebJ4OfwIRz xCHAc031eAGQqVIfZDuR626OI3N9W0UT/2xujbwGKxEvYpHP0t7splV+gZhbKO/pDVzw= X-Received: by 2002:a5d:55ca:0:b0:211:4092:1c27 with SMTP id i10-20020a5d55ca000000b0021140921c27mr26499363wrw.108.1654594836894; Tue, 07 Jun 2022 02:40:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxKFeShmIe2HAV46bJx/SgZZpyv1aPLzGyIma9cUeRuAmqOdAFZ7bX/QEDctlDl9A3dmFwxg== X-Received: by 2002:a5d:55ca:0:b0:211:4092:1c27 with SMTP id i10-20020a5d55ca000000b0021140921c27mr26499329wrw.108.1654594836505; Tue, 07 Jun 2022 02:40:36 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id z3-20020a05600c0a0300b0039c362311d2sm24344611wmp.9.2022.06.07.02.40.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 1/7] meson: put cross compiler info in a separate section Date: Tue, 7 Jun 2022 11:40:25 +0200 Message-Id: <20220607094031.1227714-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" While at it, remove a dead assignment and simply inline the value of the "target" variable, which is used just once. Signed-off-by: Paolo Bonzini --- meson.build | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 21cd949082..3f38b3ee4f 100644 --- a/meson.build +++ b/meson.build @@ -3740,21 +3740,24 @@ endif summary_info += {'strip binaries': get_option('strip')} summary_info += {'sparse': sparse} summary_info += {'mingw32 support': targetos == 'windows'} +summary(summary_info, bool_yn: true, section: 'Compilation') # snarf the cross-compilation information for tests +summary_info = {} +have_cross = false foreach target: target_dirs tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' if fs.exists(tcg_mak) config_cross_tcg = keyval.load(tcg_mak) - target = config_cross_tcg['TARGET_NAME'] - compiler = '' if 'CC' in config_cross_tcg - summary_info += {target + ' tests': config_cross_tcg['CC']} + summary_info += {config_cross_tcg['TARGET_NAME']: config_cross_tcg['CC']} + have_cross = true endif - endif + endif endforeach - -summary(summary_info, bool_yn: true, section: 'Compilation') +if have_cross + summary(summary_info, bool_yn: true, section: 'Cross compilers') +endif # Targets and accelerators summary_info = {} From patchwork Tue Jun 7 09:40:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639889 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=b/wZGOal; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQXn6tKDz9sFr for ; Tue, 7 Jun 2022 19:48:41 +1000 (AEST) Received: from localhost ([::1]:41510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVpI-0006LX-1D for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 05:48:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhc-0007sF-IE for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48474) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhZ-0008NN-R8 for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2oL83+cB+G3cI7lvVEP5dh5FJdl9cfcx+p0Qcdt39WE=; b=b/wZGOalIbXtxlUN8V0QVWpycCfcOvfmRkDTqDwrzgKYGgkYaKZdRhw4+agYmW7iH9NRSx +IcZ35zv+JT9e7QnA3V0XI+6fzMZjqhhz8NJx4Tq6grCXldWb4WibMI2CpK+cAnijphpCh Kxz9J8c1e/SuhHqHK7M4H7ZPPRoWUpA= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-214-Wtux4bxMMUyRsZ8fekfTxA-1; Tue, 07 Jun 2022 05:40:40 -0400 X-MC-Unique: Wtux4bxMMUyRsZ8fekfTxA-1 Received: by mail-wr1-f71.google.com with SMTP id v4-20020adfebc4000000b002102c69be5eso3685447wrn.13 for ; Tue, 07 Jun 2022 02:40:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2oL83+cB+G3cI7lvVEP5dh5FJdl9cfcx+p0Qcdt39WE=; b=A/Xoofnac3H9nw2hR3SzON5Qvez78FfZ6IT1rb/Jw4RYChRvI00OAJHkFJSZaJqizk OFnPpQbZna55clqLpJJl5PzMarLN01guVBB6LDsbSy9LcXdaveIK6SBpTgg7wi/+c/mb FtAbjCeg95g9IC6m+bem/iVsiA8M2hjqDSil5DIA5ME+4EjyNs8mwW4Ixqb0+obc0c5G oqSZl9+naoQEUYg0uca13U8yJ99fsW4EfBUVKC4EE4Wwe6pUKDbzN38krxpPMqML3ymg MEWCFBI/pOud1amXvkzL5rHF7Kcj5mH2UGK8HlWXgM99WROHmDwoUhMCLi3xQ8pMHZJM 5cIg== X-Gm-Message-State: AOAM5316QmsdeZ+DF9DjIqkGcJsnRlZe8GMfIL7AXtjZNxPzLKrAoQqh 2hIZSQ47oCKcJzaBH97p/O9Bo5P6gCNBN7cNXG3wOzZfIYeStLw5QsDJRSwOBmfKIeA6i6gnVNG rPAc46hcTX0tBQKxMQsCrMWdQp3qclDi68pL9yb7qR/yGL2IgsTpTFarTeIKBEurnafw= X-Received: by 2002:a05:6000:144e:b0:218:405f:d34 with SMTP id v14-20020a056000144e00b00218405f0d34mr8624834wrx.457.1654594838518; Tue, 07 Jun 2022 02:40:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS755EWQrnTPPsoCnwD5C7OmhL6sLjzF0AiyaBxxW7zcSTTYHG1SaxhB3kBEBnmFg9wC+UHg== X-Received: by 2002:a05:6000:144e:b0:218:405f:d34 with SMTP id v14-20020a056000144e00b00218405f0d34mr8624809wrx.457.1654594838122; Tue, 07 Jun 2022 02:40:38 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id h5-20020a5d5045000000b0020d07d90b71sm17242298wrt.66.2022.06.07.02.40.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 2/7] build: include pc-bios/ part in the ROMS variable Date: Tue, 7 Jun 2022 11:40:26 +0200 Message-Id: <20220607094031.1227714-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Include the full path in TARGET_DIR, so that messages from sub-Makefiles are clearer. Also, prepare for possibly building firmware outside pc-bios/ from the Makefile, Signed-off-by: Paolo Bonzini --- Makefile | 12 +++++------- configure | 6 +++--- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 3c0d89057e..ec4445db9a 100644 --- a/Makefile +++ b/Makefile @@ -186,16 +186,14 @@ include $(SRC_PATH)/tests/Makefile.include all: recurse-all -ROM_DIRS = $(addprefix pc-bios/, $(ROMS)) -ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS))) -# Only keep -O and -g cflags -.PHONY: $(ROM_DIRS_RULES) -$(ROM_DIRS_RULES): +ROMS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROMS))) +.PHONY: $(ROMS_RULES) +$(ROMS_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)" TARGET_DIR="$(dir $@)" $(notdir $@),) .PHONY: recurse-all recurse-clean -recurse-all: $(addsuffix /all, $(ROM_DIRS)) -recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) +recurse-all: $(addsuffix /all, $(ROMS)) +recurse-clean: $(addsuffix /clean, $(ROMS)) ###################################################################### diff --git a/configure b/configure index e69537c756..b1aa97e470 100755 --- a/configure +++ b/configure @@ -2242,7 +2242,7 @@ if test -n "$target_cc" && fi done if test -n "$ld_i386_emulation"; then - roms="optionrom" + roms="pc-bios/optionrom" config_mak=pc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "TOPSRC_DIR=$source_path" >> $config_mak @@ -2253,7 +2253,7 @@ fi probe_target_compilers ppc ppc64 if test -n "$target_cc" && test "$softmmu" = yes; then - roms="$roms vof" + roms="$roms pc-bios/vof" config_mak=pc-bios/vof/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak @@ -2272,7 +2272,7 @@ if test -n "$target_cc" && test "$softmmu" = yes; then echo "WARNING: Your compiler does not support the z900!" echo " The s390-ccw bios will only work with guest CPUs >= z10." fi - roms="$roms s390-ccw" + roms="$roms pc-bios/s390-ccw" config_mak=pc-bios/s390-ccw/config-host.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak From patchwork Tue Jun 7 09:40:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639888 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VIgsoQX+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQXW5XKgz9sFr for ; Tue, 7 Jun 2022 19:48:26 +1000 (AEST) Received: from localhost ([::1]:40504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVp0-0005Ml-JF for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 05:48:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhd-0007sI-9j for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:47822) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVha-0008O0-T0 for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MLkySldw1Fwx/a0cSG+JSGpAxxnVssoYm0VUyPtiXWE=; b=VIgsoQX+ev4DsqkmBj1R12hd0aVOhO7aqBYujrtI71aRzQdNTjMImpDPYD6CpYz8QNQ2qg 2pnk31EGEBiJKe1hWNG4YkgM+b3/JWzY59lVkGt9gY3wzwahv8WWxwCl3AQDwa8tgq2IC7 ViwMi6QgBVLaQY8b1Rgyw1x6yWXqa0Y= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-99-6wsGGP29Mey9xV8FUkcT3A-1; Tue, 07 Jun 2022 05:40:41 -0400 X-MC-Unique: 6wsGGP29Mey9xV8FUkcT3A-1 Received: by mail-wm1-f72.google.com with SMTP id p24-20020a05600c1d9800b0039c51c2da19so1513735wms.0 for ; Tue, 07 Jun 2022 02:40:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MLkySldw1Fwx/a0cSG+JSGpAxxnVssoYm0VUyPtiXWE=; b=I0qfsD3koVY6X+6J3jzLnSXAskNp660O/6eCDfZ/xJUad34iMnYTYyJHRuk+MzOGQF q0ZJuJpRSJddHABOipA8fb1ZrqyOeIHQjaajiHuLQaTObcUxn/I6glbqs/psb8bF4M9O wpdFhOrI1nKJj9rCPEVleOcjyef4moWT8VHybPO/BjBKX7dI/l6seMeqVDW82EVRXpW9 NLJaiJc2w8b4cChLqo9FTFRmaDTuZYcneN7jiIUSu8frLPrgrllTfOacPpm4N8MxR4Tu El9WjYYG/IM5zp35ZmTzSQaGQw3cIw8lQRWA2TFDYgFkOOXWCnj2mLkNAvofbEVa3lfS wAJA== X-Gm-Message-State: AOAM53088zuiReBLCug63611/ZBWU9T06PtJka9gvfZQt/m8S2tkjDqf ZBVyDume2TfK+3zJeXnajJP4NPXOWUDzBywRvq6LL6k23QQIMiYY2M4rnehsOdFw4G8jTogpPl2 3PmsioksUSv+nu59hqsV1XXZwOjhVxobq3khHjDpB7bcYk9f3hn6J6Gjr2IH0kAQXmuA= X-Received: by 2002:a5d:6c64:0:b0:20f:f413:8af8 with SMTP id r4-20020a5d6c64000000b0020ff4138af8mr26258786wrz.129.1654594839903; Tue, 07 Jun 2022 02:40:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHn+IyUXCpJNwLaUwTOFB2LwMJp2qPVvKCQLY4UJuVG1YSaClZUfixcloYLBLdHO1H91555g== X-Received: by 2002:a5d:6c64:0:b0:20f:f413:8af8 with SMTP id r4-20020a5d6c64000000b0020ff4138af8mr26258769wrz.129.1654594839669; Tue, 07 Jun 2022 02:40:39 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id h1-20020a05600c414100b0039c5cecf206sm181059wmm.4.2022.06.07.02.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 3/7] configure: allow more host/target combos to use the host compiler Date: Tue, 7 Jun 2022 11:40:27 +0200 Message-Id: <20220607094031.1227714-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Do not require a cross-compiler prefix for e.g. i386 on x86_64, or big endian on little endian. Signed-off-by: Paolo Bonzini --- configure | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/configure b/configure index b1aa97e470..28f8c6188b 100755 --- a/configure +++ b/configure @@ -2058,19 +2058,27 @@ probe_target_compiler() { compute_target_variable $1 target_objcopy objcopy compute_target_variable $1 target_ranlib ranlib compute_target_variable $1 target_strip strip - if test "$1" = $cpu; then - : ${target_cc:=$cc} - : ${target_ccas:=$ccas} - : ${target_as:=$as} - : ${target_ld:=$ld} - : ${target_ar:=$ar} - : ${target_as:=$as} - : ${target_ld:=$ld} - : ${target_nm:=$nm} - : ${target_objcopy:=$objcopy} - : ${target_ranlib:=$ranlib} - : ${target_strip:=$strip} - fi + case "$1:$cpu" in + aarch64:aarch64_be | aarch64_be:aarch64 | \ + arm:armeb | armeb:arm | \ + i386:x86_64 | \ + ppc:ppc64* | \ + ppc64*:ppc64* | \ + sparc:sparc64 | \ + "$cpu:$cpu") + : ${target_cc:=$cc} + : ${target_ccas:=$ccas} + : ${target_as:=$as} + : ${target_ld:=$ld} + : ${target_ar:=$ar} + : ${target_as:=$as} + : ${target_ld:=$ld} + : ${target_nm:=$nm} + : ${target_objcopy:=$objcopy} + : ${target_ranlib:=$ranlib} + : ${target_strip:=$strip} + ;; + esac if test -n "$target_cc"; then case $1 in i386|x86_64) From patchwork Tue Jun 7 09:40:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639890 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DCdr8FrT; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQdD4mkrz9sFx for ; Tue, 7 Jun 2022 19:52:32 +1000 (AEST) Received: from localhost ([::1]:48252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVsz-0002qr-GP for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 05:52:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhi-0007sZ-Px for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35521) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhd-0008Oh-0y for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3qmlSKWjAIMfHWVWkEVGUtG8RQRcbg2SLL6dUqS1vtw=; b=DCdr8FrTq6YjqlUL+jgfwfLRiaUksBAiCdeFZVEqO+VW6hyLm6DYi6gk1MV5yO75VCNrp+ V1CMATLmKBK8sY66za5+BNPyyA9HUCxhClvLWT04Pd3djy2QWiR693sls0ZmzEzW4zzkAj 5CwypP93ELpn6aa3BKIJPeOeAAPntBM= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-570-nXyC49isPkuyGOXLDoYZqg-1; Tue, 07 Jun 2022 05:40:43 -0400 X-MC-Unique: nXyC49isPkuyGOXLDoYZqg-1 Received: by mail-wm1-f72.google.com with SMTP id k32-20020a05600c1ca000b0039c4cf75023so3549470wms.9 for ; Tue, 07 Jun 2022 02:40:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3qmlSKWjAIMfHWVWkEVGUtG8RQRcbg2SLL6dUqS1vtw=; b=XZBMzIP4x8Vcwv8HJYC+OBexvZ3cjCcEoZpGyJK8En5gP4HPeWoP+bEcY1imZtlAFc Pnm/ZvYY4+Yop5QVc4w81vugKEBQf7D2VYm0dG3iKJ8bWfDWYMcgSn9gcFLOqMml/MnE kxNSAezOX+0LLqfULsjC2lh6b+e3V8LApHEt7xEoL+mX7nWpPKMCalnTs3bYLf26CD+R afmMXIb278hAGqDQKIPYgw62aYdQiGcuFbrrTeFVqUh+yqhvXy+FzGeXKgxLJ204KOQe EwAcdruT1hdDDBYT5zSQ/K1ywss73AogjuGo6VrqXOm6nVDkcJvrsGkSUgmanxWUWqGh JfGA== X-Gm-Message-State: AOAM530thMsFgJPFUkjVHHBB+eba/CtdEkP+XB0mZezCvB1yHmM9+f3S Lvn6rnFG1XfQWk/x2ro3+xa86GRJeLUsLpjFcZ9HJfSqvqiNk1M/Vqv25VZZv1csycoM1o8Byjw lBf6iqP4B2rxko4xJB8Nk6+RBGoNHSsasxvDFZNn/GpuSJ1+REanZZdVaWnTPT7Imx9A= X-Received: by 2002:a05:600c:a07:b0:39c:350b:f9bc with SMTP id z7-20020a05600c0a0700b0039c350bf9bcmr26403343wmp.145.1654594841692; Tue, 07 Jun 2022 02:40:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyWLXYnj9fP0vRbX7Vr9HIehL7cccoEOiyxNoKVFe8FLOZNwabja3UJ1+BS/904Mv+r6MeupQ== X-Received: by 2002:a05:600c:a07:b0:39c:350b:f9bc with SMTP id z7-20020a05600c0a0700b0039c350bf9bcmr26403318wmp.145.1654594841330; Tue, 07 Jun 2022 02:40:41 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id d11-20020adffbcb000000b002183ee5c0c5sm4988114wrs.50.2022.06.07.02.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 4/7] configure: move tests/tcg/Makefile.prereqs to root build directory Date: Tue, 7 Jun 2022 11:40:28 +0200 Message-Id: <20220607094031.1227714-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It will not be specific to tests/tcg anymore once it will be possible to build firmware using container-based cross compilers too. Prepare for that already, after all Makefile.prereqs is not _used_ by tests/tcg. Signed-off-by: Paolo Bonzini --- Makefile | 5 ++++- configure | 15 +++++++-------- tests/Makefile.include | 3 --- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index ec4445db9a..9fc750ee70 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,9 @@ configure: ; ifneq ($(wildcard config-host.mak),) include config-host.mak +include Makefile.prereqs +Makefile.prereqs: config-host.mak + git-submodule-update: .git-submodule-status: git-submodule-update config-host.mak Makefile: .git-submodule-status @@ -216,7 +219,7 @@ qemu-%.tar.bz2: distclean: clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak + rm -f config-host.mak Makefile.prereqs rm -f tests/tcg/config-*.mak rm -f config.status rm -f roms/seabios/config.mak diff --git a/configure b/configure index 28f8c6188b..6b38b0815c 100755 --- a/configure +++ b/configure @@ -2126,6 +2126,7 @@ write_target_makefile() { } write_container_target_makefile() { + echo "$1: docker-image-$container_image" >> Makefile.prereqs if test -n "$container_cross_cc"; then echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" echo "CCAS=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" @@ -2234,6 +2235,8 @@ for f in $LINKS ; do fi done +echo "# Automatically generated by configure - do not modify" > Makefile.prereqs + # Mac OS X ships with a broken assembler roms= probe_target_compilers i386 x86_64 @@ -2471,10 +2474,7 @@ if test "$safe_stack" = "yes"; then fi # tests/tcg configuration -(makefile=tests/tcg/Makefile.prereqs -echo "# Automatically generated by configure - do not modify" > $makefile - -config_host_mak=tests/tcg/config-host.mak +(config_host_mak=tests/tcg/config-host.mak echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak @@ -2570,9 +2570,8 @@ for target in $target_list; do ;; esac elif test -n "$container_image"; then - echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile echo "BUILD_STATIC=y" >> $config_target_mak - write_container_target_makefile >> $config_target_mak + write_container_target_makefile build-tcg-tests-$target >> $config_target_mak case $target in aarch64-*) echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak @@ -2595,11 +2594,11 @@ for target in $target_list; do mkdir -p tests/tcg/$target echo "QEMU=$PWD/$qemu" >> $config_target_mak echo "EXTRA_CFLAGS=$target_cflags" >> $config_target_mak - echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile + echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets="$tcg_tests_targets $target" fi done -echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile) +echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> config-host.mak) if test "$skip_meson" = no; then cross="config-meson.cross.new" diff --git a/tests/Makefile.include b/tests/Makefile.include index 3accb83b13..f4ba4027ea 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -36,9 +36,6 @@ export SRC_PATH SPEED = quick --include tests/tcg/Makefile.prereqs -tests/tcg/Makefile.prereqs: config-host.mak - # Per guest TCG tests BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGETS)) CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGETS)) From patchwork Tue Jun 7 09:40:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639891 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=J8ulHi59; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQdZ6zp9z9sFr for ; Tue, 7 Jun 2022 19:52:50 +1000 (AEST) Received: from localhost ([::1]:48942 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVtJ-0003II-1d for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 05:52:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhg-0007sQ-Gn for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:58516) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhe-0008P6-Sm for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q2LoqMCM/ZwdCe5KGPIkrHcczM4rhqTUZVWHnA+3UtE=; b=J8ulHi59WzYpbiedZUrurNSpp5WqpEnG1kL9/87OLC1oIHXsf9uWMiZSnm14M43DhCsv5y vr8N2R59Fg2CeuGnbI+Q6mnw8K0pdPJYkLflH6j/sS7UbHTJqPkOBfjrYi08pchbYHbEuw G6jatiisTUbCcnl6xzgh64V3I44TjwA= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-528-Y4iGGGIsOkCOXYRDpppFfw-1; Tue, 07 Jun 2022 05:40:45 -0400 X-MC-Unique: Y4iGGGIsOkCOXYRDpppFfw-1 Received: by mail-wm1-f70.google.com with SMTP id p24-20020a05600c1d9800b0039c51c2da19so1513792wms.0 for ; Tue, 07 Jun 2022 02:40:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Q2LoqMCM/ZwdCe5KGPIkrHcczM4rhqTUZVWHnA+3UtE=; b=QWXLbaNBeLAQF7W+6KS+Y205pDEyDsJ7wYKLs9nSU6l5WGMT+udrEPrQ3hpLXo8kcm SkS6Frb1ahmi8gx77mRC7lSwU5s6mBngN4HeodoIo9z5KsZ60iZZLAEmKSXjRla7b95D 58mTWBvQHIr9GtY+jJFxWVcskzUdu6Y1Gv9PgHUe7zbZ4qiZAM9ZSk6gZjWJdHwyzXJT LIR3o+q75AldKAlTNvfNjRGhQYWwAJFuc7q6qIAYdfX49A1XmKVQZItzYD7MqoYQJg0j JPeG46/6iBQGeYHnXL/X008QH44ZUD4SkWuPJriCjpWORltSyVxPjf/d+bIuBJTmBQUu SIHg== X-Gm-Message-State: AOAM531Bywa9bgr0vFNEzG+2cXnecNQZZ0QmzcnwUfw4pdhwBB6Y8WH4 NX48pujBI4Qyxfjz+S/++X8TAN/rzT90hzCajtFq2y5y+fiFpatLZFr8LrbOlt+hiOOLhAZX/6R 7mNd4YN1XpSIT47+8wVnvkbIAm3Qwq4OHiTU7lC+xWm00PZYqAWOUt6x0gRZFDvCP0tM= X-Received: by 2002:a05:600c:2194:b0:39c:419c:1a24 with SMTP id e20-20020a05600c219400b0039c419c1a24mr20409469wme.186.1654594843636; Tue, 07 Jun 2022 02:40:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmW1KOPjYWoJBAinRQfiFsEpWn2WzzNeIqMD+Bnh4KV+48WCOSum39p/Nf8qB47TstFAGZFA== X-Received: by 2002:a05:600c:2194:b0:39c:419c:1a24 with SMTP id e20-20020a05600c219400b0039c419c1a24mr20409434wme.186.1654594843129; Tue, 07 Jun 2022 02:40:43 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id n16-20020a1c7210000000b0039c4d9737f3sm6424724wmc.34.2022.06.07.02.40.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 5/7] configure: store container engine in config-host.mak Date: Tue, 7 Jun 2022 11:40:29 +0200 Message-Id: <20220607094031.1227714-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In preparation for removing $(DOCKER_SCRIPT) from the tests/tcg configuration files, have Make use the same container engine that had been probed at configure time. Signed-off-by: Paolo Bonzini --- configure | 11 ++++++++--- tests/docker/Makefile.include | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 6b38b0815c..0fd5a3cfad 100755 --- a/configure +++ b/configure @@ -1819,9 +1819,11 @@ esac container="no" if test $use_containers = "yes"; then - if has "docker" || has "podman"; then - container=$($python $source_path/tests/docker/docker.py probe) - fi + case $($python $source_path/tests/docker/docker.py probe) in + *docker) container=docker ;; + podman) container=podman ;; + no) container=no ;; + esac fi # cross compilers defaults, can be overridden with --cross-cc-ARCH @@ -2401,6 +2403,9 @@ if test -n "$gdb_bin"; then fi fi +if test "$container" != no; then + echo "ENGINE=$container" >> $config_host_mak +fi echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e68f91b853..d9b6ab7b41 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -14,7 +14,7 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) -ENGINE := auto +ENGINE ?= auto DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) CUR_TIME := $(shell date +%Y-%m-%d-%H.%M.%S.$$$$) From patchwork Tue Jun 7 09:40:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=MO5ycVWW; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQPj0p9Gz9sFr for ; Tue, 7 Jun 2022 19:42:31 +1000 (AEST) Received: from localhost ([::1]:59618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyVjG-0007vg-0N for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 05:42:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhi-0007sa-SV for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20605) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhg-0008PT-VG for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mn9CKLXxBusFji1dUgXJShmDAf/CuJ2dsTOawN0KEbU=; b=MO5ycVWWFFpPiA8WPYa7y53kJeAxm7U2fe/JPWAwEB7WfNpJkxw1yC7IBp1yfeKeFdpwv9 j5lqE0lcWWWlZQOrY3ElhwGEtwO9sZ+lhcKJJF+hEEucvMG4xUzP6OZvb5WA1PjYqyz4SL 1jL1z5HV3tmvrxcs8yAwHn+gXzoafJk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-248-mRPg25ODMk-W0-UOuyd8Uw-1; Tue, 07 Jun 2022 05:40:47 -0400 X-MC-Unique: mRPg25ODMk-W0-UOuyd8Uw-1 Received: by mail-wm1-f71.google.com with SMTP id i30-20020a1c541e000000b0039c1bf9739fso5541338wmb.6 for ; Tue, 07 Jun 2022 02:40:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mn9CKLXxBusFji1dUgXJShmDAf/CuJ2dsTOawN0KEbU=; b=4kje2GwPxg4Aj3acv/Le+OccgR8Wd/Kb/9B1hbqrPRxno6n+EuYleirJrh4FEtRpsM 2VAidCgQDyqCoom7ZBDwGycxiXQChJTSDUT6+O8NdaplCsONCef9olz32WhBTdCxqdFf o/eEwL1D0oTqtQgmLL70Gz+RQgniPuJ9H1l/RTSGHDdhH38wm29jm6o2HNmCH9SrM2a7 gMZ1miAg//KrmC9OCBhc0Yf9kaQMssS9rqZgWT65oEj49XSnneD/BeUaxyDS6U1VWEPr ttO/HClfBQLntmjNMfT7rPKodUsUi8LGyROIuYdkHFJIT/lLewd+ykF59IybYz65gmbs 8h1w== X-Gm-Message-State: AOAM532ItjsBevnNwzXRJyeLemc0Xojnk9r2CK195p7mOtZqJvEzbK39 mKqlSh1GZ5mCQQCkvhNHuEHrFob7FPzko6dcyWo98LiaQ4Vk1IPOqZNTQzk2P5RM8BpzDyWWLG8 CBl5f1VqnBn9LS2GDqdfQBuGEH0wlSIGivbfZUDvjGCwG+wwYc9JR0NiEzrDD+JU5aOg= X-Received: by 2002:a5d:6786:0:b0:215:3cb5:b16c with SMTP id v6-20020a5d6786000000b002153cb5b16cmr19600653wru.6.1654594845385; Tue, 07 Jun 2022 02:40:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwsuxWpYDEu0zCNDbwOxJJDqfcJt2Xt3DYTxeXy27nY+d1NrYYIuSML87wkPSX6mV6A5tDpQ== X-Received: by 2002:a5d:6786:0:b0:215:3cb5:b16c with SMTP id v6-20020a5d6786000000b002153cb5b16cmr19600616wru.6.1654594844894; Tue, 07 Jun 2022 02:40:44 -0700 (PDT) Received: from goa-sendmail ([93.56.169.184]) by smtp.gmail.com with ESMTPSA id l13-20020a05600c4f0d00b0039c55bc2c97sm3162247wmq.16.2022.06.07.02.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 6/7] tests: simplify Makefile invocation for tests/tcg Date: Tue, 7 Jun 2022 11:40:30 +0200 Message-Id: <20220607094031.1227714-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The tests/tcg Makefile invocation contains the paths to DOCKER_SCRIPT and TARGET. One can just resolve the path to docker.py in configure so that submakes do not need the DOCKER_SCRIPT variable. In order to remove the TARGET variable, create a config-target.mak file in tests/tcg/$TARGET. For now config-$target.mak is created before the check for compiler presence, while tests/tcg/$TARGET is created afterwards. This is temporary. Signed-off-by: Paolo Bonzini --- configure | 23 ++++++++++++++--------- tests/Makefile.include | 9 +++------ tests/tcg/Makefile.target | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 0fd5a3cfad..9d49ea4c5b 100755 --- a/configure +++ b/configure @@ -1824,6 +1824,9 @@ if test $use_containers = "yes"; then podman) container=podman ;; no) container=no ;; esac + if test "$container" != "no"; then + docker_py="$python $source_path/tests/docker/docker.py --engine $container" + fi fi # cross compilers defaults, can be overridden with --cross-cc-ARCH @@ -2130,16 +2133,16 @@ write_target_makefile() { write_container_target_makefile() { echo "$1: docker-image-$container_image" >> Makefile.prereqs if test -n "$container_cross_cc"; then - echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" - echo "CCAS=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" + echo "CCAS=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" fi - echo "AR=\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" - echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" - echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" - echo "NM=\$(DOCKER_SCRIPT) cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" - echo "OBJCOPY=\$(DOCKER_SCRIPT) cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" - echo "RANLIB=\$(DOCKER_SCRIPT) cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" - echo "STRIP=\$(DOCKER_SCRIPT) cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" + echo "AR=$docker_py cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --" + echo "AS=$docker_py cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" + echo "LD=$docker_py cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" + echo "NM=$docker_py cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --" + echo "OBJCOPY=$docker_py cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --" + echo "RANLIB=$docker_py cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --" + echo "STRIP=$docker_py cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --" } @@ -2597,6 +2600,8 @@ for target in $target_list; do fi if test $got_cross_cc = yes; then mkdir -p tests/tcg/$target + ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak + echo "TARGET=$target" >> $config_target_mak echo "QEMU=$PWD/$qemu" >> $config_target_mak echo "EXTRA_CFLAGS=$target_cflags" >> $config_target_mak echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs diff --git a/tests/Makefile.include b/tests/Makefile.include index f4ba4027ea..f2182ead1e 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -47,23 +47,20 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \ .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%) $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - DOCKER_SCRIPT="$(DOCKER_SCRIPT)" \ - TARGET="$*" SRC_PATH="$(SRC_PATH)", \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS), \ "BUILD","$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%) $(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(call quiet-command, \ $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \ + SPEED=$(SPEED) run, \ "RUN", "$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%) $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%: $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - TARGET="$*" SRC_PATH="$(SRC_PATH)" clean, \ + $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) clean, \ "CLEAN", "$* guest-tests") .PHONY: build-tcg diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index f427a0304e..1e1c7097c6 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -31,7 +31,7 @@ all: -include ../config-host.mak --include ../config-$(TARGET).mak +-include config-target.mak # Get semihosting definitions for user-mode emulation ifeq ($(filter %-softmmu, $(TARGET)),) From patchwork Tue Jun 7 09:40:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1639901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HtmUuzFP; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LHQtY1nxlz9sFw for ; Tue, 7 Jun 2022 20:04:03 +1000 (AEST) Received: from localhost ([::1]:36040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyW46-0006Zi-R3 for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2022 06:03:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhm-0007sw-LV for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:44443) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyVhi-0008Ph-IV for qemu-devel@nongnu.org; Tue, 07 Jun 2022 05:40:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1654594849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RBa30ACYz9QuuLohYqZ+WJU4FHLga/MdEYHQP4kcIkU=; b=HtmUuzFP8NSuWnjyBmXHI64i4V8Oul9hKQ19hklxNHQVX98cVD7h/V6/mO8kK36m2+V71D Ehs/nHw+nkKpm3cn9zTri2rI9cmzTCQP/cPM4+2h2QeQ8pRZEgTa14h7Ab0YM8quz5arJP qr0W+8nUEewT8/4nVh8aE4+pgn2uLqo= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-574-CXaVp-kkPBGEl0pMfzgSAg-1; Tue, 07 Jun 2022 05:40:49 -0400 X-MC-Unique: CXaVp-kkPBGEl0pMfzgSAg-1 Received: by mail-wm1-f71.google.com with SMTP id k32-20020a05600c1ca000b0039c4cf75023so3549561wms.9 for ; Tue, 07 Jun 2022 02:40:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RBa30ACYz9QuuLohYqZ+WJU4FHLga/MdEYHQP4kcIkU=; b=BrQOnE/OKepJsNZMgtjoEJtLIn5xwOJkxacoGfJr3L5K6GLYI3WxGlJem3F7qvnnSa K7HuCK/0hhz0/TJGaEzA/1hoJ5k3FKxoJ7cyqOYJ2RS8wATet8iqPQPBoG1HjB+gA6Wx rNvnajDfimnKYt1L93d8eAbPdOqBONl5a6Z2QcwNhvj65/TcCGZKHM/ePQFr6H5aqqss AQ9A8abQTdjgiFP3SO14Tz5T8mzXQuzJqy5cWwtbVZDxGn2MT543JFNzwxwTk2VfU0lm f9X/Hm5JOE1yYKP57WULI23ANJcxpndNDklDEe8YPw9MqbODXSOsES7q+wL4TQ/rA6lV D+Vg== X-Gm-Message-State: AOAM531BgwYVHqKNdhqNX23geyxa/H0q8VBcCa4GRSPd+N00HozLznrJ iT6TO9noOED3dPKcqxQm7eUZkrrtPXUkj3BNtPab9lfmBkirIORBvnXgkVXtNIrH+tfhM/V3W07 qUHfXI3T/YMjCYetoQCNFKQxlqqPPj9z9orlkflDzs3oJQJrpKCev+0eboHlhj1SPwAw= X-Received: by 2002:a05:600c:3ba7:b0:39c:5b80:3b76 with SMTP id n39-20020a05600c3ba700b0039c5b803b76mr1205402wms.35.1654594847209; Tue, 07 Jun 2022 02:40:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzm0V2fmm4YvE1tQjx9GbFdsua6SJBVl8TK2jgFq00XUouk2GjuOgUJC1ctLSSwK7JsmW4tTQ== X-Received: by 2002:a05:600c:3ba7:b0:39c:5b80:3b76 with SMTP id n39-20020a05600c3ba700b0039c5b803b76mr1205374wms.35.1654594846780; Tue, 07 Jun 2022 02:40:46 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id h13-20020a05600c2cad00b00397623ff335sm21756167wmc.10.2022.06.07.02.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 02:40:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, richard.henderson@linaro.org Subject: [PATCH 7/7] tests/tcg: remove -f from Makefile invocation Date: Tue, 7 Jun 2022 11:40:31 +0200 Message-Id: <20220607094031.1227714-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607094031.1227714-1-pbonzini@redhat.com> References: <20220607094031.1227714-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Name the symbolic link "Makefile" and place it in the target subdirectory. Signed-off-by: Paolo Bonzini --- configure | 3 ++- tests/Makefile.include | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 9d49ea4c5b..f35847c3cd 100755 --- a/configure +++ b/configure @@ -2224,7 +2224,6 @@ fi # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. LINKS="Makefile" -LINKS="$LINKS tests/tcg/Makefile.target" LINKS="$LINKS pc-bios/optionrom/Makefile" LINKS="$LINKS pc-bios/s390-ccw/Makefile" LINKS="$LINKS pc-bios/vof/Makefile" @@ -2483,6 +2482,7 @@ fi # tests/tcg configuration (config_host_mak=tests/tcg/config-host.mak +mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_host_mak echo "SRC_PATH=$source_path" >> $config_host_mak echo "HOST_CC=$host_cc" >> $config_host_mak @@ -2600,6 +2600,7 @@ for target in $target_list; do fi if test $got_cross_cc = yes; then mkdir -p tests/tcg/$target + ln -sf $source_path/tests/tcg/Makefile.target tests/tcg/$target/Makefile ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak echo "TARGET=$target" >> $config_target_mak echo "QEMU=$PWD/$qemu" >> $config_target_mak diff --git a/tests/Makefile.include b/tests/Makefile.include index f2182ead1e..8f44a20da3 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -47,20 +47,19 @@ $(foreach TARGET,$(TCG_TESTS_TARGETS), \ .PHONY: $(TCG_TESTS_TARGETS:%=build-tcg-tests-%) $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/tcg/config-%.mak $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS), \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS), \ "BUILD","$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%) $(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \ - SPEED=$(SPEED) run, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) SPEED=$(SPEED) run, \ "RUN", "$* guest-tests") .PHONY: $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%) $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%: $(call quiet-command, \ - $(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) clean, \ + $(MAKE) -C tests/tcg/$* $(SUBDIR_MAKEFLAGS) clean, \ "CLEAN", "$* guest-tests") .PHONY: build-tcg