From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 152C6C31E50 for ; Sat, 15 Jun 2019 16:11:17 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DC15D2184B for ; Sat, 15 Jun 2019 16:11:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC15D2184B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33166 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcBGu-0003bq-6E for qemu-devel@archiver.kernel.org; Sat, 15 Jun 2019 12:11:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36099) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcArK-0004TW-5C for qemu-devel@nongnu.org; Sat, 15 Jun 2019 11:44:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcArI-0001jJ-RV for qemu-devel@nongnu.org; Sat, 15 Jun 2019 11:44:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50652) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcArG-0001YP-7h; Sat, 15 Jun 2019 11:44:46 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6C4F98762B; Sat, 15 Jun 2019 15:44:45 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-41.brq.redhat.com [10.40.204.41]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BD5741001B05; Sat, 15 Jun 2019 15:44:43 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Sat, 15 Jun 2019 17:43:50 +0200 Message-Id: <20190615154352.26824-22-philmd@redhat.com> In-Reply-To: <20190615154352.26824-1-philmd@redhat.com> References: <20190615154352.26824-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Sat, 15 Jun 2019 15:44:45 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 21/23] target/arm: Do not build TCG objects when TCG is off 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: Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Samuel Ortiz , Robert Bradford Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Samuel Ortiz We can now safely turn all TCG dependent build off when CONFIG_TCG is off. This allows building ARM binaries with --disable-tcg. Signed-off-by: Samuel Ortiz Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Robert Bradford [PMD: Rebased] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- We can also use: ifeq ($(CONFIG_TCG),y) ... endif But long single line with macros from rules.mak are way easier to rebase. Now that this series is stable, I could change to ifeq if required. target/arm/Makefile.objs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 5f3f965cc6..b8aa9c032a 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -3,7 +3,7 @@ obj-y +=3D cpu.o helper.o gdbstub.o obj-$(TARGET_AARCH64) +=3D cpu64.o gdbstub64.o =20 obj-$(CONFIG_SOFTMMU) +=3D machine.o arch_dump.o monitor.o arm-powerctl.= o -obj-$(CONFIG_SOFTMMU) +=3D psci.o +obj-$(call land,$(CONFIG_TCG),$(CONFIG_SOFTMMU)) +=3D psci.o =20 obj-$(CONFIG_KVM) +=3D kvm.o obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) +=3D kvm32= .o @@ -31,12 +31,12 @@ target/arm/translate-sve.o: target/arm/decode-sve.inc= .c target/arm/translate.o: target/arm/decode-vfp.inc.c target/arm/translate.o: target/arm/decode-vfp-uncond.inc.c =20 -obj-y +=3D translate.o op_helper.o -obj-y +=3D crypto_helper.o -obj-y +=3D iwmmxt_helper.o vec_helper.o -obj-y +=3D neon_helper.o vfp_helper.o -obj-$(call lor,$(CONFIG_USER_ONLY),$(CONFIG_ARM_V7M)) +=3D v7m_helper.o +obj-$(CONFIG_TCG) +=3D translate.o op_helper.o +obj-$(CONFIG_TCG) +=3D crypto_helper.o +obj-$(CONFIG_TCG) +=3D iwmmxt_helper.o vec_helper.o +obj-$(CONFIG_TCG) +=3D neon_helper.o vfp_helper.o +obj-$(call lor,$(CONFIG_USER_ONLY),$(call land,$(CONFIG_TCG),$(CONFIG_AR= M_V7M))) +=3D v7m_helper.o =20 -obj-$(TARGET_AARCH64) +=3D translate-a64.o helper-a64.o -obj-$(TARGET_AARCH64) +=3D translate-sve.o sve_helper.o -obj-$(TARGET_AARCH64) +=3D pauth_helper.o +obj-$(call land,$(CONFIG_TCG),$(TARGET_AARCH64)) +=3D translate-a64.o he= lper-a64.o +obj-$(call land,$(CONFIG_TCG),$(TARGET_AARCH64)) +=3D translate-sve.o sv= e_helper.o +obj-$(call land,$(CONFIG_TCG),$(TARGET_AARCH64)) +=3D pauth_helper.o --=20 2.20.1