[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/11] tests/tcg: add concept of container_hosts
From: |
Alex Bennée |
Subject: |
[PULL 03/11] tests/tcg: add concept of container_hosts |
Date: |
Tue, 6 Apr 2021 16:00:33 +0100 |
While docker is nominally multiarch these days it doesn't mean our
distros actually package all cross compilers for all architectures.
The upcoming Debian bullseye release will improve things further. At
least for now we can get things like the 32 bit ARM compiler on it's
64 bit cousin.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210401102530.12030-4-alex.bennee@linaro.org>
diff --git a/configure b/configure
index 8275df1506..4f374b4889 100755
--- a/configure
+++ b/configure
@@ -6299,7 +6299,7 @@ done
(for i in $cross_cc_vars; do
export $i
done
-export target_list source_path use_containers
+export target_list source_path use_containers ARCH
$source_path/tests/tcg/configure.sh)
# temporary config to build submodules
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index af4aecf14e..87a9f24b20 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -108,79 +108,98 @@ for target in $target_list; do
case $target in
aarch64-*)
# We don't have any bigendian build tools so we only use this for AArch64
+ container_hosts="x86_64 aarch64"
container_image=debian-arm64-test-cross
container_cross_cc=aarch64-linux-gnu-gcc-10
;;
alpha-*)
+ container_hosts=x86_64
container_image=debian-alpha-cross
container_cross_cc=alpha-linux-gnu-gcc
;;
arm-*)
# We don't have any bigendian build tools so we only use this for ARM
+ container_hosts="x86_64 aarch64"
container_image=debian-armhf-cross
container_cross_cc=arm-linux-gnueabihf-gcc
;;
cris-*)
+ container_hosts=x86_64
container_image=fedora-cris-cross
container_cross_cc=cris-linux-gnu-gcc
;;
hppa-*)
+ container_hosts=x86_64
container_image=debian-hppa-cross
container_cross_cc=hppa-linux-gnu-gcc
;;
i386-*)
+ container_hosts=x86_64
container_image=fedora-i386-cross
container_cross_cc=gcc
;;
m68k-*)
+ container_hosts=x86_64
container_image=debian-m68k-cross
container_cross_cc=m68k-linux-gnu-gcc
;;
mips64el-*)
+ container_hosts=x86_64
container_image=debian-mips64el-cross
container_cross_cc=mips64el-linux-gnuabi64-gcc
;;
mips64-*)
+ container_hosts=x86_64
container_image=debian-mips64-cross
container_cross_cc=mips64-linux-gnuabi64-gcc
;;
mipsel-*)
+ container_hosts=x86_64
container_image=debian-mipsel-cross
container_cross_cc=mipsel-linux-gnu-gcc
;;
mips-*)
+ container_hosts=x86_64
container_image=debian-mips-cross
container_cross_cc=mips-linux-gnu-gcc
;;
ppc-*|ppc64abi32-*)
+ container_hosts=x86_64
container_image=debian-powerpc-cross
container_cross_cc=powerpc-linux-gnu-gcc
;;
ppc64-*)
+ container_hosts=x86_64
container_image=debian-ppc64-cross
container_cross_cc=powerpc64-linux-gnu-gcc
;;
ppc64le-*)
+ container_hosts=x86_64
container_image=debian-ppc64el-cross
container_cross_cc=powerpc64le-linux-gnu-gcc
;;
riscv64-*)
+ container_hosts=x86_64
container_image=debian-riscv64-cross
container_cross_cc=riscv64-linux-gnu-gcc
;;
s390x-*)
+ container_hosts=x86_64
container_image=debian-s390x-cross
container_cross_cc=s390x-linux-gnu-gcc
;;
sh4-*)
+ container_hosts=x86_64
container_image=debian-sh4-cross
container_cross_cc=sh4-linux-gnu-gcc
;;
sparc64-*)
+ container_hosts=x86_64
container_image=debian-sparc64-cross
container_cross_cc=sparc64-linux-gnu-gcc
;;
xtensa*-softmmu)
+ container_hosts=x86_64
container_image=debian-xtensa-cross
# default to the dc232b cpu
@@ -265,7 +284,11 @@ for target in $target_list; do
done
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
+ for host in $container_hosts; do
+ if test "$host" = "$ARCH"; then
+ echo "DOCKER_IMAGE=$container_image" >> $config_target_mak
+ echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >>
$config_target_mak
+ fi
+ done
fi
done
--
2.20.1
- [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Alex Bennée, 2021/04/06
- [PULL 02/11] tests/docker: don't set DOCKER_REGISTRY on non-x86_64, Alex Bennée, 2021/04/06
- [PULL 08/11] docs/system/gdb.rst: Add some more heading structure, Alex Bennée, 2021/04/06
- [PULL 03/11] tests/tcg: add concept of container_hosts,
Alex Bennée <=
- [PULL 05/11] tests/tcg/i386: expand .data sections for system tests, Alex Bennée, 2021/04/06
- [PULL 01/11] tests/tcg: update the defaults for x86 compilers, Alex Bennée, 2021/04/06
- [PULL 10/11] gitlab-ci.yml: Fix the filtering for the git submodules, Alex Bennée, 2021/04/06
- [PULL 06/11] tests/tcg/i386: force -fno-pie for test-i386, Alex Bennée, 2021/04/06
- [PULL 04/11] tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers, Alex Bennée, 2021/04/06
- [PULL 11/11] gitlab-ci.yml: Test the dtrace backend in one of the jobs, Alex Bennée, 2021/04/06
- [PULL 09/11] docs/system/gdb.rst: Document how to debug multicore machines, Alex Bennée, 2021/04/06
- [PULL 07/11] tests/tcg: relax the next step precision of the gdb sha1 test, Alex Bennée, 2021/04/06
- Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub), Peter Maydell, 2021/04/06