[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target |
Date: |
Tue, 19 Jun 2018 16:43:58 +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
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] [PULL 50/56] docker: docker.py use "version" to probe usage, (continued)
- [Qemu-devel] [PULL 50/56] docker: docker.py use "version" to probe usage, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 49/56] tests: add top-level make dependency for docker builds, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 54/56] docker: docker.py adding age check command, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 35/56] tests/tcg: enable building for HPPA, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 15/56] tests/tcg: enable building for i386, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 26/56] tests/tcg/arm: add fcvt test cases for AArch32/64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 29/56] tests/docker/Makefile.include: fix mipsel-cross dependancy, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 21/56] tests/tcg/i386/test-i386: fix printf format, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 42/56] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 53/56] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 19/56] tests/tcg/x86_64: add Makefile.target,
Alex Bennée <=
- [Qemu-devel] [PULL 31/56] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 34/56] tests/tcg/alpha: add Alpha specific tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 32/56] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 56/56] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 24/56] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 45/56] tests/Makefile.include: add [build|clean|check]-tcg targets, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 46/56] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 11/56] tests/tcg/multiarch: enable additional linux-test tests, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 12/56] tests/tcg/multiarch: don't hard code paths/ports for linux-test, Alex Bennée, 2018/06/19
- [Qemu-devel] [PULL 33/56] tests/tcg: enable building for Alpha, Alex Bennée, 2018/06/19