From nobody Mon Feb 9 22:38:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1661467876; cv=none; d=zohomail.com; s=zohoarc; b=W6EgdmQzAXO72SOFNg7yQZcuDqpht49C4KOfxSTk0z1cSUoqdfo8VtXj8MfS5k3b6mtjhB11mRXJ1CVMM6G3wzMSYE2IyXM73CxC1Zbq5lsR0G8wC6SENlWZ4yH8Xc9g3Z+1CmVp8t6jwrkzgHBKxCnAvON1U7/hr1IIDIoxM6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1661467876; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GD6gVGwT+P5RhtY3xGlHFrbigVj0Tyk29M0Qd4qf44s=; b=PRfWM3JsXkUE3GoHyXiC/k55nKuKfJLMqDKapD/h+KERULseqFJfoKuho7Q6YE/zGDrFevIdxHB7P/FAD/lXbOxGgK5S24gP1EY+d/DqMkX9PmDrtyndyONSkffSh2dyfE9Zzj56JC+d+1k7apfBTfhdPi/LyapFbmZkRymEpDw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1661467876340143.15112011861504; Thu, 25 Aug 2022 15:51:16 -0700 (PDT) Received: from localhost ([::1]:50564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oRLgx-0004Uc-5Y for importer@patchew.org; Thu, 25 Aug 2022 18:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRLKj-0002wG-PC for qemu-devel@nongnu.org; Thu, 25 Aug 2022 18:28:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:54444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oRLKi-0004gF-7g for qemu-devel@nongnu.org; Thu, 25 Aug 2022 18:28:17 -0400 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.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-287-cNqrelgMPCyC47FdOTSc1Q-1; Thu, 25 Aug 2022 18:28:13 -0400 Received: by mail-wm1-f71.google.com with SMTP id j36-20020a05600c1c2400b003a540d88677so11510016wms.1 for ; Thu, 25 Aug 2022 15:28:12 -0700 (PDT) Received: from goa-sendmail ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id q18-20020adff952000000b002207a0b93b4sm337833wrr.49.2022.08.25.15.28.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 15:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661466495; 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=GD6gVGwT+P5RhtY3xGlHFrbigVj0Tyk29M0Qd4qf44s=; b=SVDPLMeCxl9ic7/svk5sonrb0OhVO+lcmyYuvDsBS9Fq31mi4mOl8Tc5vCsEZHHY87MPrn IgEvViqFcemW6JLzM7TtEH17E1QR/gIxpGzzed3XVg1oE+m5L4lsbZlLtf1AZB7YBwacvs zFLb/k2u3la0A0NEe4pQE3owEkHH72w= X-MC-Unique: cNqrelgMPCyC47FdOTSc1Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=GD6gVGwT+P5RhtY3xGlHFrbigVj0Tyk29M0Qd4qf44s=; b=HaGNx5qAqruiJ0v67rY1xG3hCYHLaYHJur8NV8BFnVNwQZG5moOET9hS3RY1oJKrBc UnYYcNt36R5bIcLLoJI+EhZEJgyoIhqF03GBUKYGBQetuIJkJekF+k6xLtsjOPY9G40f kDGkd6rqlStSH5I9RoohqlTZ02iuhUDQaJziCOaatn8fFerASJbWjNVmsrspcHrTjFbz doN4zdOE3+ASZTV/Hlrn2EpNFsfFt8KuZM+/HDhJTkgeGQvgSUCJHzeLJTFkUUY3AmHY vkXIoFb3X/Chd77M0irRCHjsZPQJHJpTkm3WdQzq5lwOYhUpVnBdT/BEOwQI/B0JNV/u mGEg== X-Gm-Message-State: ACgBeo1udrwzv1NT17Fhk4CLJlp3KI0UAtrWJKK6xplVHcNPjO3NXnsk z/6xLUgkfiWTf+cUl5YhpcqFQ6ZGh4QZtz7DwMMrF3CKFme8Hy6X4JoN0uu1WuUx+hi0VymXsLQ HqOP3kUpk729Bh4U2CbfU5Eda1AGyrtF+1Zcud8h1nh7rNJEX4NS6+E0ETkvZcrQLAK4= X-Received: by 2002:adf:d20b:0:b0:225:4ec9:8cac with SMTP id j11-20020adfd20b000000b002254ec98cacmr3285072wrh.92.1661466491556; Thu, 25 Aug 2022 15:28:11 -0700 (PDT) X-Google-Smtp-Source: AA6agR56jJ9vyIqRHzfFJUGHosMx/db9Nh0YadRCX6lwjMSEV8UfNTJJUmcKt/VUL2aczb9YEW106A== X-Received: by 2002:adf:d20b:0:b0:225:4ec9:8cac with SMTP id j11-20020adfd20b000000b002254ec98cacmr3285064wrh.92.1661466491315; Thu, 25 Aug 2022 15:28:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org Subject: [PATCH 16/20] configure: cleanup creation of tests/tcg target config Date: Fri, 26 Aug 2022 00:27:41 +0200 Message-Id: <20220825222745.38779-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220825222745.38779-1-pbonzini@redhat.com> References: <20220825222745.38779-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1661467878059100001 Content-Type: text/plain; charset="utf-8" Remove the symlink to tests/tcg/config-*.mak, which is possible now that unused target config files are not created anymore. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- configure | 12 +++++------- meson.build | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 6fd5b6ac06..adf24c0236 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,7 @@ qemu-%.tar.bz2: distclean: clean recurse-distclean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : rm -f config-host.mak Makefile.prereqs qemu-bundle - rm -f tests/tcg/config-*.mak + rm -f tests/tcg/*/config-target.mak tests/tcg/config-host.mak rm -f config.status rm -f roms/seabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols diff --git a/configure b/configure index 37ddd90bb1..97665ef619 100755 --- a/configure +++ b/configure @@ -2567,10 +2567,6 @@ tcg_tests_targets=3D for target in $target_list; do arch=3D${target%%-*} =20 - config_target_mak=3Dtests/tcg/config-$target.mak - - echo "# Automatically generated by configure - do not modify" > $config_= target_mak - echo "TARGET_NAME=3D$arch" >> $config_target_mak case $target in xtensa*-linux-user) # the toolchain is not complete with headers, only build softmmu tes= ts @@ -2587,13 +2583,15 @@ for target in $target_list; do =20 if probe_target_compiler $target || test -n "$container_image"; then test -n "$container_image" && build_static=3Dy - write_target_makefile build-tcg-tests-$target >> $config_target_mak mkdir -p tests/tcg/$target + config_target_mak=3Dtests/tcg/$target/config-target.mak ln -sf $source_path/tests/tcg/Makefile.target tests/tcg/$target/Make= file - ln -sf ../config-$target.mak tests/tcg/$target/config-target.mak + echo "# Automatically generated by configure - do not modify" > $con= fig_target_mak + echo "TARGET_NAME=3D$arch" >> $config_target_mak echo "TARGET=3D$target" >> $config_target_mak - echo "QEMU=3D$PWD/$qemu" >> $config_target_mak + write_target_makefile build-tcg-tests-$target >> $config_target_mak echo "BUILD_STATIC=3D$build_static" >> $config_target_mak + echo "QEMU=3D$PWD/$qemu" >> $config_target_mak echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs tcg_tests_targets=3D"$tcg_tests_targets $target" fi diff --git a/meson.build b/meson.build index 8e927fc457..5cfb352d45 100644 --- a/meson.build +++ b/meson.build @@ -3812,7 +3812,7 @@ summary(summary_info, bool_yn: true, section: 'Compil= ation') summary_info =3D {} have_cross =3D false foreach target: target_dirs - tcg_mak =3D meson.current_build_dir() / 'tests/tcg' / 'config-' + target= + '.mak' + tcg_mak =3D meson.current_build_dir() / 'tests/tcg' / target / 'config-t= arget.mak' if fs.exists(tcg_mak) config_cross_tcg =3D keyval.load(tcg_mak) if 'CC' in config_cross_tcg --=20 2.37.1