[v7,01/23] NOTFORMERGE target/arm: Restrict MTE code to softmmu

Commit Message

Philippe Mathieu-Daudé May 17, 2021, 10:51 a.m. UTC

The following patches require the "arm cleanup experiment for
kvm-only build" [*] series with split various user/sysemu and
tcg/kvm code from the target/arm/ directory.

To be able to build the following patches waiting the series
get merged, simply restrict the MTE code to the softmmu source
set.

[*] https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg02908.html

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 target/arm/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/target/arm/meson.build b/target/arm/meson.build
index 5bfaf43b500..09802ba1a17 100644
--- a/target/arm/meson.build
+++ b/target/arm/meson.build
@@ -41,7 +41,6 @@ 
   'cpu64.c',
   'gdbstub64.c',
   'helper-a64.c',
-  'mte_helper.c',
   'pauth_helper.c',
   'sve_helper.c',
   'translate-a64.c',
@@ -49,6 +48,11 @@ 
 ))
 
 arm_softmmu_ss = ss.source_set()
+
+arm_softmmu_ss.add(when: 'TARGET_AARCH64', if_true: files(
+  'mte_helper.c',
+))
+
 arm_softmmu_ss.add(files(
   'arch_dump.c',
   'arm-powerctl.c',