[PULL 01/11] configure: include moxie-softmmu in deprecated_targets_list

[Alex Bennée]

We still build it but there is no point including it in the normal
builds as it is ushered out of the door.

Fixes: 4258c8e221 ("docs/system/deprecated: Mark the 'moxie' CPU as deprecated")
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20201210190417.31673-2-alex.bennee@linaro.org>

diff --git a/configure b/configure
index c228f7c21e..d37ec98aa9 100755
--- a/configure
+++ b/configure
@@ -1620,7 +1620,7 @@ if [ "$ARCH" = "unknown" ]; then
 fi
 
 default_target_list=""
-deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
+deprecated_targets_list=moxie-softmmu,ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu
 deprecated_features=""
 mak_wilds=""
 
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 98bff03b47..b3bcaacf7b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@ build-deprecated:
     IMAGE: debian-all-test-cross
     CONFIGURE_ARGS: --disable-docs --disable-tools
     MAKE_CHECK_ARGS: build-tcg
-    TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
+    TARGETS: moxie-softmmu ppc64abi32-linux-user tilegx-linux-user lm32-softmmu
       unicore32-softmmu
   artifacts:
     expire_in: 2 days
-- 
2.20.1