Skip to content

Commit 44e4075

Browse files
committed
target/cris: Remove the deprecated CRIS target
The CRIS target is deprecated since v9.0 (commit c7bbef4 "docs: mark CRIS support as deprecated"). Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Thomas Huth <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Acked-by: Edgar E. Iglesias <[email protected]> Message-ID: <[email protected]>
1 parent 01d01ed commit 44e4075

29 files changed

+9
-7306
lines changed

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ F: tests/functional/test_avr_mega2560.py
227227
CRIS TCG CPUs
228228
M: Edgar E. Iglesias <[email protected]>
229229
S: Maintained
230-
F: target/cris/
231230
F: disas/cris.c
232231

233232
Hexagon TCG CPUs

docs/about/deprecated.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -206,14 +206,6 @@ in the QEMU object model anymore. ``Sun-UltraSparc-IIIi+`` and
206206
but for consistency these will get removed in a future release, too.
207207
Use ``Sun-UltraSparc-IIIi-plus`` and ``Sun-UltraSparc-IV-plus`` instead.
208208

209-
CRIS CPU architecture (since 9.0)
210-
'''''''''''''''''''''''''''''''''
211-
212-
The CRIS architecture was pulled from Linux in 4.17 and the compiler
213-
is no longer packaged in any distro making it harder to run the
214-
``check-tcg`` tests. Unless we can improve the testing situation there
215-
is a chance the code will bitrot without anyone noticing.
216-
217209
System emulator machines
218210
------------------------
219211

docs/about/emulation.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ depending on the guest architecture.
2626
- :ref:`Yes<AVR-System-emulator>`
2727
- No
2828
- 8 bit micro controller, often used in maker projects
29-
* - Cris
30-
- Yes
31-
- Yes
32-
- Embedded RISC chip developed by AXIS
3329
* - Hexagon
3430
- No
3531
- Yes

docs/about/removed-features.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,6 +889,13 @@ Nios II CPU (removed in 9.1)
889889
QEMU Nios II architecture was orphan; Intel has EOL'ed the Nios II
890890
processor IP (see `Intel discontinuance notification`_).
891891

892+
CRIS CPU architecture (removed in 9.2)
893+
''''''''''''''''''''''''''''''''''''''
894+
895+
The CRIS architecture was pulled from Linux in 4.17 and the compiler
896+
was no longer packaged in any distro making it harder to run the
897+
``check-tcg`` tests.
898+
892899
System accelerators
893900
-------------------
894901

fpu/softfloat-specialize.c.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ static void parts64_default_nan(FloatParts64 *p, float_status *status)
151151
#else
152152
/*
153153
* This case is true for Alpha, ARM, MIPS, OpenRISC, PPC, RISC-V,
154-
* S390, SH4, TriCore, and Xtensa. Our other supported targets,
155-
* such CRIS, do not have floating-point.
154+
* S390, SH4, TriCore, and Xtensa. Our other supported targets
155+
* do not have floating-point.
156156
*/
157157
if (snan_bit_is_one(status)) {
158158
/* set all bits other than msb */

include/exec/poison.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#pragma GCC poison TARGET_AARCH64
1212
#pragma GCC poison TARGET_ALPHA
1313
#pragma GCC poison TARGET_ARM
14-
#pragma GCC poison TARGET_CRIS
1514
#pragma GCC poison TARGET_HEXAGON
1615
#pragma GCC poison TARGET_HPPA
1716
#pragma GCC poison TARGET_LOONGARCH64

scripts/coverity-scan/COMPONENTS.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ arm
99
avr
1010
~ .*/qemu((/include)?/hw/avr/.*|/target/avr/.*)
1111

12-
cris
13-
~ .*/qemu/target/cris/.*
14-
1512
hexagon-gen (component should be ignored in analysis)
1613
~ .*/qemu(/target/hexagon/.*generated.*)
1714

target/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
source alpha/Kconfig
22
source arm/Kconfig
33
source avr/Kconfig
4-
source cris/Kconfig
54
source hppa/Kconfig
65
source i386/Kconfig
76
source loongarch/Kconfig

target/cris/Kconfig

Lines changed: 0 additions & 2 deletions
This file was deleted.

target/cris/cpu-param.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)