From: Philippe Mathieu-Daudé
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é
[thuth: Re-arranged the code, remove check-softfloat from buildtest.yml]
Signed-off-by: Thomas Huth
---
configure | 20 ++--
.gitlab-ci.d/buildtest.yml | 2 +-
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/configure b/configure
index 76728b31f7..61bd807a47 100755
--- a/configure
+++ b/configure
@@ -329,7 +329,7 @@ fi
fdt="auto"
# 2. Automatically enable/disable other options
-tcg="enabled"
+tcg="auto"
cfi="false"
# parse CC options second
@@ -1409,11 +1409,6 @@ EOF
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
default_targets=yes
for target in $default_target_list; do
@@ -1444,6 +1439,19 @@ case " $target_list " in
;;
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=$1
remedy=$2
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index 8a4353ef93..1931b77b49 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -599,7 +599,7 @@ build-tools-and-docs-debian:
optional: true
variables:
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
QEMU_JOB_PUBLISH: 1
artifacts:
--
2.31.1
