* [PATCH 01/16] configure: do not define or use the CPP variable
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:07 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 02/16] build: clean up ninja invocation Paolo Bonzini
` (16 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Just hardcode $(CC) -E, it should be enough.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 3 ---
pc-bios/optionrom/Makefile | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/configure b/configure
index 0cc8c876f7..4c8954feea 100755
--- a/configure
+++ b/configure
@@ -378,7 +378,6 @@ fi
ar="${AR-${cross_prefix}ar}"
as="${AS-${cross_prefix}as}"
ccas="${CCAS-$cc}"
-cpp="${CPP-$cc -E}"
objcopy="${OBJCOPY-${cross_prefix}objcopy}"
ld="${LD-${cross_prefix}ld}"
ranlib="${RANLIB-${cross_prefix}ranlib}"
@@ -2030,7 +2029,6 @@ echo "CC=$cc" >> $config_host_mak
echo "AR=$ar" >> $config_host_mak
echo "AS=$as" >> $config_host_mak
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 "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
@@ -2273,7 +2271,6 @@ preserve_env() {
preserve_env AR
preserve_env AS
preserve_env CC
-preserve_env CPP
preserve_env CFLAGS
preserve_env CXX
preserve_env CXXFLAGS
diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index 2494ad9c25..17ccc76241 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -50,7 +50,7 @@ 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) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
%.o: %.c
$(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 01/16] configure: do not define or use the CPP variable
2022-05-17 9:26 ` [PATCH 01/16] configure: do not define or use the CPP variable Paolo Bonzini
@ 2022-05-17 18:07 ` Richard Henderson
2022-05-17 18:47 ` Paolo Bonzini
0 siblings, 1 reply; 29+ messages in thread
From: Richard Henderson @ 2022-05-17 18:07 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 5/17/22 02:26, Paolo Bonzini wrote:
> Just hardcode $(CC) -E, it should be enough.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> configure | 3 ---
> pc-bios/optionrom/Makefile | 2 +-
> 2 files changed, 1 insertion(+), 4 deletions(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> %.o: %.S
> - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
> + $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@")
Although I'm surprised we need to do this pipe thing. Surely just rely on the
assembler-with-cpp rule built into the compiler driver. Are we using a custom AS in this
case?
r~
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 01/16] configure: do not define or use the CPP variable
2022-05-17 18:07 ` Richard Henderson
@ 2022-05-17 18:47 ` Paolo Bonzini
0 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 18:47 UTC (permalink / raw)
To: Richard Henderson, qemu-devel; +Cc: alex.bennee
On 5/17/22 20:07, Richard Henderson wrote:
> Although I'm surprised we need to do this pipe thing. Surely just rely
> on the assembler-with-cpp rule built into the compiler driver. Are we
> using a custom AS in this case?
No, I don't think so. I'm also surprised, but decided to change as
little as possible.
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 02/16] build: clean up ninja invocation
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
2022-05-17 9:26 ` [PATCH 01/16] configure: do not define or use the CPP variable Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:08 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 03/16] build: add a more generic way to specify make->ninja dependencies Paolo Bonzini
` (15 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Fix an incorrect "@@:" and move "-d keepdepfile" to the NINJAFLAGS variable.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index b842dbccdb..fad312040f 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ MAKE.q = $(findstring q,$(firstword $(filter-out --%,$(MAKEFLAGS))))
MAKE.nq = $(if $(word 2, $(MAKE.n) $(MAKE.q)),nq)
NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
$(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
-
+ -d keepdepfile
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps))
ninja-cmd-goals += $(foreach t, $(.bench.build-suites), $(.bench-$t.deps))
@@ -160,8 +160,8 @@ $(ninja-targets): run-ninja
# --output-sync line.
run-ninja: config-host.mak
ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),)
- +$(quiet-@)$(if $(MAKE.nq),@:, $(NINJA) -d keepdepfile \
- $(NINJAFLAGS) $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat)
+ +$(if $(MAKE.nq),@:,$(quiet-@)$(NINJA) $(NINJAFLAGS) \
+ $(sort $(filter $(ninja-targets), $(ninja-cmd-goals))) | cat)
endif
endif
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 03/16] build: add a more generic way to specify make->ninja dependencies
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
2022-05-17 9:26 ` [PATCH 01/16] configure: do not define or use the CPP variable Paolo Bonzini
2022-05-17 9:26 ` [PATCH 02/16] build: clean up ninja invocation Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 04/16] build: do a full build before running TCG tests Paolo Bonzini
` (14 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
Let any make target specify ninja goals that needs to be built for it
(though selecting the goals is _not_ recursive on depending targets)
instead of having a custom mechanism only for "make check" and "make
bench".
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 3 +--
scripts/mtest2make.py | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index fad312040f..3c0d89057e 100644
--- a/Makefile
+++ b/Makefile
@@ -145,8 +145,7 @@ NINJAFLAGS = $(if $V,-v) $(if $(MAKE.n), -n) $(if $(MAKE.k), -k0) \
$(filter-out -j, $(lastword -j1 $(filter -l% -j%, $(MAKEFLAGS)))) \
-d keepdepfile
ninja-cmd-goals = $(or $(MAKECMDGOALS), all)
-ninja-cmd-goals += $(foreach t, $(.check.build-suites), $(.check-$t.deps))
-ninja-cmd-goals += $(foreach t, $(.bench.build-suites), $(.bench-$t.deps))
+ninja-cmd-goals += $(foreach g, $(MAKECMDGOALS), $(.ninja-goals.$g))))
makefile-targets := build.ninja ctags TAGS cscope dist clean uninstall
# "ninja -t targets" also lists all prerequisites. If build system
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index 304634b71e..0fe81efbbc 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -81,12 +81,12 @@ def emit_prolog(suites, prefix):
def emit_suite_deps(name, suite, prefix):
deps = ' '.join(suite.deps)
- targets = f'{prefix}-{name} {prefix}-report-{name}.junit.xml {prefix} {prefix}-report.junit.xml'
+ targets = [f'{prefix}-{name}', f'{prefix}-report-{name}.junit.xml', f'{prefix}', f'{prefix}-report.junit.xml',
+ f'{prefix}-build']
print()
print(f'.{prefix}-{name}.deps = {deps}')
- print(f'ifneq ($(filter {prefix}-build {targets}, $(MAKECMDGOALS)),)')
- print(f'.{prefix}.build-suites += {name}')
- print(f'endif')
+ for t in targets:
+ print(f'.ninja-goals.{t} += $(.{prefix}-{name}.deps)')
def emit_suite(name, suite, prefix):
emit_suite_deps(name, suite, prefix)
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 04/16] build: do a full build before running TCG tests
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (2 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 03/16] build: add a more generic way to specify make->ninja dependencies Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:10 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 05/16] configure, meson: move symlinking of ROMs to meson Paolo Bonzini
` (13 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
TCG tests need both QEMU and firmware to be built, so do "ninja all" before
trying to run them.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/Makefile.include | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index ec84b2ebc0..72ce0561f4 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -57,7 +57,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-%
$(call quiet-command, \
$(MAKE) -C tests/tcg/$* -f ../Makefile.target $(SUBDIR_MAKEFLAGS) \
TARGET="$*" SRC_PATH="$(SRC_PATH)" SPEED=$(SPEED) run, \
@@ -74,6 +74,7 @@ $(TCG_TESTS_TARGETS:%=clean-tcg-tests-%): clean-tcg-tests-%:
build-tcg: $(BUILD_TCG_TARGET_RULES)
.PHONY: check-tcg
+.ninja-goals.check-tcg = all $(if $(CONFIG_PLUGIN),test-plugins)
check-tcg: $(RUN_TCG_TARGET_RULES)
.PHONY: clean-tcg
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 05/16] configure, meson: move symlinking of ROMs to meson
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (3 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 04/16] build: do a full build before running TCG tests Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 06/16] tests/tcg: correct target CPU for sparc32 Paolo Bonzini
` (12 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 15 ---------------
pc-bios/meson.build | 18 +++++++++++++-----
2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index 4c8954feea..d87b110aa2 100755
--- a/configure
+++ b/configure
@@ -2115,21 +2115,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,18 @@ 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
subdir('descriptors')
subdir('keymaps')
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 06/16] tests/tcg: correct target CPU for sparc32
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (4 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 05/16] configure, meson: move symlinking of ROMs to meson Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:11 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script Paolo Bonzini
` (11 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
We do not want v8plus for pure sparc32, as the difference with the V8 ABI
are only meaningful on 64-bit CPUs suh as ultrasparc; supersparc is the
best CPU to use for 32-bit.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/tcg/configure.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 691d90abac..59f2403d1a 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -70,7 +70,7 @@ 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_cflags_sparc="-m32 -mcpu=supersparc"}
: ${cross_cc_sparc64="sparc64-linux-gnu-gcc"}
: ${cross_cc_cflags_sparc64="-m64 -mcpu=ultrasparc"}
: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"}
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (5 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 06/16] tests/tcg: correct target CPU for sparc32 Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:15 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 08/16] configure: add missing cross compiler fallbacks Paolo Bonzini
` (10 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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 d87b110aa2..90cb477c90 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
@@ -954,7 +966,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=""
@@ -1813,6 +1824,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 -mcpu=supersparc"}
+: ${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
@@ -2122,11 +2375,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 72ce0561f4..6a1688e33e 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 59f2403d1a..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 -mcpu=supersparc"}
-: ${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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script
2022-05-17 9:26 ` [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script Paolo Bonzini
@ 2022-05-17 18:15 ` Richard Henderson
0 siblings, 0 replies; 29+ messages in thread
From: Richard Henderson @ 2022-05-17 18:15 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 5/17/22 02:26, Paolo Bonzini wrote:
> 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
Acked-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 08/16] configure: add missing cross compiler fallbacks
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (6 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 07/16] tests/tcg: merge configure.sh back into main configure script Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:15 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 09/16] configure: handle host compiler in probe_target_compiler Paolo Bonzini
` (9 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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 90cb477c90..1d9d60185c 100755
--- a/configure
+++ b/configure
@@ -1840,6 +1840,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"}
@@ -1862,9 +1863,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 -mcpu=supersparc"}
: ${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 -mcpu=supersparc"}
: ${cross_cc_x86_64="x86_64-linux-gnu-gcc"}
: ${cross_cc_cflags_x86_64="-m64"}
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 09/16] configure: handle host compiler in probe_target_compiler
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (7 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 08/16] configure: add missing cross compiler fallbacks Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 18:16 ` Richard Henderson
2022-05-17 9:26 ` [PATCH 10/16] configure: introduce --cross-prefix-*= Paolo Bonzini
` (8 subsequent siblings)
17 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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 1d9d60185c..016df3fa6e 100755
--- a/configure
+++ b/configure
@@ -964,10 +964,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=""
@@ -2021,13 +2017,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
@@ -2040,6 +2029,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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 09/16] configure: handle host compiler in probe_target_compiler
2022-05-17 9:26 ` [PATCH 09/16] configure: handle host compiler in probe_target_compiler Paolo Bonzini
@ 2022-05-17 18:16 ` Richard Henderson
0 siblings, 0 replies; 29+ messages in thread
From: Richard Henderson @ 2022-05-17 18:16 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: alex.bennee
On 5/17/22 02:26, Paolo Bonzini wrote:
> 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(-)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
r~
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 10/16] configure: introduce --cross-prefix-*=
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (8 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 09/16] configure: handle host compiler in probe_target_compiler Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 11/16] configure: include more binutils in tests/tcg makefile Paolo Bonzini
` (7 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 137 ++++++++++++++++++++++++++++++------------------------
1 file changed, 77 insertions(+), 60 deletions(-)
diff --git a/configure b/configure
index 016df3fa6e..ee4fcdacfe 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
@@ -730,6 +735,8 @@ for opt do
;;
--cross-cc-*)
;;
+ --cross-prefix-*)
+ ;;
--enable-debug-info) meson_option_add -Ddebug=true
;;
--disable-debug-info) meson_option_add -Ddebug=false
@@ -1026,6 +1033,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]
@@ -1831,44 +1839,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_sparc="$cross_prefix_sparc64"}
+: ${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 -mcpu=supersparc"}
-: ${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
@@ -1914,93 +1932,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?
@@ -2008,9 +2032,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}"
@@ -2018,17 +2045,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}
@@ -2061,12 +2082,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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 11/16] configure: include more binutils in tests/tcg makefile
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (9 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 10/16] configure: introduce --cross-prefix-*= Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 12/16] configure: move symlink configuration earlier Paolo Bonzini
` (6 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/configure b/configure
index ee4fcdacfe..5db0082ddc 100755
--- a/configure
+++ b/configure
@@ -1893,11 +1893,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" ;;
@@ -2036,8 +2046,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}"
@@ -2048,12 +2063,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
@@ -2069,6 +2098,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"
@@ -2076,14 +2109,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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 12/16] configure: move symlink configuration earlier
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (10 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 11/16] configure: include more binutils in tests/tcg makefile Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 13/16] configure: enable cross-compilation of s390-ccw Paolo Bonzini
` (5 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 49 ++++++++++++++++++++++++-------------------------
1 file changed, 24 insertions(+), 25 deletions(-)
diff --git a/configure b/configure
index 5db0082ddc..cf439e2deb 100755
--- a/configure
+++ b/configure
@@ -2205,6 +2205,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"; } && \
@@ -2423,31 +2447,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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 13/16] configure: enable cross-compilation of s390-ccw
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (11 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 12/16] configure: move symlink configuration earlier Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 14/16] configure: enable cross-compilation of optionrom Paolo Bonzini
` (4 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
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 cf439e2deb..e977d8e958 100755
--- a/configure
+++ b/configure
@@ -2246,24 +2246,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 if 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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 14/16] configure: enable cross-compilation of optionrom
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (12 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 13/16] configure: enable cross-compilation of s390-ccw Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 15/16] configure: enable cross compilation of vof Paolo Bonzini
` (3 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 29 +++++++++++++++++++++--------
pc-bios/optionrom/Makefile | 2 --
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index e977d8e958..a6363f3331 100755
--- a/configure
+++ b/configure
@@ -2095,6 +2095,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"
@@ -2205,6 +2212,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
@@ -2231,19 +2241,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 if the compiler has -march=z900 or -march=z10
@@ -2396,7 +2414,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
@@ -2586,10 +2603,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 17ccc76241..f639915b4f 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,7 +43,6 @@ 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
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 15/16] configure: enable cross compilation of vof
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (13 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 14/16] configure: enable cross-compilation of optionrom Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-17 9:26 ` [PATCH 16/16] configure: remove unused variables from config-host.mak Paolo Bonzini
` (2 subsequent siblings)
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 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.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
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 a6363f3331..5b7b4e2cca 100755
--- a/configure
+++ b/configure
@@ -2227,6 +2227,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"
@@ -2264,6 +2265,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 if 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.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 16/16] configure: remove unused variables from config-host.mak
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (14 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 15/16] configure: enable cross compilation of vof Paolo Bonzini
@ 2022-05-17 9:26 ` Paolo Bonzini
2022-05-24 15:53 ` [PATCH 00/16] Cross compilation of embedded firmware Alex Bennée
2022-05-26 16:49 ` Alex Bennée
17 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-17 9:26 UTC (permalink / raw)
To: qemu-devel; +Cc: alex.bennee, richard.henderson
The only compiler variable that is still needed is $(CC), for
contrib/plugins/Makefile. All firmware builds have their own
config-host.mak file.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 6 ------
1 file changed, 6 deletions(-)
diff --git a/configure b/configure
index 5b7b4e2cca..8cdec79f1a 100755
--- a/configure
+++ b/configure
@@ -2412,11 +2412,6 @@ echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "MESON=$meson" >> $config_host_mak
echo "NINJA=$ninja" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak
-echo "AR=$ar" >> $config_host_mak
-echo "AS=$as" >> $config_host_mak
-echo "CCAS=$ccas" >> $config_host_mak
-echo "OBJCOPY=$objcopy" >> $config_host_mak
-echo "LD=$ld" >> $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
@@ -2424,7 +2419,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 "STRIP=$strip" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
# use included Linux headers
--
2.36.0
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH 00/16] Cross compilation of embedded firmware
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (15 preceding siblings ...)
2022-05-17 9:26 ` [PATCH 16/16] configure: remove unused variables from config-host.mak Paolo Bonzini
@ 2022-05-24 15:53 ` Alex Bennée
2022-05-25 13:16 ` Paolo Bonzini
2022-05-26 16:49 ` Alex Bennée
17 siblings, 1 reply; 29+ messages in thread
From: Alex Bennée @ 2022-05-24 15:53 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, richard.henderson
Paolo Bonzini <pbonzini@redhat.com> writes:
> This is the next part of the firmware cross compilation story. It only
> looks at firmware that's strictly part of QEMU (optionrom, s390-ccw,
> vof), and does not do docker cross compilers yet; but it takes the
> infrastructure from tests/tcg/configure.sh and moves it in the main
> configure script so that others can use it.
>
> I actually expect the compiler tests to move back to tests/tcg, running
> at Make time after the docker images are built. For now, the file is
> moved as a whole, including both compiler detection and the tests.
Isn't that just creating a bunch of unnecessary churn? The
tests/tcg/configure.sh sciprt already has a bunch of special casing in
it to detect various compiler features for the purposes of tests. It
would be nice if we could keep it's history of warts intact.
>
> Paolo
>
> RFC->v1:
> - new patches 1-4, 6, 16
> - patches 9-10 have been merged already
>
> Paolo Bonzini (16):
> configure: do not define or use the CPP variable
> build: clean up ninja invocation
> build: add a more generic way to specify make->ninja dependencies
> build: do a full build before running TCG tests
> configure, meson: move symlinking of ROMs to meson
> tests/tcg: correct target CPU for sparc32
> tests/tcg: merge configure.sh back into main configure script
> configure: add missing cross compiler fallbacks
> configure: handle host compiler in probe_target_compiler
> configure: introduce --cross-prefix-*=
> configure: include more binutils in tests/tcg makefile
> configure: move symlink configuration earlier
> configure: enable cross-compilation of s390-ccw
> configure: enable cross-compilation of optionrom
> configure: enable cross compilation of vof
> configure: remove unused variables from config-host.mak
>
> Makefile | 9 +-
> configure | 605 ++++++++++++++++++++++++++++++-----
> pc-bios/meson.build | 18 +-
> pc-bios/optionrom/Makefile | 4 +-
> pc-bios/s390-ccw/Makefile | 9 +-
> pc-bios/s390-ccw/netboot.mak | 2 +-
> pc-bios/vof/Makefile | 17 +-
> scripts/mtest2make.py | 8 +-
> tests/Makefile.include | 4 +-
> tests/tcg/configure.sh | 376 ----------------------
> 10 files changed, 570 insertions(+), 482 deletions(-)
> delete mode 100755 tests/tcg/configure.sh
--
Alex Bennée
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH 00/16] Cross compilation of embedded firmware
2022-05-24 15:53 ` [PATCH 00/16] Cross compilation of embedded firmware Alex Bennée
@ 2022-05-25 13:16 ` Paolo Bonzini
2022-05-26 9:48 ` Paolo Bonzini
0 siblings, 1 reply; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-25 13:16 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel, richard.henderson
On 5/24/22 17:53, Alex Bennée wrote:
>
> Paolo Bonzini <pbonzini@redhat.com> writes:
>
>> This is the next part of the firmware cross compilation story. It only
>> looks at firmware that's strictly part of QEMU (optionrom, s390-ccw,
>> vof), and does not do docker cross compilers yet; but it takes the
>> infrastructure from tests/tcg/configure.sh and moves it in the main
>> configure script so that others can use it.
>>
>> I actually expect the compiler tests to move back to tests/tcg, running
>> at Make time after the docker images are built. For now, the file is
>> moved as a whole, including both compiler detection and the tests.
>
> Isn't that just creating a bunch of unnecessary churn? The
> tests/tcg/configure.sh sciprt already has a bunch of special casing in
> it to detect various compiler features for the purposes of tests. It
> would be nice if we could keep it's history of warts intact.
Honestly, I don't know what things will look like one year from now. I
don't have 100% of the vision of how things will look, just enough to
make informed guesses at each step. So far I think it's gone pretty
well, at the expense of some churn indeed.
What I know If the compiler tests do move back to tests/tcg, they
probably won't look anything like the code that is there now.
In fact, they might even be done in Makefiles instead of configure,
similar to the "cc-option" macro in pc-bios/optionrom/Makefile. My plan
was to experiment with that in pc-bios/optionrom, in the context of
supporting docker-based cross-compilers, and then move whatever solution
I come up with to tests/tcg.
If you prefer that I first try moving them to Makefiles to reduce future
churn in the main configure script, I can do that, but probably not
until ~August.
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 00/16] Cross compilation of embedded firmware
2022-05-25 13:16 ` Paolo Bonzini
@ 2022-05-26 9:48 ` Paolo Bonzini
0 siblings, 0 replies; 29+ messages in thread
From: Paolo Bonzini @ 2022-05-26 9:48 UTC (permalink / raw)
To: Alex Bennée; +Cc: qemu-devel, richard.henderson
On 5/25/22 15:16, Paolo Bonzini wrote:
> On 5/24/22 17:53, Alex Bennée wrote:
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>>> I actually expect the compiler tests to move back to tests/tcg, running
>>> at Make time after the docker images are built. For now, the file is
>>> moved as a whole, including both compiler detection and the tests.
>>
>> Isn't that just creating a bunch of unnecessary churn? The
>> tests/tcg/configure.sh sciprt already has a bunch of special casing in
>> it to detect various compiler features for the purposes of tests. It
>> would be nice if we could keep it's history of warts intact.
For clarity the code that we're talking about is just this:
+ 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
The other ~300 lines of configure.sh belong in the main configure script and
remain there. So the churn is limited to the above.
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH 00/16] Cross compilation of embedded firmware
2022-05-17 9:26 [PATCH 00/16] Cross compilation of embedded firmware Paolo Bonzini
` (16 preceding siblings ...)
2022-05-24 15:53 ` [PATCH 00/16] Cross compilation of embedded firmware Alex Bennée
@ 2022-05-26 16:49 ` Alex Bennée
17 siblings, 0 replies; 29+ messages in thread
From: Alex Bennée @ 2022-05-26 16:49 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, richard.henderson
Paolo Bonzini <pbonzini@redhat.com> writes:
> This is the next part of the firmware cross compilation story. It only
> looks at firmware that's strictly part of QEMU (optionrom, s390-ccw,
> vof), and does not do docker cross compilers yet; but it takes the
> infrastructure from tests/tcg/configure.sh and moves it in the main
> configure script so that others can use it.
>
> I actually expect the compiler tests to move back to tests/tcg, running
> at Make time after the docker images are built. For now, the file is
> moved as a whole, including both compiler detection and the tests.
Queued to testing/next, thanks.
--
Alex Bennée
^ permalink raw reply [flat|nested] 29+ messages in thread