[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 19/54] tests/tcg/x86_64: add Makefile.target
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v7 19/54] tests/tcg/x86_64: add Makefile.target |
Date: |
Fri, 15 Jun 2018 20:46:30 +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>
---
v4
- update MAINTAINERS
v5
- merge with disable i386 version of test-i386-ssse
---
MAINTAINERS | 1 +
tests/tcg/i386/Makefile.target | 4 ++--
tests/tcg/x86_64/Makefile.target | 15 +++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 tests/tcg/x86_64/Makefile.target
diff --git a/MAINTAINERS b/MAINTAINERS
index ea298cc910..57c828644f 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] [PATCH v7 08/54] docker: Makefile.include introduce DOCKER_SCRIPT, (continued)
- [Qemu-devel] [PATCH v7 08/54] docker: Makefile.include introduce DOCKER_SCRIPT, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 10/54] tests/tcg/multiarch: Build fix for linux-test, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 11/54] tests/tcg/multiarch: enable additional linux-test tests, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 12/54] tests/tcg/multiarch: don't hard code paths/ports for linux-test, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 23/54] tests/tcg: enable building for ARM, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 43/54] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 09/54] tests/tcg: move architecture independent tests into subdir, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 22/54] tests/tcg: move ARM specific tests into subdir, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 21/54] tests/tcg/i386/test-i386: fix printf format, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 15/54] tests/tcg: enable building for i386, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 19/54] tests/tcg/x86_64: add Makefile.target,
Alex Bennée <=
- [Qemu-devel] [PATCH v7 54/54] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 31/54] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 37/54] tests/tcg: enable building for sh4, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 53/54] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 42/54] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 48/54] tests: add top-level make dependency for docker builds, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 20/54] tests/tcg/i386/test-i386: use modern vector_size attributes, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 47/54] tests/tcg: override runners for broken tests, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 41/54] docker: move debian-powerpc-cross to sid based build, Alex Bennée, 2018/06/15
- [Qemu-devel] [PATCH v7 25/54] tests/tcg: enable building for AArch64, Alex Bennée, 2018/06/15