Il mar 11 ott 2022, 21:29 Alex Bennée <alex.ben...@linaro.org> ha scritto:
> This reverts commit 730fe750fba63023e294ff0acf0f874369f1946f.
>
> Unconditionally building all the bios for all arches was a little too
> far too fast.
>
I would like to understand the issue better, because chances are that it is
preexisting and applies to the TCG tests as well.
Daniel, does building the TCG tests work for you? If not, I think we should
just disable containers by default.
> Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Reviewed-by: Daniel Henrique Barboza <danielhb...@gmail.com>
> Tested-by: Daniel Henrique Barboza <danielhb...@gmail.com>
> Message-Id: <20221011113417.794841-4-alex.ben...@linaro.org>
>
> diff --git a/configure b/configure
> index baa69189f0..45ee6f4eb3 100755
> --- a/configure
> +++ b/configure
> @@ -2121,7 +2121,7 @@ probe_target_compiler() {
> target_ranlib=
> target_strip=
> fi
> - test -n "$target_cc" || test -n "$container_image"
> + test -n "$target_cc"
> }
>
> write_target_makefile() {
> @@ -2268,7 +2268,7 @@ if test "$targetos" != "darwin" && test "$targetos"
> != "sunos" && \
> config_mak=pc-bios/optionrom/config.mak
> echo "# Automatically generated by configure - do not modify" >
> $config_mak
> echo "TOPSRC_DIR=$source_path" >> $config_mak
> - write_target_makefile pc-bios/optionrom/all >> $config_mak
> + write_target_makefile >> $config_mak
> fi
>
> if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then
> @@ -2276,31 +2276,25 @@ if test "$softmmu" = yes && probe_target_compiler
> ppc-softmmu; then
> config_mak=pc-bios/vof/config.mak
> echo "# Automatically generated by configure - do not modify" >
> $config_mak
> echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak
> - write_target_makefile pc-bios/vof/all >> $config_mak
> + write_target_makefile >> $config_mak
> fi
>
> # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10
> # (which is the lowest architecture level that Clang supports)
> if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then
> - got_cross_cc=no
> - if test -n "$target_cc"; then
> - write_c_skeleton
> - do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c
> $TMPC
> - has_z900=$?
> - if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags
> -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then
> - if [ $has_z900 != 0 ]; then
> - echo "WARNING: Your compiler does not support the z900!"
> - echo " The s390-ccw bios will only work with guest CPUs
> >= z10."
> - fi
> - got_cross_cc=yes
> + write_c_skeleton
> + do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC
> + has_z900=$?
> + if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags
> -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then
> + if [ $has_z900 != 0 ]; then
> + echo "WARNING: Your compiler does not support the z900!"
> + echo " The s390-ccw bios will only work with guest CPUs >=
> z10."
> fi
> - fi
> - if test "$got_cross_cc" = yes || test -n "$container_image"; then
> roms="$roms pc-bios/s390-ccw"
> config_mak=pc-bios/s390-ccw/config-host.mak
> echo "# Automatically generated by configure - do not modify" >
> $config_mak
> echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak
> - write_target_makefile pc-bios/s390-ccw/all >> $config_mak
> + write_target_makefile >> $config_mak
> # SLOF is required for building the s390-ccw firmware on s390x,
> # since it is using the libnet code from SLOF for network booting.
> git_submodules="${git_submodules} roms/SLOF"
> @@ -2488,7 +2482,7 @@ for target in $target_list; do
> ;;
> esac
>
> - if probe_target_compiler $target; then
> + if probe_target_compiler $target || test -n "$container_image"; then
> test -n "$container_image" && build_static=y
> mkdir -p "tests/tcg/$target"
> config_target_mak=tests/tcg/$target/config-target.mak
> --
> 2.34.1
>
>
