buildsys: Stop checking for ESA/390 host
We still build QEMU tools on 32-bit hosts (see commit cf634dfcd8f), however no OS supported by QEMU still runs on ESA/390 (Linux dropped support in release 4.1 in 2015). Remove the configure check, directly checking for the 64-bit z/Architecture. Also per commit 3704993f545 from 2020: "we don't support s390, only 64-bit s390x hosts". Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-ID: <20260519171240.97420-4-philmd@linaro.org> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Philippe Mathieu-Daudé committed
May 19, 2026 at 19:12 UTC
23cec0b2cd2eed05fc67148fc971bdcd147d3e94
6 files changed
+7
-15
block/file-posix.c
+1
-1
@@ -79,7 +79,7 @@
79
#include <linux/hdreg.h>
80
#include <linux/magic.h>
81
#include <scsi/sg.h>
82
-#ifdef __s390__
82
+#ifdef __s390x__
83
#include <asm/dasd.h>
84
#endif
85
#ifndef FS_NOCOW_FL
configure
+2
-10
@@ -399,12 +399,8 @@ elif check_define _ARCH_PPC64 ; then
399
else
400
cpu="ppc64"
401
fi
402
-elif check_define __s390__ ; then
403
- if check_define __s390x__ ; then
404
- cpu="s390x"
405
- else
406
- cpu="s390"
407
- fi
402
+elif check_define __s390x__ ; then
403
+ cpu="s390x"
404
elif check_define __riscv && check_define _LP64 ; then
405
cpu="riscv64"
406
elif check_define __aarch64__ ; then
@@ -461,10 +457,6 @@ case "$cpu" in
457
linux_arch=riscv
458
;;
459
464
- s390)
465
- linux_arch=s390
466
- CPU_CFLAGS="-m31"
467
- ;;
460
s390x)
461
host_arch=s390x
462
linux_arch=s390
disas/disas-host.c
+1
-1
@@ -74,7 +74,7 @@ static void initialize_debug_host(CPUDebug *s)
74
s->info.print_insn = print_insn_little_mips;
75
#elif defined(__m68k__)
76
s->info.print_insn = print_insn_m68k;
77
-#elif defined(__s390__)
77
+#elif defined(__s390x__)
78
s->info.cap_arch = CS_ARCH_SYSZ;
79
s->info.cap_insn_unit = 2;
80
s->info.cap_insn_split = 6;
include/qemu/cacheflush.h
+1
-1
@@ -19,7 +19,7 @@
19
* mappings of the same physical page(s).
20
*/
21
22
-#if defined(__x86_64__) || defined(__s390__)
22
+#if defined(__x86_64__) || defined(__s390x__)
23
24
static inline void flush_idcache_range(uintptr_t rx, uintptr_t rw, size_t len)
25
{
include/qemu/timer.h
+1
-1
@@ -889,7 +889,7 @@ static inline int64_t cpu_get_host_ticks(void)
889
return val;
890
}
891
892
-#elif defined(__s390__)
892
+#elif defined(__s390x__)
893
894
static inline int64_t cpu_get_host_ticks(void)
895
{
util/cacheflush.c
+1
-1
@@ -223,7 +223,7 @@ static void __attribute__((constructor)) init_cache_info(void)
223
* Architecture (+ OS) specific cache flushing mechanisms.
224
*/
225
226
-#if defined(__x86_64__) || defined(__s390__)
226
+#if defined(__x86_64__) || defined(__s390x__)
227
228
/* Caches are coherent and do not require flushing; symbol inline. */
229