From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Tue, 19 May 2026 12:03:45 +0000 (+0200)
Subject: tests/tcg: Explicitly check for 64-bit z/Architecture
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c81404f25e697dfcd603ac51c25319aa1fd1f36a;p=thirdparty%2Fqemu.git

tests/tcg: Explicitly check for 64-bit z/Architecture

We do not support the 32-bit ESA/390 target, only the
64-bit z/Architecture.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20260519171240.97420-5-philmd@linaro.org>
---

diff --git a/tests/tcg/multiarch/nop_func.h b/tests/tcg/multiarch/nop_func.h
index f714d21000..26d3a76eb6 100644
--- a/tests/tcg/multiarch/nop_func.h
+++ b/tests/tcg/multiarch/nop_func.h
@@ -15,7 +15,7 @@ static const char nop_func[] = {
     0x1e, 0xff, 0x2f, 0xe1,     /* bx lr */
 #elif defined(__riscv)
     0x67, 0x80, 0x00, 0x00,     /* ret */
-#elif defined(__s390__)
+#elif defined(__s390x__)
     0x07, 0xfe,                 /* br %r14 */
 #elif defined(__i386__) || defined(__x86_64__)
     0xc3,                       /* ret */