mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: build ROMs with container-based cross compilers

Browse Source 
s390-ccw remains a bit more complex, because the -march=z900 test is done
only for the native cross compiler.  Otherwise, all that is needed is
to pass the (now mandatory) target argument to write_target_makefile.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220929114231.583801-29-alex.bennee@linaro.org>
This commit is contained in:
Paolo Bonzini 2022-09-29 12:42:08 +01:00 committed by Alex Bennée
parent c7022a703c
commit 730fe750fb
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configure vendored
View File

@ -2121,7 +2121,7 @@ probe_target_compiler() {
target_ranlib= target_ranlib=
target_strip= target_strip=
fi fi
test -n "$target_cc" test -n "$target_cc" || test -n "$container_image"
} }
write_target_makefile() { write_target_makefile() {
@ -2268,7 +2268,7 @@ if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
config_mak=pc-bios/optionrom/config.mak config_mak=pc-bios/optionrom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak echo "# Automatically generated by configure - do not modify" > $config_mak
echo "TOPSRC_DIR=$source_path" >> $config_mak echo "TOPSRC_DIR=$source_path" >> $config_mak
write_target_makefile >> $config_mak write_target_makefile pc-bios/optionrom/all >> $config_mak
fi fi
if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then
@ -2276,25 +2276,31 @@ if test "$softmmu" = yes && probe_target_compiler ppc-softmmu; then
config_mak=pc-bios/vof/config.mak config_mak=pc-bios/vof/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak
write_target_makefile >> $config_mak write_target_makefile pc-bios/vof/all >> $config_mak
fi fi
# Only build s390-ccw bios if the compiler has -march=z900 or -march=z10 # Only build s390-ccw bios if the compiler has -march=z900 or -march=z10
# (which is the lowest architecture level that Clang supports) # (which is the lowest architecture level that Clang supports)
if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then if test "$softmmu" = yes && probe_target_compiler s390x-softmmu; then
write_c_skeleton got_cross_cc=no
do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC if test -n "$target_cc"; then
has_z900=$? write_c_skeleton
if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC
if [ $has_z900 != 0 ]; then has_z900=$?
echo "WARNING: Your compiler does not support the z900!" if [ $has_z900 = 0 ] || do_compiler "$target_cc" $target_cc_cflags -march=z10 -msoft-float -Werror -o $TMPO -c $TMPC; then
echo " The s390-ccw bios will only work with guest CPUs >= z10." 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
fi fi
fi
if test "$got_cross_cc" = yes || test -n "$container_image"; then
roms="$roms pc-bios/s390-ccw" roms="$roms pc-bios/s390-ccw"
config_mak=pc-bios/s390-ccw/config-host.mak config_mak=pc-bios/s390-ccw/config-host.mak
echo "# Automatically generated by configure - do not modify" > $config_mak echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak
write_target_makefile >> $config_mak write_target_makefile pc-bios/s390-ccw/all >> $config_mak
# SLOF is required for building the s390-ccw firmware on s390x, # SLOF is required for building the s390-ccw firmware on s390x,
# since it is using the libnet code from SLOF for network booting. # since it is using the libnet code from SLOF for network booting.
git_submodules="${git_submodules} roms/SLOF" git_submodules="${git_submodules} roms/SLOF"
@ -2482,7 +2488,7 @@ for target in $target_list; do
;; ;;
esac esac
if probe_target_compiler $target || test -n "$container_image"; then if probe_target_compiler $target; then
test -n "$container_image" && build_static=y test -n "$container_image" && build_static=y
mkdir -p "tests/tcg/$target" mkdir -p "tests/tcg/$target"
config_target_mak=tests/tcg/$target/config-target.mak config_target_mak=tests/tcg/$target/config-target.mak