[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 20/57] tests/tcg/x86_64: add Makefile.target
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 20/57] tests/tcg/x86_64: add Makefile.target |
Date: |
Thu, 21 Jun 2018 07:25:28 +0100 |
The sources for x86_64 are shared in the i386 directory which will be
included thanks to TARGET_BASE_ARCH. However not all sources build so
we need to filter out the ones we can't build in the 64 bit world and
those that can't be built for 32 bit.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
diff --git a/MAINTAINERS b/MAINTAINERS
index 590c24377c..096b5bbf61 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -284,6 +284,7 @@ M: Eduardo Habkost <address@hidden>
S: Maintained
F: target/i386/
F: tests/tcg/i386/
+F: tests/tcg/x86_64/
F: hw/i386/
F: disas/i386.c
T: git git://github.com/ehabkost/qemu.git x86-next
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index 64d241cfdf..cd173363ee 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -7,9 +7,9 @@ VPATH += $(I386_SRC)
I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c))
I386_TESTS=$(I386_SRCS:.c=)
-
+I386_ONLY_TESTS=$(filter-out test-i386-ssse3, $(I386_TESTS))
# Update TESTS
-TESTS+=$(I386_TESTS)
+TESTS+=$(I386_ONLY_TESTS)
ifneq ($(TARGET_NAME),x86_64)
CFLAGS+=-m32
diff --git a/tests/tcg/x86_64/Makefile.target b/tests/tcg/x86_64/Makefile.target
new file mode 100644
index 0000000000..74f170b9ed
--- /dev/null
+++ b/tests/tcg/x86_64/Makefile.target
@@ -0,0 +1,15 @@
+# -*- Mode: makefile -*-
+#
+# x86_64 tests - included from tests/tcg/Makefile.target
+#
+# Currently we only build test-x86_64 and test-i386-ssse3 from
+# $(SRC)/tests/tcg/i386/
+#
+
+X86_64_TESTS=$(filter-out $(I386_ONLY_TESTS), $(TESTS))
+X86_64_TESTS+=test-x86_64
+TESTS:=$(X86_64_TESTS)
+
+test-x86_64: LDFLAGS+=-lm -lc
+test-x86_64: test-i386.c test-i386.h test-i386-shift.h test-i386-muldiv.h
+ $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
--
2.17.1
- [Qemu-devel] [PULL v2 34/57] tests/tcg: enable building for Alpha, (continued)
- [Qemu-devel] [PULL v2 34/57] tests/tcg: enable building for Alpha, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 35/57] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 23/57] tests/tcg: move ARM specific tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 37/57] tests/tcg: enable building for m68k, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 24/57] tests/tcg: enable building for ARM, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 26/57] tests/tcg: enable building for AArch64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 14/57] tests/tcg/multiarch: move most output to stdout, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 36/57] tests/tcg: enable building for HPPA, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 31/57] tests/tcg/mips: include common mips hello-mips, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 29/57] tests/tcg: enable building for MIPS, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 20/57] tests/tcg/x86_64: add Makefile.target,
Alex Bennée <=
- [Qemu-devel] [PULL v2 50/57] tests: add top-level make dependency for docker builds, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 16/57] tests/tcg: enable building for i386, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 42/57] docker: move debian-powerpc-cross to sid based build, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 18/57] tests/tcg/i386: fix test-i386, Alex Bennée, 2018/06/21
- Re: [Qemu-devel] [PULL v2 00/57] add check-tcg and associated machinery, Peter Maydell, 2018/06/21