Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/meson.build | 1 +
tests/tcg/sh4/Makefile.target | 18 ------------------
tests/tcg/sh4/meson.build | 25 +++++++++++++++++++++++++
3 files changed, 26 insertions(+), 18 deletions(-)
delete mode 100644 tests/tcg/sh4/Makefile.target
create mode 100644 tests/tcg/sh4/meson.build
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index 014959c38cb..07e03048d18 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -150,6 +150,7 @@ subdir('ppc64')
subdir('ppc64le')
subdir('riscv64')
subdir('s390x')
+subdir('sh4')
image_targets = {}
exe_targets = []
diff --git a/tests/tcg/sh4/Makefile.target b/tests/tcg/sh4/Makefile.target
deleted file mode 100644
index b7a8737be0f..00000000000
--- a/tests/tcg/sh4/Makefile.target
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# SuperH specific tweaks
-#
-
-VPATH += $(SRC_PATH)/tests/tcg/sh4
-
-test-macl: CFLAGS += -O -g
-TESTS += test-macl
-
-test-macw: CFLAGS += -O -g
-TESTS += test-macw
-
-test-addv: CFLAGS += -O -g
-TESTS += test-addv
-
-test-subv: CFLAGS += -O -g
-TESTS += test-subv
diff --git a/tests/tcg/sh4/meson.build b/tests/tcg/sh4/meson.build
new file mode 100644
index 00000000000..d73df074497
--- /dev/null
+++ b/tests/tcg/sh4/meson.build
@@ -0,0 +1,25 @@
+tests = []
+
+tests += tcg_tests['multiarch-linux-user']['tests']
+
+tests += {
+ 'test-addv.c': {},
+ 'test-macl.c': {},
+ 'test-macw.c': {},
+ 'test-subv.c': {},
+}
+
+if 'qemu-sh4' in emulators
+ tcg_tests += {
+ 'sh4-linux-user': {
+ 'cc': 'sh4-linux-gnu-gcc',
+ 'cc_dockerfile': 'debian-all-test-cross',
+ 'cc_docker_host_arch': ['aarch64', 'x86_64'],
+ 'cc_feat_cflags': cc_feat_cflags,
+ 'folder': 'sh4',
+ 'gdb_arch': 'sh4',
+ 'qemu': emulators['qemu-sh4'],
+ 'tests': tests,
+ }
+ }
+endif
--
2.47.3
