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

configure: Restrict TCG to emulation

Browse Source 
If we don't need to emulate any target, we certainly don't need TCG.

This should also help to compile again with
 ".../configure --enable-tools --disable-system --disable-user"
on systems that do not have a TCG backend.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[thuth: Re-arranged the code, remove check-softfloat from buildtest.yml]
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220706153816.768143-1-thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2022-02-04 15:54:47 +01:00
parent d8cf2c29cc
commit 7630156d34
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.d/buildtest.yml
View File

@ -599,7 +599,7 @@ build-tools-and-docs-debian:
optional: true optional: true
variables: variables:
IMAGE: debian-amd64 IMAGE: debian-amd64
MAKE_CHECK_ARGS: check-unit check-softfloat ctags TAGS cscope MAKE_CHECK_ARGS: check-unit ctags TAGS cscope
CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools
QEMU_JOB_PUBLISH: 1 QEMU_JOB_PUBLISH: 1
artifacts: artifacts:

20
configure vendored
View File

@ -329,7 +329,7 @@ fi
fdt="auto" fdt="auto"
# 2. Automatically enable/disable other options # 2. Automatically enable/disable other options
tcg="enabled" tcg="auto"
cfi="false" cfi="false"
# parse CC options second # parse CC options second
@ -1409,11 +1409,6 @@ EOF
fi fi
fi fi
if test "$tcg" = "enabled"; then
git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
fi
if test -z "${target_list+xxx}" ; then if test -z "${target_list+xxx}" ; then
default_targets=yes default_targets=yes
for target in $default_target_list; do for target in $default_target_list; do
@ -1444,6 +1439,19 @@ case " $target_list " in
;; ;;
esac esac
if test "$tcg" = "auto"; then
if test -z "$target_list"; then
tcg="disabled"
else
tcg="enabled"
fi
fi
if test "$tcg" = "enabled"; then
git_submodules="$git_submodules tests/fp/berkeley-testfloat-3"
git_submodules="$git_submodules tests/fp/berkeley-softfloat-3"
fi
feature_not_found() { feature_not_found() {
feature=$1 feature=$1
remedy=$2 remedy=$2