From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
kvm@vger.kernel.org, "Alex Bennée" <alex.bennee@linaro.org>,
qemu-arm@nongnu.org, "Richard Henderson" <rth@twiddle.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Samuel Ortiz" <sameo@linux.intel.com>
Subject: [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off
Date: Wed, 30 Sep 2020 00:43:53 +0200 [thread overview]
Message-ID: <20200929224355.1224017-11-philmd@redhat.com> (raw)
In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com>
From: Samuel Ortiz <sameo@linux.intel.com>
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 <sameo@linux.intel.com>
[PMD: Heavily rebased during almost 2 years then finally rewritten =) ]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
target/arm/meson.build | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/target/arm/meson.build b/target/arm/meson.build
index f6a88297a8..9b7727d4bb 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -16,24 +16,29 @@ arm_ss = ss.source_set()
arm_ss.add(gen)
arm_ss.add(files(
'cpu.c',
- 'crypto_helper.c',
- 'debug_helper.c',
'gdbstub.c',
'helper.c',
+ 'vfp_helper.c',
+))
+
+arm_tcg_ss = ss.source_set()
+arm_tcg_ss.add(files(
+ 'arm-semi.c',
+ 'cpu_tcg.c',
+ 'crypto_helper.c',
+ 'debug_helper.c',
'iwmmxt_helper.c',
'neon_helper.c',
'op_helper.c',
'tlb_helper.c',
'translate.c',
'vec_helper.c',
- 'vfp_helper.c',
- 'cpu_tcg.c',
))
-arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c'))
+
+arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c'))
arm_ss.add(zlib)
-arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c'))
arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c'))
arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
@@ -41,6 +46,9 @@ arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: fil
arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
'cpu64.c',
'gdbstub64.c',
+))
+
+arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files(
'helper-a64.c',
'mte_helper.c',
'pauth_helper.c',
@@ -49,14 +57,16 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
'translate-sve.c',
))
+arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss)
+
arm_softmmu_ss = ss.source_set()
arm_softmmu_ss.add(files(
'arch_dump.c',
'arm-powerctl.c',
'machine.c',
'monitor.c',
- 'psci.c',
))
+arm_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('psci.c'))
target_arch += {'arm': arm_ss}
target_softmmu_arch += {'arm': arm_softmmu_ss}
--
2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Thomas Huth" <thuth@redhat.com>,
"Samuel Ortiz" <sameo@linux.intel.com>,
kvm@vger.kernel.org, "Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
qemu-arm@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Richard Henderson" <rth@twiddle.net>
Subject: [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off
Date: Wed, 30 Sep 2020 00:43:53 +0200 [thread overview]
Message-ID: <20200929224355.1224017-11-philmd@redhat.com> (raw)
In-Reply-To: <20200929224355.1224017-1-philmd@redhat.com>
From: Samuel Ortiz <sameo@linux.intel.com>
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 <sameo@linux.intel.com>
[PMD: Heavily rebased during almost 2 years then finally rewritten =) ]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
target/arm/meson.build | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/target/arm/meson.build b/target/arm/meson.build
index f6a88297a8..9b7727d4bb 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -16,24 +16,29 @@ arm_ss = ss.source_set()
arm_ss.add(gen)
arm_ss.add(files(
'cpu.c',
- 'crypto_helper.c',
- 'debug_helper.c',
'gdbstub.c',
'helper.c',
+ 'vfp_helper.c',
+))
+
+arm_tcg_ss = ss.source_set()
+arm_tcg_ss.add(files(
+ 'arm-semi.c',
+ 'cpu_tcg.c',
+ 'crypto_helper.c',
+ 'debug_helper.c',
'iwmmxt_helper.c',
'neon_helper.c',
'op_helper.c',
'tlb_helper.c',
'translate.c',
'vec_helper.c',
- 'vfp_helper.c',
- 'cpu_tcg.c',
))
-arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c'))
+
+arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c'))
arm_ss.add(zlib)
-arm_ss.add(when: 'CONFIG_TCG', if_true: files('arm-semi.c'))
arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c'))
arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c'))
@@ -41,6 +46,9 @@ arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: fil
arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
'cpu64.c',
'gdbstub64.c',
+))
+
+arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files(
'helper-a64.c',
'mte_helper.c',
'pauth_helper.c',
@@ -49,14 +57,16 @@ arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
'translate-sve.c',
))
+arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss)
+
arm_softmmu_ss = ss.source_set()
arm_softmmu_ss.add(files(
'arch_dump.c',
'arm-powerctl.c',
'machine.c',
'monitor.c',
- 'psci.c',
))
+arm_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('psci.c'))
target_arch += {'arm': arm_ss}
target_softmmu_arch += {'arm': arm_softmmu_ss}
--
2.26.2
next prev parent reply other threads:[~2020-09-29 22:44 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 22:43 [PATCH v4 00/12] Support disabling TCG on ARM (part 2) Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 01/12] accel/tcg: Add stub for cpu_loop_exit() Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-30 7:08 ` Thomas Huth
2020-09-30 7:08 ` Thomas Huth
2020-10-03 9:09 ` Richard Henderson
2020-10-03 9:09 ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-30 12:50 ` Claudio Fontana
2020-09-30 12:50 ` Claudio Fontana
2020-09-30 13:17 ` Paolo Bonzini
2020-09-30 13:17 ` Paolo Bonzini
2020-10-03 9:13 ` Richard Henderson
2020-10-03 9:13 ` Richard Henderson
2020-10-03 9:15 ` Paolo Bonzini
2020-10-03 9:15 ` Paolo Bonzini
2020-10-03 9:32 ` Richard Henderson
2020-10-03 9:32 ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 03/12] target/arm: Select SEMIHOSTING if TCG is available Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-10-03 9:43 ` Richard Henderson
2020-10-03 9:43 ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 04/12] target/arm: Restrict ARMv4 cpus to TCG accel Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-30 8:03 ` Philippe Mathieu-Daudé
2020-09-30 8:03 ` Philippe Mathieu-Daudé
2020-10-03 9:17 ` Thomas Huth
2020-10-03 9:17 ` Thomas Huth
2020-09-29 22:43 ` [PATCH v4 05/12] target/arm: Restrict ARMv5 " Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 06/12] target/arm: Restrict ARMv6 " Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 07/12] target/arm: Restrict ARMv7 R-profile " Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 08/12] target/arm: Restrict ARMv7 M-profile " Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` [PATCH v4 09/12] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-10-03 9:48 ` Richard Henderson
2020-10-03 9:48 ` Richard Henderson
2021-01-29 18:53 ` Philippe Mathieu-Daudé
2021-01-29 18:53 ` Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé [this message]
2020-09-29 22:43 ` [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off Philippe Mathieu-Daudé
2020-10-03 9:52 ` Richard Henderson
2020-10-03 9:52 ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 11/12] target/arm: Reorder meson.build rules Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-10-03 9:53 ` Richard Henderson
2020-10-03 9:53 ` Richard Henderson
2020-09-29 22:43 ` [PATCH v4 12/12] .travis.yml: Add a KVM-only Aarch64 job Philippe Mathieu-Daudé
2020-09-29 22:43 ` Philippe Mathieu-Daudé
2020-10-03 10:03 ` Richard Henderson
2020-10-03 10:03 ` Richard Henderson
2020-10-03 10:14 ` Thomas Huth
2020-10-03 10:14 ` Thomas Huth
2020-10-03 10:37 ` Richard Henderson
2020-10-03 10:37 ` Richard Henderson
2020-09-30 7:58 ` [PATCH v4 00/12] Support disabling TCG on ARM (part 2) Igor Mammedov
2020-09-30 7:58 ` Igor Mammedov
2020-09-30 10:20 ` Philippe Mathieu-Daudé
2020-09-30 10:20 ` Philippe Mathieu-Daudé
2021-01-28 0:41 ` Alex Bennée
2021-01-28 0:41 ` Alex Bennée
2021-01-28 11:02 ` Philippe Mathieu-Daudé
2021-01-28 11:02 ` Philippe Mathieu-Daudé
2021-01-28 15:42 ` Alex Bennée
2021-01-28 15:42 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200929224355.1224017-11-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=fam@euphon.net \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=rth@twiddle.net \
--cc=sameo@linux.intel.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.