[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/10] configure: don't enable ppc64abi32-linux-user by default
From: |
Alex Bennée |
Subject: |
[PULL 06/10] configure: don't enable ppc64abi32-linux-user by default |
Date: |
Thu, 10 Sep 2020 14:15:00 +0100 |
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>
diff --git a/configure b/configure
index 4231d56bcc0..2b5492a0d63 100755
--- a/configure
+++ b/configure
@@ -542,6 +542,8 @@ gettext=""
bogus_os="no"
malloc_trim=""
+deprecated_features=""
+
# parse CC options first
for opt do
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"
fi
-if test -z "$target_list_exclude"; then
- for config in $mak_wilds; do
- default_target_list="${default_target_list} $(basename "$config" .mak)"
- done
-else
- exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g')
- for config in $mak_wilds; do
- target="$(basename "$config" .mak)"
- exclude="no"
- for excl in $exclude_list; do
- if test "$excl" = "$target"; then
- exclude="yes"
- break;
- fi
- done
- if test "$exclude" = "no"; then
- default_target_list="${default_target_list} $target"
+if test -z "$target_list_exclude" -a -z "$target_list"; then
+ # if the user doesn't specify anything lets skip deprecating stuff
+ target_list_exclude=ppc64abi32-linux-user
+fi
+
+exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g')
+for config in $mak_wilds; do
+ target="$(basename "$config" .mak)"
+ exclude="no"
+ for excl in $exclude_list; do
+ if test "$excl" = "$target"; then
+ exclude="yes"
+ break;
fi
done
-fi
+ if test "$exclude" = "no"; then
+ default_target_list="${default_target_list} $target"
+ fi
+done
# 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/'))
@@ -7557,7 +7558,7 @@ TARGET_SYSTBL=""
case "$target_name" in
i386)
mttcg="yes"
- gdb_xml_files="i386-32bit.xml"
+ gdb_xml_files="i386-32bit.xml"
TARGET_SYSTBL_ABI=i386
TARGET_SYSTBL=syscall_32.tbl
;;
@@ -7667,6 +7668,7 @@ case "$target_name" in
TARGET_SYSTBL_ABI=common,nospu,32
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"
+ deprecated_features="ppc64abi32 ${deprecated_features}"
;;
riscv32)
TARGET_BASE_ARCH=riscv
@@ -8011,6 +8013,12 @@ fi
touch ninjatool.stamp
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.
cat <<EOD >config.status
#!/bin/sh
--
2.20.1
- [PULL 00/10] testing and other mix fixes, Alex Bennée, 2020/09/10
- [PULL 01/10] CODING_STYLE.rst: flesh out our naming conventions., Alex Bennée, 2020/09/10
- [PULL 02/10] usb-host: restrict workaround to new libusb versions, Alex Bennée, 2020/09/10
- [PULL 05/10] docs/system/deprecated: mark ppc64abi32-linux-user for deprecation, Alex Bennée, 2020/09/10
- [PULL 04/10] target/mips: simplify gen_compute_imm_branch logic, Alex Bennée, 2020/09/10
- [PULL 03/10] tests/meson.build: fp tests don't need CONFIG_TCG, Alex Bennée, 2020/09/10
- [PULL 07/10] hw/i386: make explicit clearing of pch_rev_id, Alex Bennée, 2020/09/10
- [PULL 06/10] configure: don't enable ppc64abi32-linux-user by default,
Alex Bennée <=
- [PULL 10/10] plugins: move the more involved plugins to contrib, Alex Bennée, 2020/09/10
- [PULL 08/10] tests: bump avocado version, Alex Bennée, 2020/09/10
- [PULL 09/10] tests/acceptance: Add Test.fetch_asset(cancel_on_missing=True), Alex Bennée, 2020/09/10
- Re: [PULL 00/10] testing and other mix fixes, Peter Maydell, 2020/09/13