Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/loongarch64/Makefile.target | 20 ------------------
tests/tcg/loongarch64/meson.build | 30 +++++++++++++++++++++++++++
tests/tcg/meson.build | 1 +
3 files changed, 31 insertions(+), 20 deletions(-)
delete mode 100644 tests/tcg/loongarch64/Makefile.target
create mode 100644 tests/tcg/loongarch64/meson.build
diff --git a/tests/tcg/loongarch64/Makefile.target
b/tests/tcg/loongarch64/Makefile.target
deleted file mode 100644
index 00030a10266..00000000000
--- a/tests/tcg/loongarch64/Makefile.target
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# LoongArch64 specific tweaks
-
-# Loongarch64 doesn't support gdb, so skip the EXTRA_RUNS
-EXTRA_RUNS =
-
-LOONGARCH64_SRC=$(SRC_PATH)/tests/tcg/loongarch64
-VPATH += $(LOONGARCH64_SRC)
-
-LDFLAGS+=-lm
-
-LOONGARCH64_TESTS = test_bit
-LOONGARCH64_TESTS += test_div
-LOONGARCH64_TESTS += test_fclass
-LOONGARCH64_TESTS += test_fpcom
-LOONGARCH64_TESTS += test_pcadd
-LOONGARCH64_TESTS += test_fcsr
-
-TESTS += $(LOONGARCH64_TESTS)
diff --git a/tests/tcg/loongarch64/meson.build
b/tests/tcg/loongarch64/meson.build
new file mode 100644
index 00000000000..209179fd96c
--- /dev/null
+++ b/tests/tcg/loongarch64/meson.build
@@ -0,0 +1,30 @@
+cc = 'loongarch64-unknown-linux-gnu-gcc'
+cc_dockerfile = 'debian-loongarch-cross'
+cc_docker_host_arch = ['x86_64']
+
+tests = []
+
+tests += tcg_tests['multiarch-linux-user']['tests']
+
+tests += {
+ 'test_bit.c': {},
+ 'test_fclass.c': {},
+ 'test_fcsr.c': {},
+ 'test_fpcom.c': {},
+ 'test_div.c': {},
+ 'test_pcadd.c': {},
+}
+
+if 'qemu-loongarch64' in emulators
+ tcg_tests += {
+ 'loongarch64-linux-user': {
+ 'cc': cc,
+ 'cc_dockerfile': cc_dockerfile,
+ 'cc_docker_host_arch': cc_docker_host_arch,
+ 'folder': 'loongarch64',
+ 'gdb_arch': 'loongarch64',
+ 'qemu': emulators['qemu-loongarch64'],
+ 'tests': tests,
+ }
+ }
+endif
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index 23508228ed8..451fe349a3e 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -140,6 +140,7 @@ subdir('arm')
subdir('hexagon')
subdir('hppa')
subdir('i386')
+subdir('loongarch64')
image_targets = {}
exe_targets = []
--
2.47.3
