diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2020-09-15 14:43:17 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2020-09-16 10:07:01 +0100 |
| commit | 3ffc7f013763bf4fc50c3b403cbacca2bee68cfa (patch) | |
| tree | edf1675e59bd3d10ff971c7e40d08ea811c2c9a1 | |
| parent | 1c0c06b1ea29d6f81424011f9b69b77cb0ea87ce (diff) | |
configure: add [lm32|unicore32]-softmmu to deprecation logic
While we are at it move the few places where they are into the
deprecation build bucket.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200915134317.11110-9-alex.bennee@linaro.org>
| -rw-r--r-- | .gitlab-ci.yml | 9 | ||||
| -rw-r--r-- | .shippable.yml | 2 | ||||
| -rwxr-xr-x | configure | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f027b55aef..a18e18b57e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -134,7 +134,7 @@ build-system-fedora: variables: IMAGE: fedora CONFIGURE_ARGS: --disable-gcrypt --enable-nettle - TARGETS: tricore-softmmu unicore32-softmmu microblaze-softmmu mips-softmmu + TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build artifacts: @@ -166,7 +166,7 @@ build-system-centos: variables: IMAGE: centos8 CONFIGURE_ARGS: --disable-nettle --enable-gcrypt - TARGETS: ppc64-softmmu lm32-softmmu or1k-softmmu s390x-softmmu + TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build artifacts: @@ -259,9 +259,10 @@ build-deprecated: <<: *native_build_job_definition variables: IMAGE: debian-all-test-cross - CONFIGURE_ARGS: --disable-docs --disable-tools --disable-system + CONFIGURE_ARGS: --disable-docs --disable-tools MAKE_CHECK_ARGS: check-tcg - TARGETS: ppc64abi32-linux-user tilegx-linux-user + TARGETS: ppc64abi32-linux-user tilegx-linux-user lm32-softmmu + unicore32-softmmu allow_failure: true build-oss-fuzz: diff --git a/.shippable.yml b/.shippable.yml index 89d8be4291..0b4fd6df1d 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -8,7 +8,7 @@ env: - IMAGE=debian-amd64 TARGET_LIST=x86_64-softmmu,x86_64-linux-user - IMAGE=debian-win32-cross - TARGET_LIST=arm-softmmu,i386-softmmu,lm32-softmmu + TARGET_LIST=arm-softmmu,i386-softmmu - IMAGE=debian-win64-cross TARGET_LIST=aarch64-softmmu,sparc64-softmmu,x86_64-softmmu - IMAGE=debian-armel-cross @@ -280,7 +280,7 @@ supported_whpx_target() { return 1 } -deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user +deprecated_targets_list=ppc64abi32-linux-user,tilegx-linux-user,lm32-softmmu,unicore32-softmmu deprecated_features="" supported_target() { |