From: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org
Subject: [PATCH v2 02/15] tests/tcg: Add docker_as and docker_ld cmds
Date: Thu, 4 Jun 2020 10:54:28 +0200 [thread overview]
Message-ID: <20200604085441.103087-3-kbastian@mail.uni-paderborn.de> (raw)
In-Reply-To: <20200604085441.103087-1-kbastian@mail.uni-paderborn.de>
At least for the TriCore target no easily available c compiler exists.
Thus we need to rely on "as" and "ld". This allows us to run them
through the docker image.
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
---
tests/tcg/Makefile.qemu | 11 +++++++++++
tests/tcg/configure.sh | 2 ++
2 files changed, 13 insertions(+)
diff --git a/tests/tcg/Makefile.qemu b/tests/tcg/Makefile.qemu
index 9c23aeaa2a..e5b3a4bacc 100644
--- a/tests/tcg/Makefile.qemu
+++ b/tests/tcg/Makefile.qemu
@@ -50,11 +50,22 @@ DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc \
-i qemu:$(DOCKER_IMAGE) \
-s $(SRC_PATH) -- "
+DOCKER_AS_CMD="$(DOCKER_SCRIPT) cc \
+ --cc $(DOCKER_CROSS_AS_GUEST) \
+ -i qemu:$(DOCKER_IMAGE) \
+ -s $(SRC_PATH) -- "
+
+DOCKER_LD_CMD="$(DOCKER_SCRIPT) cc \
+ --cc $(DOCKER_CROSS_LD_GUEST) \
+ -i qemu:$(DOCKER_IMAGE) \
+ -s $(SRC_PATH) -- "
+
.PHONY: docker-build-guest-tests
docker-build-guest-tests: docker-image-$(DOCKER_IMAGE)
$(call quiet-command, \
(mkdir -p tests/tcg/$(TARGET) && cd tests/tcg/$(TARGET) && \
$(MAKE) -f $(TCG_MAKE) TARGET="$(TARGET)" CC=$(DOCKER_COMPILE_CMD) \
+ AS=$(DOCKER_AS_CMD) LD=$(DOCKER_LD_CMD) \
SRC_PATH="$(SRC_PATH)" BUILD_STATIC=y \
EXTRA_CFLAGS="$(CROSS_CC_GUEST_CFLAGS)"), \
"BUILD","$(TARGET) guest-tests with docker qemu:$(DOCKER_IMAGE)")
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 2326f97856..6e8659d488 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -242,6 +242,8 @@ for target in $target_list; do
if test $got_cross_cc = no && test "$container" != no && test -n "$container_image"; then
echo "DOCKER_IMAGE=$container_image" >> $config_target_mak
echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> $config_target_mak
+ echo "DOCKER_CROSS_AS_GUEST=$container_cross_as" >> $config_target_mak
+ echo "DOCKER_CROSS_LD_GUEST=$container_cross_ld" >> $config_target_mak
fi
done
--
2.26.2
next prev parent reply other threads:[~2020-06-04 8:57 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-04 8:54 [PATCH v2 00/15] tests/tcg: Add TriCore tests Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 01/15] docker/tricore: Use stretch-slim as a base image Bastian Koppelmann
2020-06-04 15:41 ` Alex Bennée
2020-06-04 8:54 ` Bastian Koppelmann [this message]
2020-06-16 16:13 ` [PATCH v2 02/15] tests/tcg: Add docker_as and docker_ld cmds Alex Bennée
2020-06-04 8:54 ` [PATCH v2 03/15] tests/tcg: Run timeout cmds using --foreground Bastian Koppelmann
2020-06-16 16:22 ` Alex Bennée
2020-06-17 6:13 ` Bastian Koppelmann
2020-06-17 9:59 ` Alex Bennée
2020-06-17 10:52 ` Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 04/15] hw/tricore: Add testdevice for tests in tests/tcg/ Bastian Koppelmann
2020-06-16 17:07 ` Alex Bennée
2020-06-04 8:54 ` [PATCH v2 05/15] tests/tcg/tricore: Add build infrastructure Bastian Koppelmann
2020-06-16 17:22 ` Alex Bennée
2020-06-04 8:54 ` [PATCH v2 06/15] tests/tcg/tricore: Add macros to create tests and first test 'abs' Bastian Koppelmann
2020-06-16 17:28 ` Alex Bennée
2020-06-04 8:54 ` [PATCH v2 07/15] tests/tcg/tricore: Add bmerge test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 08/15] tests/tcg/tricore: Add clz test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 09/15] tests/tcg/tricore: Add dvstep test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 10/15] tests/tcg/tricore: Add fadd test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 11/15] tests/tcg/tricore: Add fmul test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 12/15] tests/tcg/tricore: Add ftoi test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 13/15] tests/tcg/tricore: Add madd test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 14/15] tests/tcg/tricore: Add msub test Bastian Koppelmann
2020-06-04 8:54 ` [PATCH v2 15/15] tests/tcg/tricore: Add muls test Bastian Koppelmann
2020-06-04 9:37 ` [PATCH v2 00/15] tests/tcg: Add TriCore tests no-reply
2020-06-16 17:29 ` Alex Bennée
2021-02-22 9:23 ` Thomas Huth
2021-02-23 10:25 ` Bastian Koppelmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200604085441.103087-3-kbastian@mail.uni-paderborn.de \
--to=kbastian@mail.uni-paderborn.de \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).