Skip to content

Commit 51cdb68

Browse files
committed
Revert "Remove the unused sh4eb target"
This reverts commit 73ceb12. The "r2d" machine can work in big endian mode, see: https://lore.kernel.org/qemu-devel/[email protected]/ So the reasoning for removing sh4eb was wrong. Message-ID: <[email protected]> Reviewed-by: Daniel P. Berrangé <[email protected]> Reviewed-by: Rob Landley <[email protected]> Signed-off-by: Thomas Huth <[email protected]>
1 parent 786bc22 commit 51cdb68

File tree

11 files changed

+14
-5
lines changed

11 files changed

+14
-5
lines changed

.gitlab-ci.d/buildtest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ build-system-debian:
7272
variables:
7373
IMAGE: debian
7474
CONFIGURE_ARGS: --with-coroutine=sigaltstack
75-
TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4-softmmu
75+
TARGETS: arm-softmmu i386-softmmu riscv64-softmmu sh4eb-softmmu
7676
sparc-softmmu xtensa-softmmu
7777
MAKE_CHECK_ARGS: check-build
7878

.gitlab-ci.d/cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ x64-freebsd-14-build:
5757
CIRRUS_VM_RAM: 8G
5858
UPDATE_COMMAND: pkg update; pkg upgrade -y
5959
INSTALL_COMMAND: pkg install -y
60-
CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,xtensa-softmmu
60+
CONFIGURE_ARGS: --target-list-exclude=arm-softmmu,i386-softmmu,microblaze-softmmu,mips64el-softmmu,mipsel-softmmu,mips-softmmu,ppc-softmmu,sh4eb-softmmu,xtensa-softmmu
6161
TEST_TARGETS: check
6262

6363
aarch64-macos-build:

.gitlab-ci.d/crossbuilds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ cross-win64-system:
176176
EXTRA_CONFIGURE_OPTS: --enable-fdt=internal --disable-plugins
177177
CROSS_SKIP_TARGETS: alpha-softmmu avr-softmmu hppa-softmmu
178178
m68k-softmmu microblazeel-softmmu
179-
or1k-softmmu rx-softmmu sh4-softmmu sparc64-softmmu
179+
or1k-softmmu rx-softmmu sh4eb-softmmu sparc64-softmmu
180180
tricore-softmmu xtensaeb-softmmu
181181
artifacts:
182182
when: on_success

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ jobs:
223223
- genisoimage
224224
env:
225225
- CONFIG="--disable-containers --audio-drv-list=sdl --disable-user
226-
--target-list=arm-softmmu,avr-softmmu,microblaze-softmmu,sh4-softmmu,sparc64-softmmu,xtensaeb-softmmu"
226+
--target-list=arm-softmmu,avr-softmmu,microblaze-softmmu,sh4eb-softmmu,sparc64-softmmu,xtensaeb-softmmu"
227227

228228
- name: "[s390x] GCC (user)"
229229
arch: s390x
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Default configuration for sh4eb-softmmu
2+
3+
include ../sh4-softmmu/default.mak

configs/targets/sh4eb-softmmu.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
TARGET_ARCH=sh4
2+
TARGET_BIG_ENDIAN=y

qapi/machine.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
'loongarch64', 'm68k', 'microblaze', 'microblazeel', 'mips', 'mips64',
3838
'mips64el', 'mipsel', 'or1k', 'ppc',
3939
'ppc64', 'riscv32', 'riscv64', 'rx', 's390x', 'sh4',
40-
'sparc', 'sparc64', 'tricore',
40+
'sh4eb', 'sparc', 'sparc64', 'tricore',
4141
'x86_64', 'xtensa', 'xtensaeb' ] }
4242

4343
##

tests/qemu-iotests/testenv.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ def __init__(self, source_dir: str, build_dir: str,
245245
('riscv64', 'virt'),
246246
('rx', 'gdbsim-r5f562n8'),
247247
('sh4', 'r2d'),
248+
('sh4eb', 'r2d'),
248249
('tricore', 'tricore_testboard')
249250
)
250251
for suffix, machine in machine_map:

tests/qtest/endianness-test.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ static const TestCase test_cases[] = {
4141
{ "ppc64", "pseries-2.7", 0x10080000000ULL,
4242
.bswap = true, .superio = "i82378" },
4343
{ "sh4", "r2d", 0xfe240000, .superio = "i82378" },
44+
{ "sh4eb", "r2d", 0xfe240000, .bswap = true, .superio = "i82378" },
4445
{ "sparc64", "sun4u", 0x1fe02000000LL, .bswap = true },
4546
{ "x86_64", "pc", -1 },
4647
{}

tests/qtest/machine-none-test.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ static struct arch2cpu cpus_map[] = {
4242
{ "ppc64", "power8e_v2.1" },
4343
{ "s390x", "qemu" },
4444
{ "sh4", "sh7750r" },
45+
{ "sh4eb", "sh7751r" },
4546
{ "sparc", "LEON2" },
4647
{ "sparc64", "Fujitsu Sparc64" },
4748
{ "tricore", "tc1796" },

0 commit comments

Comments
 (0)