Signed-off-by: Pierrick Bouvier <[email protected]>
---
tests/tcg/aarch64_be/Makefile.target | 17 -----------------
tests/tcg/aarch64_be/meson.build | 22 ++++++++++++++++++++++
tests/tcg/meson.build | 1 +
3 files changed, 23 insertions(+), 17 deletions(-)
delete mode 100644 tests/tcg/aarch64_be/Makefile.target
create mode 100644 tests/tcg/aarch64_be/meson.build
diff --git a/tests/tcg/aarch64_be/Makefile.target
b/tests/tcg/aarch64_be/Makefile.target
deleted file mode 100644
index cbe5fa0b2db..00000000000
--- a/tests/tcg/aarch64_be/Makefile.target
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile -*-
-#
-# A super basic AArch64 BE makefile. As we don't have any big-endian
-# libc available the best we can do is a basic Hello World.
-
-AARCH64BE_SRC=$(SRC_PATH)/tests/tcg/aarch64_be
-VPATH += $(AARCH64BE_SRC)
-
-AARCH64BE_TEST_SRCS=$(notdir $(wildcard $(AARCH64BE_SRC)/*.c))
-AARCH64BE_TESTS=$(AARCH64BE_TEST_SRCS:.c=)
-#MULTIARCH_TESTS = $(MULTIARCH_SRCS:.c=)
-
-# We need to specify big-endian cflags
-CFLAGS +=-mbig-endian -ffreestanding
-LDFLAGS +=-nostdlib
-
-TESTS += $(AARCH64BE_TESTS)
diff --git a/tests/tcg/aarch64_be/meson.build b/tests/tcg/aarch64_be/meson.build
new file mode 100644
index 00000000000..9ea111f9885
--- /dev/null
+++ b/tests/tcg/aarch64_be/meson.build
@@ -0,0 +1,22 @@
+tests = []
+
+# As we don't have any big-endian libc available,
+# the best we can do is a basic Hello World.
+tests += {
+ 'hello.c': {'cflags': ['-mbig-endian', '-ffreestanding', '-nostdlib']},
+}
+
+if 'qemu-aarch64_be' in emulators
+ tcg_tests += {
+ 'aarch64_be-linux-user': {
+ 'cc': 'aarch64-linux-gnu-gcc',
+ 'cc_dockerfile': 'debian-all-test-cross',
+ 'cc_docker_host_arch': ['aarch64', 'x86_64'],
+ 'cc_feat_cflags': cc_feat_cflags,
+ 'folder': 'aarch64_be',
+ 'gdb_arch': 'aarch64_be',
+ 'qemu': emulators['qemu-aarch64_be'],
+ 'tests': tests,
+ }
+ }
+endif
diff --git a/tests/tcg/meson.build b/tests/tcg/meson.build
index eef7ae12afb..1996fb0cdf8 100644
--- a/tests/tcg/meson.build
+++ b/tests/tcg/meson.build
@@ -134,6 +134,7 @@ endforeach
# Now let's go through all architectures
subdir('aarch64')
+subdir('aarch64_be')
image_targets = {}
exe_targets = []
--
2.47.3
