Re: [PATCH 2/2] Drop the deprecated unicore32 target

[Thomas Huth]

On 03/05/2021 10.40, Markus Armbruster wrote:
> Target unicore32 was deprecated in commit 8e4ff4a8d2b, v5.2.0.  See
> there for rationale.
>
> Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
[...]
> diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
> index e914d34298..2592c4fbd5 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -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)
>   ''''''''''''''''''''''''''''''''''''''''''
>   
> diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst
> index e9850e4b96..b399084438 100644
> --- a/docs/system/removed-features.rst
> +++ b/docs/system/removed-features.rst
> @@ -293,12 +293,19 @@ available to make sure that the code is still working, so 
> it has been removed
>   without replacement.
>   
>   ``lm32`` CPUs (removed in 6.1.0)
> -'''''''''''''''''''''''''''
> +''''''''''''''''''''''''''''''''

Nit: That hunk should go into the previous patch.

> diff --git a/fpu/softfloat-specialize.c.inc b/fpu/softfloat-specialize.c.inc
> index 45b7bf81dc..b5b50537bf 100644
> --- a/fpu/softfloat-specialize.c.inc
> +++ b/fpu/softfloat-specialize.c.inc
> @@ -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;
> @@ -146,11 +146,10 @@ static FloatParts parts_default_nan(float_status *status)
>       /* snan_bit_is_one, set msb-1.  */
>       frac = 1ULL << (DECOMPOSED_BINARY_POINT - 2);
>   #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.
>        */

I guess you'll get a conflict here with my moxie removal patch... but that 
should be easy to solve.

FWIW:
Acked-by: Thomas Huth <thuth@redhat.com>