* [RFC PATCH 01/12] tests/tcg: merge configure.sh back into main configure script
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-29 14:18 ` [RFC PATCH 02/12] configure: add missing cross compiler fallbacks Paolo Bonzini
` (10 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
tests/tcg/configure.sh has a complicated story.
In the beginning its code ran as part of the creation of config-target.mak
files, and that is where it placed the information on the target compiler.
However, probing for the buildability of TCG tests required multiple
inclusions of config-target.mak in the _main_ Makefile (not in
Makefile.target, which took care of building the QEMU executables in
the pre-Meson era), which polluted the namespace.
Thus, it was moved to a separate directory. It created small config-*.mak
files in $(BUILD_DIR)/tests/tcg. Those were also included multiple
times, but at least they were small and manageable; this was also an
important step in disentangling the TCG tests from Makefile.target.
Since then, Meson has allowed the configure script to go on a diet.
A few compilation tests survive (mostly for sanitizers) but these days
it mostly takes care of command line parsing, looking for tools, and
setting up the environment for Meson to do its stuff.
It's time to extend configure with the capability to build for more
than just one target: not just tests, but also firmware. As a first
step, integrate all the logic to find cross compilers in the configure
script, and move tests/tcg/configure.sh back there (though as a
separate loop, not integrated in the one that generates target
configurations for Meson).
tests/tcg is actually very close to being buildable as a standalone
project, so I actually expect the compiler tests to move back to
tests/tcg, as a "configure" script of sorts which would run at Make
time after the docker images are built. The GCC tree has a similar idea
of doing only bare-bones tree-wide configuration and leaving the rest
for Make time.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 398 +++++++++++++++++++++++++++++++++++++++--
tests/Makefile.include | 1 -
tests/tcg/configure.sh | 376 --------------------------------------
3 files changed, 388 insertions(+), 387 deletions(-)
delete mode 100755 tests/tcg/configure.sh
diff --git a/configure b/configure
index e77b29b093..5d136492f8 100755
--- a/configure
+++ b/configure
@@ -109,6 +109,20 @@ error_exit() {
}
do_compiler() {
+ # Run the compiler, capturing its output to the log. First argument
+ # is compiler binary to execute.
+ local compiler="$1"
+ shift
+ if test -n "$BASH_VERSION"; then eval '
+ echo >>config.log "
+funcs: ${FUNCNAME[*]}
+lines: ${BASH_LINENO[*]}"
+ '; fi
+ echo $compiler "$@" >> config.log
+ $compiler "$@" >> config.log 2>&1 || return $?
+}
+
+do_compiler_werror() {
# Run the compiler, capturing its output to the log. First argument
# is compiler binary to execute.
compiler="$1"
@@ -142,15 +156,15 @@ lines: ${BASH_LINENO[*]}"
}
do_cc() {
- do_compiler "$cc" $CPU_CFLAGS "$@"
+ do_compiler_werror "$cc" $CPU_CFLAGS "$@"
}
do_cxx() {
- do_compiler "$cxx" $CPU_CFLAGS "$@"
+ do_compiler_werror "$cxx" $CPU_CFLAGS "$@"
}
do_objc() {
- do_compiler "$objcc" $CPU_CFLAGS "$@"
+ do_compiler_werror "$objcc" $CPU_CFLAGS "$@"
}
# Append $2 to the variable named $1, with space separation
@@ -347,11 +361,9 @@ for opt do
;;
--cross-cc-cflags-*) cc_arch=${opt#--cross-cc-cflags-}; cc_arch=${cc_arch%%=*}
eval "cross_cc_cflags_${cc_arch}=\$optarg"
- cross_cc_vars="$cross_cc_vars cross_cc_cflags_${cc_arch}"
;;
--cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*}
eval "cross_cc_${cc_arch}=\$optarg"
- cross_cc_vars="$cross_cc_vars cross_cc_${cc_arch}"
;;
esac
done
@@ -955,7 +967,6 @@ esac
if eval test -z "\${cross_cc_$cpu}"; then
eval "cross_cc_${cpu}=\$cc"
- cross_cc_vars="$cross_cc_vars cross_cc_${cpu}"
fi
default_target_list=""
@@ -1818,6 +1829,248 @@ case "$slirp" in
;;
esac
+##########################################
+# functions to probe cross compilers
+
+container="no"
+if test $use_containers = "yes"; then
+ if has "docker" || has "podman"; then
+ container=$($python $source_path/tests/docker/docker.py probe)
+ fi
+fi
+
+# cross compilers defaults, can be overridden with --cross-cc-ARCH
+: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"}
+: ${cross_cc_aarch64_be="$cross_cc_aarch64"}
+: ${cross_cc_cflags_aarch64_be="-mbig-endian"}
+: ${cross_cc_alpha="alpha-linux-gnu-gcc"}
+: ${cross_cc_arm="arm-linux-gnueabihf-gcc"}
+: ${cross_cc_cflags_armeb="-mbig-endian"}
+: ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"}
+: ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
+: ${cross_cc_hppa="hppa-linux-gnu-gcc"}
+: ${cross_cc_i386="i686-linux-gnu-gcc"}
+: ${cross_cc_cflags_i386="-m32"}
+: ${cross_cc_m68k="m68k-linux-gnu-gcc"}
+: ${cross_cc_microblaze="microblaze-linux-musl-gcc"}
+: ${cross_cc_mips64el="mips64el-linux-gnuabi64-gcc"}
+: ${cross_cc_mips64="mips64-linux-gnuabi64-gcc"}
+: ${cross_cc_mipsel="mipsel-linux-gnu-gcc"}
+: ${cross_cc_mips="mips-linux-gnu-gcc"}
+: ${cross_cc_nios2="nios2-linux-gnu-gcc"}
+: ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
+: ${cross_cc_cflags_ppc="-m32"}
+: ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
+: ${cross_cc_cflags_ppc64="-m64 -mbig-endian"}
+: ${cross_cc_ppc64le="$cross_cc_ppc64"}
+: ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"}
+: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"}
+: ${cross_cc_s390x="s390x-linux-gnu-gcc"}
+: ${cross_cc_sh4="sh4-linux-gnu-gcc"}
+: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
+: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"}
+: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"}
+: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"}
+: ${cross_cc_cflags_x86_64="-m64"}
+
+# tricore is special as it doesn't have a compiler
+: ${cross_as_tricore="tricore-as"}
+: ${cross_ld_tricore="tricore-ld"}
+
+probe_target_compiler() {
+ # reset all output variables
+ container_image=
+ container_hosts=
+ container_cross_cc=
+ container_cross_as=
+ container_cross_ld=
+ target_cc=
+ target_as=
+ target_ld=
+
+ case $1 in
+ aarch64) container_hosts="x86_64 aarch64" ;;
+ alpha) container_hosts=x86_64 ;;
+ arm) container_hosts="x86_64 aarch64" ;;
+ cris) container_hosts=x86_64 ;;
+ hexagon) container_hosts=x86_64 ;;
+ hppa) container_hosts=x86_64 ;;
+ i386) container_hosts=x86_64 ;;
+ m68k) container_hosts=x86_64 ;;
+ microblaze) container_hosts=x86_64 ;;
+ mips64el) container_hosts=x86_64 ;;
+ mips64) container_hosts=x86_64 ;;
+ mipsel) container_hosts=x86_64 ;;
+ mips) container_hosts=x86_64 ;;
+ nios2) container_hosts=x86_64 ;;
+ ppc) container_hosts=x86_64 ;;
+ ppc64|ppc64le) container_hosts=x86_64 ;;
+ riscv64) container_hosts=x86_64 ;;
+ s390x) container_hosts=x86_64 ;;
+ sh4) container_hosts=x86_64 ;;
+ sparc64) container_hosts=x86_64 ;;
+ tricore) container_hosts=x86_64 ;;
+ x86_64) container_hosts="aarch64 ppc64el x86_64" ;;
+ xtensa*) container_hosts=x86_64 ;;
+ esac
+
+ for host in $container_hosts; do
+ test "$container" != no || continue
+ test "$host" = "$cpu" || continue
+ case $1 in
+ aarch64)
+ # We don't have any bigendian build tools so we only use this for AArch64
+ container_image=debian-arm64-cross
+ container_cross_cc=aarch64-linux-gnu-gcc-10
+ ;;
+ alpha)
+ 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_image=debian-armhf-cross
+ container_cross_cc=arm-linux-gnueabihf-gcc
+ ;;
+ cris)
+ container_image=fedora-cris-cross
+ container_cross_cc=cris-linux-gnu-gcc
+ ;;
+ hexagon)
+ container_image=debian-hexagon-cross
+ container_cross_cc=hexagon-unknown-linux-musl-clang
+ ;;
+ hppa)
+ container_image=debian-hppa-cross
+ container_cross_cc=hppa-linux-gnu-gcc
+ ;;
+ i386)
+ container_image=fedora-i386-cross
+ container_cross_cc=gcc
+ ;;
+ m68k)
+ container_image=debian-m68k-cross
+ container_cross_cc=m68k-linux-gnu-gcc
+ ;;
+ microblaze)
+ container_image=debian-microblaze-cross
+ container_cross_cc=microblaze-linux-musl-gcc
+ ;;
+ mips64el)
+ container_image=debian-mips64el-cross
+ container_cross_cc=mips64el-linux-gnuabi64-gcc
+ ;;
+ mips64)
+ container_image=debian-mips64-cross
+ container_cross_cc=mips64-linux-gnuabi64-gcc
+ ;;
+ mipsel)
+ container_image=debian-mipsel-cross
+ container_cross_cc=mipsel-linux-gnu-gcc
+ ;;
+ mips)
+ container_image=debian-mips-cross
+ container_cross_cc=mips-linux-gnu-gcc
+ ;;
+ nios2)
+ container_image=debian-nios2-cross
+ container_cross_cc=nios2-linux-gnu-gcc
+ ;;
+ ppc)
+ container_image=debian-powerpc-test-cross
+ container_cross_cc=powerpc-linux-gnu-gcc-10
+ ;;
+ ppc64|ppc64le)
+ container_image=debian-powerpc-test-cross
+ container_cross_cc=powerpc${1#ppc}-linux-gnu-gcc-10
+ ;;
+ riscv64)
+ container_image=debian-riscv64-test-cross
+ container_cross_cc=riscv64-linux-gnu-gcc
+ ;;
+ s390x)
+ container_image=debian-s390x-cross
+ container_cross_cc=s390x-linux-gnu-gcc
+ ;;
+ sh4)
+ container_image=debian-sh4-cross
+ container_cross_cc=sh4-linux-gnu-gcc
+ ;;
+ sparc64)
+ container_image=debian-sparc64-cross
+ container_cross_cc=sparc64-linux-gnu-gcc
+ ;;
+ tricore)
+ container_image=debian-tricore-cross
+ container_cross_as=tricore-as
+ container_cross_ld=tricore-ld
+ ;;
+ x86_64)
+ container_image=debian-amd64-cross
+ container_cross_cc=x86_64-linux-gnu-gcc
+ ;;
+ xtensa*)
+ # FIXME: xtensa-linux-user?
+ container_hosts=x86_64
+ container_image=debian-xtensa-cross
+
+ # default to the dc232b cpu
+ container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc
+ ;;
+ esac
+ done
+
+ eval "target_cflags=\${cross_cc_cflags_$1}"
+ if eval test -n "\"\${cross_cc_$1}\""; then
+ if eval has "\"\${cross_cc_$1}\""; then
+ eval "target_cc=\"\${cross_cc_$1}\""
+ case $1 in
+ i386|x86_64)
+ if $target_cc --version | grep -qi "clang"; then
+ unset target_cc
+ fi
+ ;;
+ esac
+ fi
+ fi
+ if eval test -n "\"\${cross_as_$1}\""; then
+ if eval has "\"\${cross_as_$1}\""; then
+ eval "target_as=\"\${cross_as_$1}\""
+ fi
+ fi
+ if eval test -n "\"\${cross_ld_$1}\""; then
+ if eval has "\"\${cross_ld_$1}\""; then
+ eval "target_ld=\"\${cross_ld_$1}\""
+ fi
+ fi
+}
+
+write_target_makefile() {
+ if test -n "$target_cc"; then
+ echo "CC=$target_cc"
+ fi
+ if test -n "$target_as"; then
+ echo "AS=$target_as"
+ fi
+ if test -n "$target_ld"; then
+ echo "LD=$target_ld"
+ fi
+}
+
+write_container_target_makefile() {
+ if test -n "$container_cross_cc"; then
+ echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --"
+ fi
+ if test -n "$container_cross_as"; then
+ echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --"
+ fi
+ if test -n "$container_cross_ld"; then
+ echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --"
+ fi
+}
+
+
+
##########################################
# End of CC checks
# After here, no more $cc or $ld runs
@@ -2145,11 +2398,136 @@ for f in $LINKS ; do
fi
done
-(for i in $cross_cc_vars; do
- export $i
+# tests/tcg configuration
+(makefile=tests/tcg/Makefile.prereqs
+echo "# Automatically generated by configure - do not modify" > $makefile
+
+config_host_mak=tests/tcg/config-host.mak
+echo "# Automatically generated by configure - do not modify" > $config_host_mak
+echo "SRC_PATH=$source_path" >> $config_host_mak
+echo "HOST_CC=$host_cc" >> $config_host_mak
+
+tcg_tests_targets=
+for target in $target_list; do
+ arch=${target%%-*}
+
+ probe_target_compiler ${arch}
+ config_target_mak=tests/tcg/config-$target.mak
+
+ echo "# Automatically generated by configure - do not modify" > $config_target_mak
+ echo "TARGET_NAME=$arch" >> $config_target_mak
+ case $target in
+ *-softmmu)
+ test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || continue
+ qemu="qemu-system-$arch"
+ ;;
+ *-linux-user|*-bsd-user)
+ qemu="qemu-$arch"
+ ;;
+ esac
+
+ got_cross_cc=no
+ unset build_static
+
+ if test -n "$target_cc"; then
+ write_c_skeleton
+ if ! do_compiler "$target_cc" $target_cflags \
+ -o $TMPE $TMPC -static ; then
+ # For host systems we might get away with building without -static
+ if do_compiler "$target_cc" $target_cflags \
+ -o $TMPE $TMPC ; then
+ got_cross_cc=yes
+ fi
+ else
+ got_cross_cc=yes
+ build_static=y
+ fi
+ elif test -n "$target_as" && test -n "$target_ld"; then
+ # Special handling for assembler only tests
+ case $target in
+ tricore-softmmu) got_cross_cc=yes ;;
+ esac
+ fi
+
+ if test $got_cross_cc = yes; then
+ # Test for compiler features for optional tests. We only do this
+ # for cross compilers because ensuring the docker containers based
+ # compilers is a requirememt for adding a new test that needs a
+ # compiler feature.
+
+ echo "BUILD_STATIC=$build_static" >> $config_target_mak
+ write_target_makefile >> $config_target_mak
+ case $target in
+ aarch64-*)
+ if do_compiler "$target_cc" $target_cflags \
+ -march=armv8.1-a+sve -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
+ fi
+ if do_compiler "$target_cc" $target_cflags \
+ -march=armv8.1-a+sve2 -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak
+ fi
+ if do_compiler "$target_cc" $target_cflags \
+ -march=armv8.3-a -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak
+ fi
+ if do_compiler "$target_cc" $target_cflags \
+ -mbranch-protection=standard -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak
+ fi
+ if do_compiler "$target_cc" $target_cflags \
+ -march=armv8.5-a+memtag -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak
+ fi
+ ;;
+ ppc*)
+ if do_compiler "$target_cc" $target_cflags \
+ -mpower8-vector -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak
+ fi
+ if do_compiler "$target_cc" $target_cflags \
+ -mpower10 -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak
+ fi
+ ;;
+ i386-linux-user)
+ if do_compiler "$target_cc" $target_cflags \
+ -Werror -fno-pie -o $TMPE $TMPC; then
+ echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak
+ fi
+ ;;
+ esac
+ elif test -n "$container_image"; then
+ echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile
+ echo "BUILD_STATIC=y" >> $config_target_mak
+ write_container_target_makefile >> $config_target_mak
+ case $target in
+ aarch64-*)
+ echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
+ echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak
+ echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak
+ echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak
+ echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak
+ ;;
+ ppc*)
+ echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak
+ echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak
+ ;;
+ i386-linux-user)
+ echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak
+ ;;
+ esac
+ got_cross_cc=yes
+ fi
+ if test $got_cross_cc = yes; then
+ mkdir -p tests/tcg/$target
+ echo "QEMU=$PWD/$qemu" >> $config_target_mak
+ echo "EXTRA_CFLAGS=$target_cflags" >> $config_target_mak
+ echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile
+ tcg_tests_targets="$tcg_tests_targets $target"
+ fi
done
-export target_list source_path use_containers cpu host_cc
-$source_path/tests/tcg/configure.sh)
+echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile)
config_mak=pc-bios/optionrom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
diff --git a/tests/Makefile.include b/tests/Makefile.include
index ec84b2ebc0..bef96a775c 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -37,7 +37,6 @@ export SRC_PATH
SPEED = quick
-include tests/tcg/Makefile.prereqs
-config-host.mak: $(SRC_PATH)/tests/tcg/configure.sh
tests/tcg/Makefile.prereqs: config-host.mak
# Per guest TCG tests
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
deleted file mode 100755
index 691d90abac..0000000000
--- a/tests/tcg/configure.sh
+++ /dev/null
@@ -1,376 +0,0 @@
-#! /bin/sh
-
-if test -z "$source_path"; then
- echo Do not invoke this script directly. It is called
- echo automatically by configure.
- exit 1
-fi
-
-write_c_skeleton() {
- cat > $TMPC <<EOF
-int main(void) { return 0; }
-EOF
-}
-
-has() {
- command -v "$1" >/dev/null 2>&1
-}
-
-do_compiler() {
- # Run the compiler, capturing its output to the log. First argument
- # is compiler binary to execute.
- local compiler="$1"
- shift
- if test -n "$BASH_VERSION"; then eval '
- echo >>config.log "
-funcs: ${FUNCNAME[*]}
-lines: ${BASH_LINENO[*]}"
- '; fi
- echo $compiler "$@" >> config.log
- $compiler "$@" >> config.log 2>&1 || return $?
-}
-
-
-TMPDIR1="config-temp"
-TMPC="${TMPDIR1}/qemu-conf.c"
-TMPE="${TMPDIR1}/qemu-conf.exe"
-
-container="no"
-if test $use_containers = "yes"; then
- if has "docker" || has "podman"; then
- container=$($python $source_path/tests/docker/docker.py probe)
- fi
-fi
-
-# cross compilers defaults, can be overridden with --cross-cc-ARCH
-: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"}
-: ${cross_cc_aarch64_be="$cross_cc_aarch64"}
-: ${cross_cc_cflags_aarch64_be="-mbig-endian"}
-: ${cross_cc_alpha="alpha-linux-gnu-gcc"}
-: ${cross_cc_arm="arm-linux-gnueabihf-gcc"}
-: ${cross_cc_cflags_armeb="-mbig-endian"}
-: ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"}
-: ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
-: ${cross_cc_hppa="hppa-linux-gnu-gcc"}
-: ${cross_cc_i386="i686-linux-gnu-gcc"}
-: ${cross_cc_cflags_i386="-m32"}
-: ${cross_cc_m68k="m68k-linux-gnu-gcc"}
-: ${cross_cc_microblaze="microblaze-linux-musl-gcc"}
-: ${cross_cc_mips64el="mips64el-linux-gnuabi64-gcc"}
-: ${cross_cc_mips64="mips64-linux-gnuabi64-gcc"}
-: ${cross_cc_mipsel="mipsel-linux-gnu-gcc"}
-: ${cross_cc_mips="mips-linux-gnu-gcc"}
-: ${cross_cc_nios2="nios2-linux-gnu-gcc"}
-: ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
-: ${cross_cc_cflags_ppc="-m32"}
-: ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
-: ${cross_cc_cflags_ppc64="-m64 -mbig-endian"}
-: ${cross_cc_ppc64le="$cross_cc_ppc64"}
-: ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"}
-: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"}
-: ${cross_cc_s390x="s390x-linux-gnu-gcc"}
-: ${cross_cc_sh4="sh4-linux-gnu-gcc"}
-: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
-: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"}
-: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"}
-: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"}
-: ${cross_cc_cflags_x86_64="-m64"}
-
-# tricore is special as it doesn't have a compiler
-: ${cross_as_tricore="tricore-as"}
-: ${cross_ld_tricore="tricore-ld"}
-
-makefile=tests/tcg/Makefile.prereqs
-echo "# Automatically generated by configure - do not modify" > $makefile
-
-config_host_mak=tests/tcg/config-host.mak
-echo "# Automatically generated by configure - do not modify" > $config_host_mak
-echo "SRC_PATH=$source_path" >> $config_host_mak
-echo "HOST_CC=$host_cc" >> $config_host_mak
-
-tcg_tests_targets=
-for target in $target_list; do
- arch=${target%%-*}
-
- # reset all container fields
- container_image=
- container_hosts=
- container_cross_cc=
- container_cross_as=
- container_cross_ld=
-
- # suppress clang
- supress_clang=
-
- 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-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
- ;;
- hexagon-*)
- container_hosts=x86_64
- container_image=debian-hexagon-cross
- container_cross_cc=hexagon-unknown-linux-musl-clang
- ;;
- 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
- supress_clang=yes
- ;;
- m68k-*)
- container_hosts=x86_64
- container_image=debian-m68k-cross
- container_cross_cc=m68k-linux-gnu-gcc
- ;;
- microblaze-*)
- container_hosts=x86_64
- container_image=debian-microblaze-cross
- container_cross_cc=microblaze-linux-musl-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
- ;;
- nios2-*)
- container_hosts=x86_64
- container_image=debian-nios2-cross
- container_cross_cc=nios2-linux-gnu-gcc
- ;;
- ppc-*)
- container_hosts=x86_64
- container_image=debian-powerpc-test-cross
- container_cross_cc=powerpc-linux-gnu-gcc-10
- ;;
- ppc64-*|ppc64le-*)
- container_hosts=x86_64
- container_image=debian-powerpc-test-cross
- container_cross_cc=${target%%-*}-linux-gnu-gcc-10
- container_cross_cc=powerpc${container_cross_cc#ppc}
- ;;
- riscv64-*)
- container_hosts=x86_64
- container_image=debian-riscv64-test-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
- ;;
- tricore-softmmu)
- container_hosts=x86_64
- container_image=debian-tricore-cross
- container_cross_as=tricore-as
- container_cross_ld=tricore-ld
- ;;
- x86_64-*)
- container_hosts="aarch64 ppc64el x86_64"
- container_image=debian-amd64-cross
- container_cross_cc=x86_64-linux-gnu-gcc
- supress_clang=yes
- ;;
- xtensa*-softmmu)
- container_hosts=x86_64
- container_image=debian-xtensa-cross
-
- # default to the dc232b cpu
- container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc
- ;;
- esac
-
- config_target_mak=tests/tcg/config-$target.mak
-
- echo "# Automatically generated by configure - do not modify" > $config_target_mak
- echo "TARGET_NAME=$arch" >> $config_target_mak
- case $target in
- *-softmmu)
- test -f $source_path/tests/tcg/$arch/Makefile.softmmu-target || continue
- qemu="qemu-system-$arch"
- ;;
- *-linux-user|*-bsd-user)
- qemu="qemu-$arch"
- ;;
- esac
-
- eval "target_compiler_cflags=\${cross_cc_cflags_$arch}"
-
- got_cross_cc=no
-
- if eval test "x\"\${cross_cc_$arch}\"" != xyes; then
- eval "target_compiler=\"\${cross_cc_$arch}\""
-
- if has $target_compiler; then
- if test "$supress_clang" = yes &&
- $target_compiler --version | grep -qi "clang"; then
- got_cross_cc=no
- else
- write_c_skeleton
- if ! do_compiler "$target_compiler" $target_compiler_cflags \
- -o $TMPE $TMPC -static ; then
- # For host systems we might get away with building without -static
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -o $TMPE $TMPC ; then
- got_cross_cc=yes
- echo "CC=$target_compiler" >> $config_target_mak
- fi
- else
- got_cross_cc=yes
- echo "BUILD_STATIC=y" >> $config_target_mak
- echo "CC=$target_compiler" >> $config_target_mak
- fi
- fi
- fi
-
- # Special handling for assembler only tests
- eval "target_as=\"\${cross_as_$arch}\""
- eval "target_ld=\"\${cross_ld_$arch}\""
- if has $target_as && has $target_ld; then
- case $target in
- tricore-softmmu)
- echo "AS=$target_as" >> $config_target_mak
- echo "LD=$target_ld" >> $config_target_mak
- got_cross_cc=yes
- ;;
- esac
- fi
- fi
-
- if test $got_cross_cc = yes; then
- # Test for compiler features for optional tests. We only do this
- # for cross compilers because ensuring the docker containers based
- # compilers is a requirememt for adding a new test that needs a
- # compiler feature.
-
- case $target in
- aarch64-*)
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -march=armv8.1-a+sve -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
- fi
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -march=armv8.1-a+sve2 -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak
- fi
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -march=armv8.3-a -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak
- fi
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -mbranch-protection=standard -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak
- fi
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -march=armv8.5-a+memtag -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak
- fi
- ;;
- ppc*)
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -mpower8-vector -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak
- fi
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -mpower10 -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak
- fi
- ;;
- i386-linux-user)
- if do_compiler "$target_compiler" $target_compiler_cflags \
- -Werror -fno-pie -o $TMPE $TMPC; then
- echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak
- fi
- ;;
- esac
- elif test $got_cross_cc = no && test "$container" != no && \
- test -n "$container_image"; then
- for host in $container_hosts; do
- if test "$host" = "$cpu"; then
- echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile
- echo "BUILD_STATIC=y" >> $config_target_mak
- echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --" >> $config_target_mak
- if test -n "$container_cross_as"; then
- echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --" >> $config_target_mak
- fi
- if test -n "$container_cross_ld"; then
- echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --" >> $config_target_mak
- fi
- case $target in
- aarch64-*)
- echo "CROSS_CC_HAS_SVE=y" >> $config_target_mak
- echo "CROSS_CC_HAS_SVE2=y" >> $config_target_mak
- echo "CROSS_CC_HAS_ARMV8_3=y" >> $config_target_mak
- echo "CROSS_CC_HAS_ARMV8_BTI=y" >> $config_target_mak
- echo "CROSS_CC_HAS_ARMV8_MTE=y" >> $config_target_mak
- ;;
- ppc*)
- echo "CROSS_CC_HAS_POWER8_VECTOR=y" >> $config_target_mak
- echo "CROSS_CC_HAS_POWER10=y" >> $config_target_mak
- ;;
- i386-linux-user)
- echo "CROSS_CC_HAS_I386_NOPIE=y" >> $config_target_mak
- ;;
- esac
- got_cross_cc=yes
- break
- fi
- done
- fi
- if test $got_cross_cc = yes; then
- mkdir -p tests/tcg/$target
- echo "QEMU=$PWD/$qemu" >> $config_target_mak
- echo "EXTRA_CFLAGS=$target_compiler_cflags" >> $config_target_mak
- echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile
- tcg_tests_targets="$tcg_tests_targets $target"
- fi
-done
-echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [RFC PATCH 02/12] configure: add missing cross compiler fallbacks
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
2022-04-29 14:18 ` [RFC PATCH 01/12] tests/tcg: merge configure.sh back into main configure script Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:35 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 03/12] configure: handle host compiler in probe_target_compiler Paolo Bonzini
` (9 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
The arm compiler can be used for armeb, and the sparc64 compiler
can be used for sparc.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 5d136492f8..a208459ff1 100755
--- a/configure
+++ b/configure
@@ -1845,6 +1845,7 @@ fi
: ${cross_cc_cflags_aarch64_be="-mbig-endian"}
: ${cross_cc_alpha="alpha-linux-gnu-gcc"}
: ${cross_cc_arm="arm-linux-gnueabihf-gcc"}
+: ${cross_cc_armeb="$cross_cc_arm"}
: ${cross_cc_cflags_armeb="-mbig-endian"}
: ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"}
: ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
@@ -1867,9 +1868,10 @@ fi
: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"}
: ${cross_cc_s390x="s390x-linux-gnu-gcc"}
: ${cross_cc_sh4="sh4-linux-gnu-gcc"}
-: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"}
: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"}
+: ${cross_cc_sparc="$cross_cc_sparc64"}
+: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"}
: ${cross_cc_cflags_x86_64="-m64"}
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 02/12] configure: add missing cross compiler fallbacks
2022-04-29 14:18 ` [RFC PATCH 02/12] configure: add missing cross compiler fallbacks Paolo Bonzini
@ 2022-04-30 19:35 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 19:35 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> -: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
> : ${cross_cc_sparc64="sparc64-linux-gnu-gcc"}
> : ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"}
> +: ${cross_cc_sparc="$cross_cc_sparc64"}
> +: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
We don't want v8plus for pure sparc32.
OTOH this patch is just moves the line, so
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
But this is definitely an error.
Probably -msupersparc is the best we can do for -m32.
r~
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 03/12] configure: handle host compiler in probe_target_compiler
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
2022-04-29 14:18 ` [RFC PATCH 01/12] tests/tcg: merge configure.sh back into main configure script Paolo Bonzini
2022-04-29 14:18 ` [RFC PATCH 02/12] configure: add missing cross compiler fallbacks Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-29 14:18 ` [RFC PATCH 04/12] configure: introduce --cross-prefix-*= Paolo Bonzini
` (8 subsequent siblings)
11 siblings, 0 replies; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
In preparation for handling more binaries than just cc, handle
the case of "probe_target_compiler $cpu" directly in the function,
setting the target_* variables based on the ones that are used to
build QEMU. The clang check also needs to be moved after this
fallback.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index a208459ff1..5277ac9092 100755
--- a/configure
+++ b/configure
@@ -965,10 +965,6 @@ case $git_submodules_action in
;;
esac
-if eval test -z "\${cross_cc_$cpu}"; then
- eval "cross_cc_${cpu}=\$cc"
-fi
-
default_target_list=""
mak_wilds=""
@@ -2026,13 +2022,6 @@ probe_target_compiler() {
if eval test -n "\"\${cross_cc_$1}\""; then
if eval has "\"\${cross_cc_$1}\""; then
eval "target_cc=\"\${cross_cc_$1}\""
- case $1 in
- i386|x86_64)
- if $target_cc --version | grep -qi "clang"; then
- unset target_cc
- fi
- ;;
- esac
fi
fi
if eval test -n "\"\${cross_as_$1}\""; then
@@ -2045,6 +2034,20 @@ probe_target_compiler() {
eval "target_ld=\"\${cross_ld_$1}\""
fi
fi
+ if test "$1" = $cpu; then
+ : ${target_cc:=$cc}
+ : ${target_as:=$as}
+ : ${target_ld:=$ld}
+ fi
+ if test -n "$target_cc"; then
+ case $1 in
+ i386|x86_64)
+ if $target_cc --version | grep -qi "clang"; then
+ unset target_cc
+ fi
+ ;;
+ esac
+ fi
}
write_target_makefile() {
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [RFC PATCH 04/12] configure: introduce --cross-prefix-*=
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (2 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 03/12] configure: handle host compiler in probe_target_compiler Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:42 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 05/12] configure: include more binutils in tests/tcg makefile Paolo Bonzini
` (7 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Also in preparation for handling more binaries from the cross binutils,
support an option --cross-prefix-ARCH. All cross_cc_* defaults are
replaced with cross_prefix_*; the cross_cc_* fallbacks are extended
to the cross-compilation prefix, but the compiler fallbacks remain
as well. This way, for example, --cross-cc-arm=arm-linux-gnueabihf-clang
also applies to armeb binaries.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 137 ++++++++++++++++++++++++++++++------------------------
1 file changed, 77 insertions(+), 60 deletions(-)
diff --git a/configure b/configure
index 5277ac9092..c05eeb6a74 100755
--- a/configure
+++ b/configure
@@ -365,6 +365,11 @@ for opt do
--cross-cc-*) cc_arch=${opt#--cross-cc-}; cc_arch=${cc_arch%%=*}
eval "cross_cc_${cc_arch}=\$optarg"
;;
+ --cross-prefix-*[!a-zA-Z0-9_-]*=*) error_exit "Passed bad --cross-prefix-FOO option"
+ ;;
+ --cross-prefix-*) cc_arch=${opt#--cross-prefix-}; cc_arch=${cc_arch%%=*}
+ eval "cross_prefix_${cc_arch}=\$optarg"
+ ;;
esac
done
# OS specific
@@ -731,6 +736,8 @@ for opt do
;;
--cross-cc-*)
;;
+ --cross-prefix-*)
+ ;;
--enable-debug-info) meson_option_add -Ddebug=true
;;
--disable-debug-info) meson_option_add -Ddebug=false
@@ -1027,6 +1034,7 @@ Advanced options (experts only):
--extra-ldflags=LDFLAGS append extra linker flags LDFLAGS
--cross-cc-ARCH=CC use compiler when building ARCH guest test cases
--cross-cc-cflags-ARCH= use compiler flags when building ARCH guest tests
+ --cross-prefix-ARCH=PREFIX cross compiler prefix when building ARCH guest test cases
--make=MAKE use specified make [$make]
--python=PYTHON use specified python [$python]
--meson=MESON use specified meson [$meson]
@@ -1836,44 +1844,54 @@ if test $use_containers = "yes"; then
fi
# cross compilers defaults, can be overridden with --cross-cc-ARCH
-: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"}
+: ${cross_prefix_aarch64="aarch64-linux-gnu-"}
+: ${cross_prefix_aarch64_be="$cross_prefix_aarch64"}
+: ${cross_prefix_alpha="alpha-linux-gnu-"}
+: ${cross_prefix_arm="arm-linux-gnueabihf-"}
+: ${cross_prefix_armeb="$cross_prefix_arm"}
+: ${cross_prefix_hexagon="hexagon-unknown-linux-musl-"}
+: ${cross_prefix_hppa="hppa-linux-gnu-"}
+: ${cross_prefix_i386="i686-linux-gnu-"}
+: ${cross_prefix_m68k="m68k-linux-gnu-"}
+: ${cross_prefix_microblaze="microblaze-linux-musl-"}
+: ${cross_prefix_mips64el="mips64el-linux-gnuabi64-"}
+: ${cross_prefix_mips64="mips64-linux-gnuabi64-"}
+: ${cross_prefix_mipsel="mipsel-linux-gnu-"}
+: ${cross_prefix_mips="mips-linux-gnu-"}
+: ${cross_prefix_nios2="nios2-linux-gnu-"}
+: ${cross_prefix_ppc="powerpc-linux-gnu-"}
+: ${cross_prefix_ppc64="powerpc64-linux-gnu-"}
+: ${cross_prefix_ppc64le="$cross_prefix_ppc64-"}
+: ${cross_prefix_riscv64="riscv64-linux-gnu-"}
+: ${cross_prefix_s390x="s390x-linux-gnu-"}
+: ${cross_prefix_sh4="sh4-linux-gnu-"}
+: ${cross_prefix_sparc64="sparc64-linux-gnu-"}
+: ${cross_prefix_sparc64="sparc64-linux-gnu-"}
+: ${cross_prefix_x86_64="x86_64-linux-gnu-"}
+
: ${cross_cc_aarch64_be="$cross_cc_aarch64"}
: ${cross_cc_cflags_aarch64_be="-mbig-endian"}
-: ${cross_cc_alpha="alpha-linux-gnu-gcc"}
-: ${cross_cc_arm="arm-linux-gnueabihf-gcc"}
: ${cross_cc_armeb="$cross_cc_arm"}
: ${cross_cc_cflags_armeb="-mbig-endian"}
: ${cross_cc_hexagon="hexagon-unknown-linux-musl-clang"}
: ${cross_cc_cflags_hexagon="-mv67 -O2 -static"}
-: ${cross_cc_hppa="hppa-linux-gnu-gcc"}
-: ${cross_cc_i386="i686-linux-gnu-gcc"}
: ${cross_cc_cflags_i386="-m32"}
-: ${cross_cc_m68k="m68k-linux-gnu-gcc"}
-: ${cross_cc_microblaze="microblaze-linux-musl-gcc"}
-: ${cross_cc_mips64el="mips64el-linux-gnuabi64-gcc"}
-: ${cross_cc_mips64="mips64-linux-gnuabi64-gcc"}
-: ${cross_cc_mipsel="mipsel-linux-gnu-gcc"}
-: ${cross_cc_mips="mips-linux-gnu-gcc"}
-: ${cross_cc_nios2="nios2-linux-gnu-gcc"}
-: ${cross_cc_ppc="powerpc-linux-gnu-gcc"}
: ${cross_cc_cflags_ppc="-m32"}
-: ${cross_cc_ppc64="powerpc64-linux-gnu-gcc"}
: ${cross_cc_cflags_ppc64="-m64 -mbig-endian"}
: ${cross_cc_ppc64le="$cross_cc_ppc64"}
: ${cross_cc_cflags_ppc64le="-m64 -mlittle-endian"}
-: ${cross_cc_riscv64="riscv64-linux-gnu-gcc"}
-: ${cross_cc_s390x="s390x-linux-gnu-gcc"}
-: ${cross_cc_sh4="sh4-linux-gnu-gcc"}
-: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"}
: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"}
: ${cross_cc_sparc="$cross_cc_sparc64"}
: ${cross_cc_cflags_sparc="-m32 -mv8plus -mcpu=ultrasparc"}
-: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"}
: ${cross_cc_cflags_x86_64="-m64"}
-# tricore is special as it doesn't have a compiler
-: ${cross_as_tricore="tricore-as"}
-: ${cross_ld_tricore="tricore-ld"}
+compute_target_variable() {
+ if eval test -n "\"\${cross_prefix_$1}\""; then
+ if eval has "\"\${cross_prefix_$1}\$3\""; then
+ eval "$2=\"\${cross_prefix_$1}\$3\""
+ fi
+ fi
+}
probe_target_compiler() {
# reset all output variables
@@ -1919,93 +1937,99 @@ probe_target_compiler() {
aarch64)
# We don't have any bigendian build tools so we only use this for AArch64
container_image=debian-arm64-cross
- container_cross_cc=aarch64-linux-gnu-gcc-10
+ container_cross_prefix=aarch64-linux-gnu-
+ container_cross_cc=${container_cross_prefix}gcc-10
;;
alpha)
container_image=debian-alpha-cross
- container_cross_cc=alpha-linux-gnu-gcc
+ container_cross_prefix=alpha-linux-gnu-
;;
arm)
# We don't have any bigendian build tools so we only use this for ARM
container_image=debian-armhf-cross
- container_cross_cc=arm-linux-gnueabihf-gcc
+ container_cross_prefix=arm-linux-gnueabihf-
;;
cris)
container_image=fedora-cris-cross
- container_cross_cc=cris-linux-gnu-gcc
+ container_cross_prefix=cris-linux-gnu-
;;
hexagon)
container_image=debian-hexagon-cross
- container_cross_cc=hexagon-unknown-linux-musl-clang
+ container_cross_prefix=hexagon-unknown-linux-musl-
+ container_cross_cc=${container_cross_prefix}clang
;;
hppa)
container_image=debian-hppa-cross
- container_cross_cc=hppa-linux-gnu-gcc
+ container_cross_prefix=hppa-linux-gnu-
;;
i386)
container_image=fedora-i386-cross
- container_cross_cc=gcc
+ container_cross_prefix=
;;
m68k)
container_image=debian-m68k-cross
- container_cross_cc=m68k-linux-gnu-gcc
+ container_cross_prefix=m68k-linux-gnu-
;;
microblaze)
container_image=debian-microblaze-cross
- container_cross_cc=microblaze-linux-musl-gcc
+ container_cross_prefix=microblaze-linux-musl-
;;
mips64el)
container_image=debian-mips64el-cross
- container_cross_cc=mips64el-linux-gnuabi64-gcc
+ container_cross_prefix=mips64el-linux-gnuabi64-
;;
mips64)
container_image=debian-mips64-cross
- container_cross_cc=mips64-linux-gnuabi64-gcc
+ container_cross_prefix=mips64-linux-gnuabi64-
;;
mipsel)
container_image=debian-mipsel-cross
- container_cross_cc=mipsel-linux-gnu-gcc
+ container_cross_prefix=mipsel-linux-gnu-
;;
mips)
container_image=debian-mips-cross
- container_cross_cc=mips-linux-gnu-gcc
+ container_cross_prefix=mips-linux-gnu-
;;
nios2)
container_image=debian-nios2-cross
- container_cross_cc=nios2-linux-gnu-gcc
+ container_cross_prefix=nios2-linux-gnu-
;;
ppc)
container_image=debian-powerpc-test-cross
- container_cross_cc=powerpc-linux-gnu-gcc-10
+ container_cross_prefix=powerpc-linux-gnu-
+ container_cross_cc=${container_cross_prefix}gcc-10
;;
ppc64|ppc64le)
container_image=debian-powerpc-test-cross
- container_cross_cc=powerpc${1#ppc}-linux-gnu-gcc-10
+ container_cross_prefix=powerpc${1#ppc}-linux-gnu-
+ container_cross_cc=${container_cross_prefix}gcc-10
;;
riscv64)
container_image=debian-riscv64-test-cross
- container_cross_cc=riscv64-linux-gnu-gcc
+ container_cross_prefix=riscv64-linux-gnu-
;;
s390x)
container_image=debian-s390x-cross
- container_cross_cc=s390x-linux-gnu-gcc
+ container_cross_prefix=s390x-linux-gnu-
;;
sh4)
container_image=debian-sh4-cross
- container_cross_cc=sh4-linux-gnu-gcc
+ container_cross_prefix=sh4-linux-gnu-
;;
sparc64)
container_image=debian-sparc64-cross
- container_cross_cc=sparc64-linux-gnu-gcc
+ container_cross_prefix=sparc64-linux-gnu-
;;
tricore)
container_image=debian-tricore-cross
+ container_cross_prefix=tricore-
container_cross_as=tricore-as
container_cross_ld=tricore-ld
+ break
;;
x86_64)
container_image=debian-amd64-cross
- container_cross_cc=x86_64-linux-gnu-gcc
+ container_cross_prefix=x86_64-linux-gnu-
;;
xtensa*)
# FIXME: xtensa-linux-user?
@@ -2013,9 +2037,12 @@ probe_target_compiler() {
container_image=debian-xtensa-cross
# default to the dc232b cpu
- container_cross_cc=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc
+ container_cross_prefix=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-
;;
esac
+ : ${container_cross_cc:=${container_cross_prefix}gcc}
+ : ${container_cross_as:=${container_cross_prefix}as}
+ : ${container_cross_ld:=${container_cross_prefix}ld}
done
eval "target_cflags=\${cross_cc_cflags_$1}"
@@ -2023,17 +2050,11 @@ probe_target_compiler() {
if eval has "\"\${cross_cc_$1}\""; then
eval "target_cc=\"\${cross_cc_$1}\""
fi
+ else
+ compute_target_variable $1 target_cc gcc
fi
- if eval test -n "\"\${cross_as_$1}\""; then
- if eval has "\"\${cross_as_$1}\""; then
- eval "target_as=\"\${cross_as_$1}\""
- fi
- fi
- if eval test -n "\"\${cross_ld_$1}\""; then
- if eval has "\"\${cross_ld_$1}\""; then
- eval "target_ld=\"\${cross_ld_$1}\""
- fi
- fi
+ compute_target_variable $1 target_as as
+ compute_target_variable $1 target_ld ld
if test "$1" = $cpu; then
: ${target_cc:=$cc}
: ${target_as:=$as}
@@ -2066,12 +2087,8 @@ write_container_target_makefile() {
if test -n "$container_cross_cc"; then
echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --"
fi
- if test -n "$container_cross_as"; then
- echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --"
- fi
- if test -n "$container_cross_ld"; then
- echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --"
- fi
+ echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --"
+ echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --"
}
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 04/12] configure: introduce --cross-prefix-*=
2022-04-29 14:18 ` [RFC PATCH 04/12] configure: introduce --cross-prefix-*= Paolo Bonzini
@ 2022-04-30 19:42 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 19:42 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> # cross compilers defaults, can be overridden with --cross-cc-ARCH
> -: ${cross_cc_aarch64="aarch64-linux-gnu-gcc"}
> +: ${cross_prefix_aarch64="aarch64-linux-gnu-"}
> +: ${cross_prefix_aarch64_be="$cross_prefix_aarch64"}
> +: ${cross_prefix_alpha="alpha-linux-gnu-"}
> +: ${cross_prefix_arm="arm-linux-gnueabihf-"}
> +: ${cross_prefix_armeb="$cross_prefix_arm"}
> +: ${cross_prefix_hexagon="hexagon-unknown-linux-musl-"}
> +: ${cross_prefix_hppa="hppa-linux-gnu-"}
> +: ${cross_prefix_i386="i686-linux-gnu-"}
> +: ${cross_prefix_m68k="m68k-linux-gnu-"}
> +: ${cross_prefix_microblaze="microblaze-linux-musl-"}
> +: ${cross_prefix_mips64el="mips64el-linux-gnuabi64-"}
> +: ${cross_prefix_mips64="mips64-linux-gnuabi64-"}
> +: ${cross_prefix_mipsel="mipsel-linux-gnu-"}
> +: ${cross_prefix_mips="mips-linux-gnu-"}
> +: ${cross_prefix_nios2="nios2-linux-gnu-"}
> +: ${cross_prefix_ppc="powerpc-linux-gnu-"}
> +: ${cross_prefix_ppc64="powerpc64-linux-gnu-"}
> +: ${cross_prefix_ppc64le="$cross_prefix_ppc64-"}
> +: ${cross_prefix_riscv64="riscv64-linux-gnu-"}
> +: ${cross_prefix_s390x="s390x-linux-gnu-"}
> +: ${cross_prefix_sh4="sh4-linux-gnu-"}
> +: ${cross_prefix_sparc64="sparc64-linux-gnu-"}
> +: ${cross_prefix_sparc64="sparc64-linux-gnu-"}
> +: ${cross_prefix_x86_64="x86_64-linux-gnu-"}
sparc64 listed twice -- was this intended to be sparc(32)?
Otherwise,
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 05/12] configure: include more binutils in tests/tcg makefile
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (3 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 04/12] configure: introduce --cross-prefix-*= Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:44 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson Paolo Bonzini
` (6 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Firmware builds require paths to all the binutils; it is not enough to
use only cc, or even as/ld as in the case of tests/tcg/tricore.
Adjust the cross-compiler configurator to detect also ar, nm, objcopy,
ranlib and strip.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/configure b/configure
index c05eeb6a74..8626989239 100755
--- a/configure
+++ b/configure
@@ -1898,11 +1898,21 @@ probe_target_compiler() {
container_image=
container_hosts=
container_cross_cc=
+ container_cross_ar=
container_cross_as=
container_cross_ld=
+ container_cross_nm=
+ container_cross_objcopy=
+ container_cross_ranlib=
+ container_cross_strip=
target_cc=
+ target_ar=
target_as=
target_ld=
+ target_nm=
+ target_objcopy=
+ target_ranlib=
+ target_strip=
case $1 in
aarch64) container_hosts="x86_64 aarch64" ;;
@@ -2041,8 +2051,13 @@ probe_target_compiler() {
;;
esac
: ${container_cross_cc:=${container_cross_prefix}gcc}
+ : ${container_cross_ar:=${container_cross_prefix}ar}
: ${container_cross_as:=${container_cross_prefix}as}
: ${container_cross_ld:=${container_cross_prefix}ld}
+ : ${container_cross_nm:=${container_cross_prefix}nm}
+ : ${container_cross_objcopy:=${container_cross_prefix}objcopy}
+ : ${container_cross_ranlib:=${container_cross_prefix}ranlib}
+ : ${container_cross_strip:=${container_cross_prefix}strip}
done
eval "target_cflags=\${cross_cc_cflags_$1}"
@@ -2053,12 +2068,26 @@ probe_target_compiler() {
else
compute_target_variable $1 target_cc gcc
fi
+ target_ccas=$target_cc
+ compute_target_variable $1 target_ar ar
compute_target_variable $1 target_as as
compute_target_variable $1 target_ld ld
+ compute_target_variable $1 target_nm nm
+ compute_target_variable $1 target_objcopy objcopy
+ compute_target_variable $1 target_ranlib ranlib
+ compute_target_variable $1 target_strip strip
if test "$1" = $cpu; then
: ${target_cc:=$cc}
+ : ${target_ccas:=$ccas}
: ${target_as:=$as}
: ${target_ld:=$ld}
+ : ${target_ar:=$ar}
+ : ${target_as:=$as}
+ : ${target_ld:=$ld}
+ : ${target_nm:=$nm}
+ : ${target_objcopy:=$objcopy}
+ : ${target_ranlib:=$ranlib}
+ : ${target_strip:=$strip}
fi
if test -n "$target_cc"; then
case $1 in
@@ -2074,6 +2103,10 @@ probe_target_compiler() {
write_target_makefile() {
if test -n "$target_cc"; then
echo "CC=$target_cc"
+ echo "CCAS=$target_ccas"
+ fi
+ if test -n "$target_ar"; then
+ echo "AR=$target_ar"
fi
if test -n "$target_as"; then
echo "AS=$target_as"
@@ -2081,14 +2114,32 @@ write_target_makefile() {
if test -n "$target_ld"; then
echo "LD=$target_ld"
fi
+ if test -n "$target_nm"; then
+ echo "NM=$target_nm"
+ fi
+ if test -n "$target_objcopy"; then
+ echo "OBJCOPY=$target_objcopy"
+ fi
+ if test -n "$target_ranlib"; then
+ echo "RANLIB=$target_ranlib"
+ fi
+ if test -n "$target_strip"; then
+ echo "STRIP=$target_strip"
+ fi
}
write_container_target_makefile() {
if test -n "$container_cross_cc"; then
echo "CC=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --"
+ echo "CCAS=\$(DOCKER_SCRIPT) cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --"
fi
+ echo "AR=\$(DOCKER_SCRIPT) cc --cc $container_cross_ar -i qemu/$container_image -s $source_path --"
echo "AS=\$(DOCKER_SCRIPT) cc --cc $container_cross_as -i qemu/$container_image -s $source_path --"
echo "LD=\$(DOCKER_SCRIPT) cc --cc $container_cross_ld -i qemu/$container_image -s $source_path --"
+ echo "NM=\$(DOCKER_SCRIPT) cc --cc $container_cross_nm -i qemu/$container_image -s $source_path --"
+ echo "OBJCOPY=\$(DOCKER_SCRIPT) cc --cc $container_cross_objcopy -i qemu/$container_image -s $source_path --"
+ echo "RANLIB=\$(DOCKER_SCRIPT) cc --cc $container_cross_ranlib -i qemu/$container_image -s $source_path --"
+ echo "STRIP=\$(DOCKER_SCRIPT) cc --cc $container_cross_strip -i qemu/$container_image -s $source_path --"
}
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 05/12] configure: include more binutils in tests/tcg makefile
2022-04-29 14:18 ` [RFC PATCH 05/12] configure: include more binutils in tests/tcg makefile Paolo Bonzini
@ 2022-04-30 19:44 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 19:44 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> Firmware builds require paths to all the binutils; it is not enough to
> use only cc, or even as/ld as in the case of tests/tcg/tricore.
> Adjust the cross-compiler configurator to detect also ar, nm, objcopy,
> ranlib and strip.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> configure | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 51 insertions(+)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (4 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 05/12] configure: include more binutils in tests/tcg makefile Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:48 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 07/12] configure: move symlink configuration earlier Paolo Bonzini
` (5 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
This is useful because pc-bios/meson.build already has a list of all ROM
files, and thus does not need to use wildcards. The problems with
wildcards are mentioned above the definition of the LINKS variable,
but then the recommendation is disattended.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 15 ---------------
pc-bios/meson.build | 18 +++++++++++++-----
tests/Makefile.include | 2 +-
3 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/configure b/configure
index 8626989239..bdb0cc35a8 100755
--- a/configure
+++ b/configure
@@ -2449,21 +2449,6 @@ LINKS="$LINKS tests/avocado tests/data"
LINKS="$LINKS tests/qemu-iotests/check"
LINKS="$LINKS python"
LINKS="$LINKS contrib/plugins/Makefile "
-for bios_file in \
- $source_path/pc-bios/*.bin \
- $source_path/pc-bios/*.elf \
- $source_path/pc-bios/*.lid \
- $source_path/pc-bios/*.rom \
- $source_path/pc-bios/*.dtb \
- $source_path/pc-bios/*.img \
- $source_path/pc-bios/openbios-* \
- $source_path/pc-bios/u-boot.* \
- $source_path/pc-bios/palcode-* \
- $source_path/pc-bios/qemu_vga.ndrv
-
-do
- LINKS="$LINKS pc-bios/$(basename $bios_file)"
-done
for f in $LINKS ; do
if [ -e "$source_path/$f" ]; then
mkdir -p `dirname ./$f`
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index c86dedf7df..8ba81f5518 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -23,7 +23,7 @@ if unpack_edk2_blobs
endforeach
endif
-blobs = files(
+blobs = [
'bios.bin',
'bios-256k.bin',
'bios-microvm.bin',
@@ -83,11 +83,19 @@ blobs = files(
'npcm7xx_bootrom.bin',
'vof.bin',
'vof-nvram.bin',
-)
+]
-if get_option('install_blobs')
- install_data(blobs, install_dir: qemu_datadir)
-endif
+ln_s = [find_program('ln', required: true), '-sf']
+foreach f : blobs
+ roms += custom_target(f,
+ build_by_default: have_system,
+ output: f,
+ input: files('meson.build'), # dummy input
+ install: get_option('install_blobs'),
+ install_dir: qemu_datadir,
+ command: [ ln_s, meson.project_source_root() / 'pc-bios' / f, '@OUTPUT@' ])
+endforeach
+alias_target('emulator-firmware', roms)
subdir('descriptors')
subdir('keymaps')
diff --git a/tests/Makefile.include b/tests/Makefile.include
index bef96a775c..1fe7c8cd09 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -56,7 +56,7 @@ $(TCG_TESTS_TARGETS:%=build-tcg-tests-%): build-tcg-tests-%: $(BUILD_DIR)/tests/
"BUILD","$* guest-tests")
.PHONY: $(TCG_TESTS_TARGETS:%=run-tcg-tests-%)
-$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(if $(CONFIG_PLUGIN),test-plugins)
+$(TCG_TESTS_TARGETS:%=run-tcg-tests-%): run-tcg-tests-%: build-tcg-tests-% $(if $(CONFIG_PLUGIN),test-plugins) emulator-firmware
$(call quiet-command, \
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson
2022-04-29 14:18 ` [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson Paolo Bonzini
@ 2022-04-30 19:48 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 19:48 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> This is useful because pc-bios/meson.build already has a list of all ROM
> files, and thus does not need to use wildcards. The problems with
> wildcards are mentioned above the definition of the LINKS variable,
> but then the recommendation is disattended.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> configure | 15 ---------------
> pc-bios/meson.build | 18 +++++++++++++-----
> tests/Makefile.include | 2 +-
> 3 files changed, 14 insertions(+), 21 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 07/12] configure: move symlink configuration earlier
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (5 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 06/12] configure, meson: move symlinking of ROMs to meson Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:49 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 08/12] configure: enable cross-compilation of s390-ccw Paolo Bonzini
` (4 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Ensure that the pc-bios/optionrom and pc-bios/s390-ccw directory
exist at the time when we'll write out the compiler configuration
for them.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index bdb0cc35a8..de2bc799cd 100755
--- a/configure
+++ b/configure
@@ -2210,6 +2210,30 @@ fi
QEMU_GA_MSI_MINGW_BIN_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
+# Set up build tree symlinks that point back into the source tree
+# (these can be both files and directories).
+# Caution: avoid adding files or directories here using wildcards. This
+# will result in problems later if a new file matching the wildcard is
+# added to the source tree -- nothing will cause configure to be rerun
+# so the build tree will be missing the link back to the new file, and
+# tests might fail. Prefer to keep the relevant files in their own
+# directory and symlink the directory instead.
+LINKS="Makefile"
+LINKS="$LINKS tests/tcg/Makefile.target"
+LINKS="$LINKS pc-bios/optionrom/Makefile"
+LINKS="$LINKS pc-bios/s390-ccw/Makefile"
+LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
+LINKS="$LINKS tests/avocado tests/data"
+LINKS="$LINKS tests/qemu-iotests/check"
+LINKS="$LINKS python"
+LINKS="$LINKS contrib/plugins/Makefile "
+for f in $LINKS ; do
+ if [ -e "$source_path/$f" ]; then
+ mkdir -p `dirname ./$f`
+ symlink "$source_path/$f" "$f"
+ fi
+done
+
# Mac OS X ships with a broken assembler
roms=
if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
@@ -2431,31 +2455,6 @@ if test "$safe_stack" = "yes"; then
echo "CONFIG_SAFESTACK=y" >> $config_host_mak
fi
-# If we're using a separate build tree, set it up now.
-# LINKS are things to symlink back into the source tree
-# (these can be both files and directories).
-# Caution: do not add files or directories here using wildcards. This
-# will result in problems later if a new file matching the wildcard is
-# added to the source tree -- nothing will cause configure to be rerun
-# so the build tree will be missing the link back to the new file, and
-# tests might fail. Prefer to keep the relevant files in their own
-# directory and symlink the directory instead.
-LINKS="Makefile"
-LINKS="$LINKS tests/tcg/Makefile.target"
-LINKS="$LINKS pc-bios/optionrom/Makefile"
-LINKS="$LINKS pc-bios/s390-ccw/Makefile"
-LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
-LINKS="$LINKS tests/avocado tests/data"
-LINKS="$LINKS tests/qemu-iotests/check"
-LINKS="$LINKS python"
-LINKS="$LINKS contrib/plugins/Makefile "
-for f in $LINKS ; do
- if [ -e "$source_path/$f" ]; then
- mkdir -p `dirname ./$f`
- symlink "$source_path/$f" "$f"
- fi
-done
-
# tests/tcg configuration
(makefile=tests/tcg/Makefile.prereqs
echo "# Automatically generated by configure - do not modify" > $makefile
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [RFC PATCH 08/12] configure: enable cross-compilation of s390-ccw
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (6 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 07/12] configure: move symlink configuration earlier Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:55 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 09/12] pc-bios/optionrom: detect -fno-pie Paolo Bonzini
` (3 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
While container-based cross compilers are not supported, this already makes
it possible to build s390-ccw on any machine that has s390x GCC and binutils
installed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 18 +++++++++++++-----
pc-bios/s390-ccw/Makefile | 9 +++++----
pc-bios/s390-ccw/netboot.mak | 2 +-
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index de2bc799cd..5c34d8ffc2 100755
--- a/configure
+++ b/configure
@@ -2251,24 +2251,32 @@ if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
done
fi
-# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
-# or -march=z10 (which is the lowest architecture level that Clang supports)
-if test "$cpu" = "s390x" ; then
+# Only build s390-ccw bios the compiler has -march=z900 or -march=z10 (which is
+# the lowest architecture level that Clang supports)
+probe_target_compiler s390x
+if test -n "$target_cc" && test "$softmmu" = yes; then
write_c_skeleton
- compile_prog "-march=z900" ""
+ do_compiler "$target_cc" $target_cc_cflags -march=z900 -o $TMPO -c $TMPC
has_z900=$?
- if [ $has_z900 = 0 ] || compile_object "-march=z10 -msoft-float -Werror"; then
+ 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
roms="$roms 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 >> $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"
fi
fi
+#######################################
+# generate config-host.mak
+
# Check that the C++ compiler exists and works with the C compiler.
# All the QEMU_CXXFLAGS are based on QEMU_CFLAGS. Keep this at the end to don't miss any other that could be added.
if has $cxx; then
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 0eb68efc7b..6eb713bf37 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -2,8 +2,9 @@ all: build-all
# Dummy command so that make thinks it has done something
@true
-include ../../config-host.mak
+include config-host.mak
CFLAGS = -O2 -g
+MAKEFLAGS += -rR
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \
@@ -11,7 +12,7 @@ cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \
VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in
set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(PATTERN) $1)))
-$(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw)
+$(call set-vpath, $(SRC_PATH))
# Flags for dependency generation
QEMU_DGFLAGS = -MMD -MP -MT $@ -MF $(@D)/$(*F).d
@@ -49,8 +50,8 @@ s390-ccw.img: s390-ccw.elf
$(OBJECTS): Makefile
-ifneq ($(wildcard $(SRC_PATH)/roms/SLOF/lib/libnet),)
-include $(SRC_PATH)/pc-bios/s390-ccw/netboot.mak
+ifneq ($(wildcard $(SRC_PATH)/../../roms/SLOF/lib/libnet),)
+include $(SRC_PATH)/netboot.mak
else
s390-netboot.img:
@echo "s390-netboot.img not built since roms/SLOF/ is not available."
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
index 68b4d7edcb..1a06befa4b 100644
--- a/pc-bios/s390-ccw/netboot.mak
+++ b/pc-bios/s390-ccw/netboot.mak
@@ -1,5 +1,5 @@
-SLOF_DIR := $(SRC_PATH)/roms/SLOF
+SLOF_DIR := $(SRC_PATH)/../../roms/SLOF
NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* [RFC PATCH 09/12] pc-bios/optionrom: detect -fno-pie
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (7 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 08/12] configure: enable cross-compilation of s390-ccw Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:56 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds Paolo Bonzini
` (2 subsequent siblings)
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Do not rely on the detection that was done in the configure script,
since in the future we may want to cross-compile this file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 1 -
pc-bios/optionrom/Makefile | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 5c34d8ffc2..07ee586ef5 100755
--- a/configure
+++ b/configure
@@ -2396,7 +2396,6 @@ echo "CCAS=$ccas" >> $config_host_mak
echo "CPP=$cpp" >> $config_host_mak
echo "OBJCOPY=$objcopy" >> $config_host_mak
echo "LD=$ld" >> $config_host_mak
-echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
echo "QEMU_CXXFLAGS=$QEMU_CXXFLAGS" >> $config_host_mak
echo "QEMU_OBJCFLAGS=$QEMU_OBJCFLAGS" >> $config_host_mak
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index f1ef898073..8de5a9461c 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -22,7 +22,8 @@ override CFLAGS += $(call cc-option, -fcf-protection=none)
override CPPFLAGS += -MMD -MP -MT $@ -MF $(@D)/$(*F).d
override CFLAGS += $(filter -W%, $(QEMU_CFLAGS))
-override CFLAGS += $(CFLAGS_NOPIE) -ffreestanding -I$(TOPSRC_DIR)/include
+override CFLAGS += $(call cc-option, -fno-pie)
+override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include
override CFLAGS += $(call cc-option, -fno-stack-protector)
override CFLAGS += $(call cc-option, -m16)
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 09/12] pc-bios/optionrom: detect -fno-pie
2022-04-29 14:18 ` [RFC PATCH 09/12] pc-bios/optionrom: detect -fno-pie Paolo Bonzini
@ 2022-04-30 19:56 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 19:56 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> Do not rely on the detection that was done in the configure script,
> since in the future we may want to cross-compile this file.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> configure | 1 -
> pc-bios/optionrom/Makefile | 3 ++-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (8 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 09/12] pc-bios/optionrom: detect -fno-pie Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 19:58 ` Richard Henderson
2022-05-02 7:37 ` Michael Tokarev
2022-04-29 14:18 ` [RFC PATCH 11/12] configure: enable cross-compilation of optionrom Paolo Bonzini
2022-04-29 14:18 ` [RFC PATCH 12/12] configure: enable cross compilation of vof Paolo Bonzini
11 siblings, 2 replies; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Avoids the following bogus warning:
pvh_main.c: In function ‘pvh_load_kernel’:
pvh_main.c:101:42: warning: array subscript 0 is outside array bounds of ‘uint16_t[0]’ {aka ‘short unsigned int[]’} [-Warray-bounds]
101 | uint32_t ebda_paddr = ((uint32_t)*((uint16_t *)EBDA_BASE_ADDR)) << 4;
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
pc-bios/optionrom/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 8de5a9461c..2494ad9c25 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -26,6 +26,7 @@ override CFLAGS += $(call cc-option, -fno-pie)
override CFLAGS += -ffreestanding -I$(TOPSRC_DIR)/include
override CFLAGS += $(call cc-option, -fno-stack-protector)
override CFLAGS += $(call cc-option, -m16)
+override CFLAGS += $(call cc-option, -Wno-array-bounds)
ifeq ($(filter -m16, $(CFLAGS)),)
# Attempt to work around compilers that lack -m16 (GCC <= 4.8, clang <= ??)
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds
2022-04-29 14:18 ` [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds Paolo Bonzini
@ 2022-04-30 19:58 ` Richard Henderson
2022-05-02 7:37 ` Michael Tokarev
1 sibling, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 19:58 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> Avoids the following bogus warning:
>
> pvh_main.c: In function ‘pvh_load_kernel’:
> pvh_main.c:101:42: warning: array subscript 0 is outside array bounds of ‘uint16_t[0]’ {aka ‘short unsigned int[]’} [-Warray-bounds]
> 101 | uint32_t ebda_paddr = ((uint32_t)*((uint16_t *)EBDA_BASE_ADDR)) << 4;
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds
2022-04-29 14:18 ` [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds Paolo Bonzini
2022-04-30 19:58 ` Richard Henderson
@ 2022-05-02 7:37 ` Michael Tokarev
2022-05-02 10:01 ` Paolo Bonzini
1 sibling, 1 reply; 25+ messages in thread
From: Michael Tokarev @ 2022-05-02 7:37 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: richard.henderson, alex.bennee
29.04.2022 17:18, Paolo Bonzini wrote:
> Avoids the following bogus warning:
>
> pvh_main.c: In function ‘pvh_load_kernel’:
> pvh_main.c:101:42: warning: array subscript 0 is outside array bounds of ‘uint16_t[0]’ {aka ‘short unsigned int[]’} [-Warray-bounds]
> 101 | uint32_t ebda_paddr = ((uint32_t)*((uint16_t *)EBDA_BASE_ADDR)) << 4;
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To me it looks like we should try to fix this particular expression
to make it more "compiler-friendly" than to disable warning for the
whole thing.
Which compiler (version) does this?
Thanks,
/mjt
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds
2022-05-02 7:37 ` Michael Tokarev
@ 2022-05-02 10:01 ` Paolo Bonzini
0 siblings, 0 replies; 25+ messages in thread
From: Paolo Bonzini @ 2022-05-02 10:01 UTC (permalink / raw)
To: Michael Tokarev, qemu-devel; +Cc: alex.bennee, richard.henderson
On 5/2/22 09:37, Michael Tokarev wrote:
>>
>> pvh_main.c: In function ‘pvh_load_kernel’:
>> pvh_main.c:101:42: warning: array subscript 0 is outside array bounds
>> of ‘uint16_t[0]’ {aka ‘short unsigned int[]’} [-Warray-bounds]
>> 101 | uint32_t ebda_paddr = ((uint32_t)*((uint16_t
>> *)EBDA_BASE_ADDR)) << 4;
>> |
>> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> To me it looks like we should try to fix this particular expression
> to make it more "compiler-friendly" than to disable warning for the
> whole thing.
I think this is really a compiler bug, or alternatively this case should
be extracted to its own -W flag.
> Which compiler (version) does this?
The GCC 12.0.1 prerelease.
Paolo
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 11/12] configure: enable cross-compilation of optionrom
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (9 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 10/12] pc-bios/optionrom: compile with -Wno-array-bounds Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 20:01 ` Richard Henderson
2022-04-29 14:18 ` [RFC PATCH 12/12] configure: enable cross compilation of vof Paolo Bonzini
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
While container-based cross compilers are not supported, this already makes
it possible to build x86 optionroms on any machine that has an installation
of GCC and binutils for 32- or 64-bit x86.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 29 +++++++++++++++++++++--------
pc-bios/optionrom/Makefile | 4 +---
2 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index 07ee586ef5..6b8e2e2fdb 100755
--- a/configure
+++ b/configure
@@ -2100,6 +2100,13 @@ probe_target_compiler() {
fi
}
+probe_target_compilers() {
+ for i; do
+ probe_target_compiler $i
+ test -n "$target_cc" && return 0
+ done
+}
+
write_target_makefile() {
if test -n "$target_cc"; then
echo "CC=$target_cc"
@@ -2210,6 +2217,9 @@ fi
QEMU_GA_MSI_MINGW_BIN_PATH="$($pkg_config --variable=prefix glib-2.0)/bin"
+#######################################
+# cross-compiled firmware targets
+
# Set up build tree symlinks that point back into the source tree
# (these can be both files and directories).
# Caution: avoid adding files or directories here using wildcards. This
@@ -2236,19 +2246,27 @@ done
# Mac OS X ships with a broken assembler
roms=
-if { test "$cpu" = "i386" || test "$cpu" = "x86_64"; } && \
+probe_target_compilers i386 x86_64
+if test -n "$target_cc" &&
test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
test "$targetos" != "haiku" && test "$softmmu" = yes ; then
# Different host OS linkers have different ideas about the name of the ELF
# emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the _fbsd
# variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386pe.
for emu in elf_i386 elf_i386_fbsd elf_i386_obsd i386pe; do
- if "$ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then
+ if "$target_ld" -verbose 2>&1 | grep -q "^[[:space:]]*$emu[[:space:]]*$"; then
ld_i386_emulation="$emu"
- roms="optionrom"
break
fi
done
+ if test -n "$ld_i386_emulation"; then
+ roms="optionrom"
+ config_mak=pc-bios/optionrom/config.mak
+ echo "# Automatically generated by configure - do not modify" > $config_mak
+ echo "TOPSRC_DIR=$source_path" >> $config_mak
+ echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_mak
+ write_target_makefile >> $config_mak
+ fi
fi
# Only build s390-ccw bios the compiler has -march=z900 or -march=z10 (which is
@@ -2403,7 +2421,6 @@ echo "GLIB_CFLAGS=$glib_cflags" >> $config_host_mak
echo "GLIB_LIBS=$glib_libs" >> $config_host_mak
echo "GLIB_VERSION=$(pkg-config --modversion glib-2.0)" >> $config_host_mak
echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
-echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
echo "STRIP=$strip" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
@@ -2593,10 +2610,6 @@ for target in $target_list; do
done
echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile)
-config_mak=pc-bios/optionrom/config.mak
-echo "# Automatically generated by configure - do not modify" > $config_mak
-echo "TOPSRC_DIR=$source_path" >> $config_mak
-
if test "$skip_meson" = no; then
cross="config-meson.cross.new"
meson_quote() {
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 2494ad9c25..6696ce010a 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -6,7 +6,6 @@ all: multiboot.bin multiboot_dma.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bi
# Dummy command so that make thinks it has done something
@true
-include ../../config-host.mak
CFLAGS = -O2 -g
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
@@ -44,13 +43,12 @@ Wa = -Wa,
override ASFLAGS += -32
override CFLAGS += $(call cc-option, $(Wa)-32)
-LD_I386_EMULATION ?= elf_i386
override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds
pvh.img: pvh.o pvh_main.o
%.o: %.S
- $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
+ $(call quiet-command,$(CC) -E $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
%.o: %.c
$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 11/12] configure: enable cross-compilation of optionrom
2022-04-29 14:18 ` [RFC PATCH 11/12] configure: enable cross-compilation of optionrom Paolo Bonzini
@ 2022-04-30 20:01 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 20:01 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> While container-based cross compilers are not supported, this already makes
> it possible to build x86 optionroms on any machine that has an installation
> of GCC and binutils for 32- or 64-bit x86.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> configure | 29 +++++++++++++++++++++--------
> pc-bios/optionrom/Makefile | 4 +---
> 2 files changed, 22 insertions(+), 11 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread
* [RFC PATCH 12/12] configure: enable cross compilation of vof
2022-04-29 14:18 [RFC PATCH 00/12] Cross compilation of embedded firmware Paolo Bonzini
` (10 preceding siblings ...)
2022-04-29 14:18 ` [RFC PATCH 11/12] configure: enable cross-compilation of optionrom Paolo Bonzini
@ 2022-04-29 14:18 ` Paolo Bonzini
2022-04-30 20:06 ` Richard Henderson
11 siblings, 1 reply; 25+ messages in thread
From: Paolo Bonzini @ 2022-04-29 14:18 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
While container-based cross compilers are not supported, this already
makes it possible to build vof on any machine that has an installation
of GCC and binutils for 32- or 64-bit PowerPC.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 10 ++++++++++
pc-bios/vof/Makefile | 17 +++++++++--------
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index 6b8e2e2fdb..1db1eef7b1 100755
--- a/configure
+++ b/configure
@@ -2232,6 +2232,7 @@ LINKS="Makefile"
LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS pc-bios/optionrom/Makefile"
LINKS="$LINKS pc-bios/s390-ccw/Makefile"
+LINKS="$LINKS pc-bios/vof/Makefile"
LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
LINKS="$LINKS tests/avocado tests/data"
LINKS="$LINKS tests/qemu-iotests/check"
@@ -2269,6 +2270,15 @@ if test -n "$target_cc" &&
fi
fi
+probe_target_compilers ppc ppc64
+if test -n "$target_cc" && test "$softmmu" = yes; then
+ roms="$roms vof"
+ 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 >> $config_mak
+fi
+
# Only build s390-ccw bios the compiler has -march=z900 or -march=z10 (which is
# the lowest architecture level that Clang supports)
probe_target_compiler s390x
diff --git a/pc-bios/vof/Makefile b/pc-bios/vof/Makefile
index aa1678c4d8..391ac0d600 100644
--- a/pc-bios/vof/Makefile
+++ b/pc-bios/vof/Makefile
@@ -1,11 +1,10 @@
-all: build-all
+include config.mak
+VPATH=$(SRC_DIR)
+all: vof.bin
-build-all: vof.bin
-
-CROSS ?=
-CC = $(CROSS)gcc
-LD = $(CROSS)ld
-OBJCOPY = $(CROSS)objcopy
+CC ?= $(CROSS)gcc
+LD ?= $(CROSS)ld
+OBJCOPY ?= $(CROSS)objcopy
%.o: %.S
$(CC) -m32 -mbig-endian -mcpu=power4 -c -o $@ $<
@@ -14,10 +13,12 @@ OBJCOPY = $(CROSS)objcopy
$(CC) -m32 -mbig-endian -mcpu=power4 -c -fno-stack-protector -o $@ $<
vof.elf: entry.o main.o ci.o bootmem.o libc.o
- $(LD) -nostdlib -e_start -Tvof.lds -EB -o $@ $^
+ $(LD) -nostdlib -e_start -T$(SRC_DIR)/vof.lds -EB -o $@ $^
%.bin: %.elf
$(OBJCOPY) -O binary -j .text -j .data -j .toc -j .got2 $^ $@
clean:
rm -f *.o vof.bin vof.elf *~
+
+.PHONY: all clean
--
2.35.1
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [RFC PATCH 12/12] configure: enable cross compilation of vof
2022-04-29 14:18 ` [RFC PATCH 12/12] configure: enable cross compilation of vof Paolo Bonzini
@ 2022-04-30 20:06 ` Richard Henderson
0 siblings, 0 replies; 25+ messages in thread
From: Richard Henderson @ 2022-04-30 20:06 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 4/29/22 07:18, Paolo Bonzini wrote:
> While container-based cross compilers are not supported, this already
> makes it possible to build vof on any machine that has an installation
> of GCC and binutils for 32- or 64-bit PowerPC.
>
> Signed-off-by: Paolo Bonzini<pbonzini@redhat.com>
> ---
> configure | 10 ++++++++++
> pc-bios/vof/Makefile | 17 +++++++++--------
> 2 files changed, 19 insertions(+), 8 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 25+ messages in thread