diff mbox series

[v2,3/8] configure: move deprecated feature processing to supported_target

Message ID 20200915134317.11110-4-alex.bennee@linaro.org
State New
Headers show
Series configure deprecation, linux-user and iotest fixes | expand

Commit Message

Alex Bennée Sept. 15, 2020, 1:43 p.m. UTC 
This is the common point at which we validate targets so it makes
sense to add_to deprecated_features here. It will make future target
deprecation easier as we only need to tweak one list.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 configure | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

-- 
2.20.1

Comments

Michael Tokarev Sept. 15, 2020, 1:51 p.m. UTC | #1 
15.09.2020 16:43, Alex Bennée wrote:
> This is the common point at which we validate targets so it makes

> sense to add_to deprecated_features here. It will make future target

> deprecation easier as we only need to tweak one list.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  configure | 14 ++++++++++----


> +

> +    # if a deprecated target is enabled we note it here

> +    if echo "$deprecated_targets_list" | grep -q "$1"; then

> +        add_to deprecated_features $1

> +    fi



  case " $deprecated_targets_list " in (*" $1 "*) add_to deprecated_features $1;; esac

JFYI, - there's nothing wrong with echo|grep, it will work about the same way.. :)

/mjt
diff mbox series

Patch

diff --git a/configure b/configure
index ce27eafb0a9e..51d03a8d340f 100755
--- a/configure
+++ b/configure
@@ -280,6 +280,9 @@  supported_whpx_target() {
     return 1
 }
 
+deprecated_targets_list=ppc64abi32-linux-user
+deprecated_features=""
+
 supported_target() {
     case "$1" in
         *-softmmu)
@@ -301,6 +304,12 @@  supported_target() {
             return 1
             ;;
     esac
+
+    # if a deprecated target is enabled we note it here
+    if echo "$deprecated_targets_list" | grep -q "$1"; then
+        add_to deprecated_features $1
+    fi
+
     test "$tcg" = "yes" && return 0
     supported_kvm_target "$1" && return 0
     supported_xen_target "$1" && return 0
@@ -542,8 +551,6 @@  gettext=""
 bogus_os="no"
 malloc_trim=""
 
-deprecated_features=""
-
 # parse CC options first
 for opt do
   optarg=$(expr "x$opt" : 'x[^=]*=\(.*\)')
@@ -1724,7 +1731,7 @@  fi
 
 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
+    target_list_exclude=$deprecated_targets_list
 fi
 
 exclude_list=$(echo "$target_list_exclude" | sed -e 's/,/ /g')
@@ -7668,7 +7675,6 @@  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