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

configure: don't enable ppc64abi32-linux-user by default

Browse Source 
The user can still enable this explicitly but they will get a warning
at the end of configure for their troubles. This also drops any builds
of ppc64abi32 from our CI tests.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20200909112742.25730-7-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-09-09 12:27:37 +01:00
parent c609274b85
commit 2d838d9bae
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure vendored
View File

@ -542,6 +542,8 @@ gettext=""
bogus_os="no" bogus_os="no"
malloc_trim="" malloc_trim=""
deprecated_features=""
# parse CC options first # parse CC options first
for opt do for opt do
optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)') optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
@ -1720,26 +1722,25 @@ if [ "$bsd_user" = "yes" ]; then
mak_wilds="${mak_wilds} $source_path/default-configs/*-bsd-user.mak" mak_wilds="${mak_wilds} $source_path/default-configs/*-bsd-user.mak"
fi fi
if test -z "$target_list_exclude"; then if test -z "$target_list_exclude" -a -z "$target_list"; then
for config in $mak_wilds; do # if the user doesn't specify anything lets skip deprecating stuff
default_target_list="${default_target_list} $(basename "$config" .mak)" target_list_exclude=ppc64abi32-linux-user
done fi
else
exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g') exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g')
for config in $mak_wilds; do for config in $mak_wilds; do
target="$(basename "$config" .mak)" target="$(basename "$config" .mak)"
exclude="no" exclude="no"
for excl in $exclude_list; do for excl in $exclude_list; do
if test "$excl" = "$target"; then if test "$excl" = "$target"; then
exclude="yes" exclude="yes"
break; break;
fi
done
if test "$exclude" = "no"; then
default_target_list="${default_target_list} $target"
fi fi
done done
fi if test "$exclude" = "no"; then
default_target_list="${default_target_list} $target"
fi
done
# Enumerate public trace backends for --help output # Enumerate public trace backends for --help output
trace_backend_list=$(echo $(grep -le '^PUBLIC = True$' "$source_path"/scripts/tracetool/backend/*.py | sed -e 's/^.*\/\(.*\)\.py$/\1/')) trace_backend_list=$(echo $(grep -le '^PUBLIC = True$' "$source_path"/scripts/tracetool/backend/*.py | sed -e 's/^.*\/\(.*\)\.py$/\1/'))
@ -7557,7 +7558,7 @@ TARGET_SYSTBL=""
case "$target_name" in case "$target_name" in
i386) i386)
mttcg="yes" mttcg="yes"
gdb_xml_files="i386-32bit.xml" gdb_xml_files="i386-32bit.xml"
TARGET_SYSTBL_ABI=i386 TARGET_SYSTBL_ABI=i386
TARGET_SYSTBL=syscall_32.tbl TARGET_SYSTBL=syscall_32.tbl
;; ;;
@ -7667,6 +7668,7 @@ case "$target_name" in
TARGET_SYSTBL_ABI=common,nospu,32 TARGET_SYSTBL_ABI=common,nospu,32
echo "TARGET_ABI32=y" >> $config_target_mak echo "TARGET_ABI32=y" >> $config_target_mak
gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml" gdb_xml_files="power64-core.xml power-fpu.xml power-altivec.xml power-spe.xml power-vsx.xml"
deprecated_features="ppc64abi32 ${deprecated_features}"
;; ;;
riscv32) riscv32)
TARGET_BASE_ARCH=riscv TARGET_BASE_ARCH=riscv
@ -8011,6 +8013,12 @@ fi
touch ninjatool.stamp touch ninjatool.stamp
fi fi
if test -n "${deprecated_features}"; then
echo "Warning, deprecated features enabled."
echo "Please see docs/system/deprecated.rst"
echo " features: ${deprecated_features}"
fi
# Save the configure command line for later reuse. # Save the configure command line for later reuse.
cat <<EOD >config.status cat <<EOD >config.status
#!/bin/sh #!/bin/sh