Skip to content

Commit

Permalink
Drop the deprecated unicore32 target
Browse files Browse the repository at this point in the history
Target unicore32 was deprecated in commit 8e4ff4a, v5.2.0.  See
there for rationale.

Cc: Guan Xuetao <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>
Message-Id: <[email protected]>
Acked-by: Thomas Huth <[email protected]>
  • Loading branch information
Markus Armbruster committed May 12, 2021
1 parent 9d49bcf commit 4369223
Show file tree
Hide file tree
Showing 42 changed files with 16 additions and 4,582 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ build-deprecated:
IMAGE: debian-all-test-cross
CONFIGURE_ARGS: --disable-tools
MAKE_CHECK_ARGS: build-tcg
TARGETS: ppc64abi32-linux-user unicore32-softmmu
TARGETS: ppc64abi32-linux-user
artifacts:
expire_in: 2 days
paths:
Expand Down
15 changes: 0 additions & 15 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,6 @@ F: hw/sparc64/
F: include/hw/sparc/sparc64.h
F: disas/sparc.c

UniCore32 TCG CPUs
M: Guan Xuetao <[email protected]>
S: Maintained
F: target/unicore32/
F: hw/unicore32/
F: include/hw/unicore32/

X86 TCG CPUs
M: Paolo Bonzini <[email protected]>
M: Richard Henderson <[email protected]>
Expand Down Expand Up @@ -1508,14 +1501,6 @@ F: hw/s390x/s390-pci*
F: include/hw/s390x/s390-pci*
L: [email protected]

UniCore32 Machines
------------------
PKUnity-3 SoC initramfs-with-busybox
M: Guan Xuetao <[email protected]>
S: Maintained
F: hw/*/puv3*
F: hw/unicore32/

X86 Machines
------------
PC
Expand Down
2 changes: 1 addition & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -1663,7 +1663,7 @@ if [ "$ARCH" = "unknown" ]; then
fi

default_target_list=""
deprecated_targets_list=ppc64abi32-linux-user,unicore32-softmmu
deprecated_targets_list=ppc64abi32-linux-user
deprecated_features=""
mak_wilds=""

Expand Down
6 changes: 0 additions & 6 deletions default-configs/devices/unicore32-softmmu.mak

This file was deleted.

1 change: 0 additions & 1 deletion default-configs/targets/unicore32-softmmu.mak

This file was deleted.

8 changes: 0 additions & 8 deletions docs/system/deprecated.rst
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,6 @@ from Linux upstream kernel, declare it deprecated.
System emulator CPUS
--------------------

``unicore32`` CPUs (since 5.2.0)
''''''''''''''''''''''''''''''''

The ``unicore32`` guest CPU support is deprecated and will be removed in
a future version of QEMU. Support for this CPU was removed from the
upstream Linux kernel, and there is no available upstream toolchain
to build binaries for it.

``Icelake-Client`` CPU Model (since 5.2.0)
''''''''''''''''''''''''''''''''''''''''''

Expand Down
7 changes: 7 additions & 0 deletions docs/system/removed-features.rst
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,13 @@ The only public user of this architecture was the milkymist project,
which has been dead for years; there was never an upstream Linux
port. Removed without replacement.

``unicore32`` CPUs (since 6.1.0)
''''''''''''''''''''''''''''''''

Support for this CPU was removed from the upstream Linux kernel, and
there is no available upstream toolchain to build binaries for it.
Removed without replacement.

System emulator machines
------------------------

Expand Down
11 changes: 5 additions & 6 deletions fpu/softfloat-specialize.c.inc
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static inline bool snan_bit_is_one(float_status *status)
{
#if defined(TARGET_MIPS)
return status->snan_bit_is_one;
#elif defined(TARGET_HPPA) || defined(TARGET_UNICORE32) || defined(TARGET_SH4)
#elif defined(TARGET_HPPA) || defined(TARGET_SH4)
return 1;
#else
return 0;
Expand Down Expand Up @@ -149,11 +149,10 @@ static FloatParts parts_default_nan(float_status *status)
sign = 1;
frac = ~0ULL;
#else
/* This case is true for Alpha, ARM, MIPS, OpenRISC, PPC, RISC-V,
* S390, SH4, TriCore, and Xtensa. I cannot find documentation
* for Unicore32; the choice from the original commit is unchanged.
* Our other supported targets, CRIS, Nios2, and Tile,
* do not have floating-point.
/*
* This case is true for Alpha, ARM, MIPS, OpenRISC, PPC, RISC-V,
* S390, SH4, TriCore, and Xtensa. Our other supported targets,
* CRIS, Nios2, and Tile, do not have floating-point.
*/
if (snan_bit_is_one(status)) {
/* set all bits other than msb */
Expand Down
1 change: 0 additions & 1 deletion hw/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ source sh4/Kconfig
source sparc/Kconfig
source sparc64/Kconfig
source tricore/Kconfig
source unicore32/Kconfig
source xtensa/Kconfig

# Symbols used by multiple targets
Expand Down
1 change: 0 additions & 1 deletion hw/dma/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_dma.c'))
softmmu_ss.add(when: 'CONFIG_RC4030', if_true: files('rc4030.c'))
softmmu_ss.add(when: 'CONFIG_PL080', if_true: files('pl080.c'))
softmmu_ss.add(when: 'CONFIG_PL330', if_true: files('pl330.c'))
Expand Down
119 changes: 0 additions & 119 deletions hw/dma/puv3_dma.c

This file was deleted.

1 change: 0 additions & 1 deletion hw/gpio/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
softmmu_ss.add(when: 'CONFIG_GPIO_PWR', if_true: files('gpio_pwr.c'))
softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c'))
softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))

softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
Expand Down
Loading

0 comments on commit 4369223

Please sign in to comment.