[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off
From: |
Philippe Mathieu-Daudé |
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 |
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
- [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig, (continued)
- [PATCH v4 02/12] meson: Allow optional target/${ARCH}/Kconfig, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 03/12] target/arm: Select SEMIHOSTING if TCG is available, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 04/12] target/arm: Restrict ARMv4 cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 05/12] target/arm: Restrict ARMv5 cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 06/12] target/arm: Restrict ARMv6 cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 07/12] target/arm: Restrict ARMv7 R-profile cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 08/12] target/arm: Restrict ARMv7 M-profile cpus to TCG accel, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 09/12] target/arm: Make m_helper.c optional via CONFIG_ARM_V7M, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 11/12] target/arm: Reorder meson.build rules, Philippe Mathieu-Daudé, 2020/09/29
- [PATCH v4 10/12] target/arm: Do not build TCG objects when TCG is off,
Philippe Mathieu-Daudé <=
- [PATCH v4 12/12] .travis.yml: Add a KVM-only Aarch64 job, Philippe Mathieu-Daudé, 2020/09/29
- Re: [PATCH v4 00/12] Support disabling TCG on ARM (part 2), Igor Mammedov, 2020/09/30