From 9905b35d8a4735c500f01369c3d4242c85e1c4cb Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Mon, 10 Nov 2025 19:54:36 +0100 Subject: [PATCH] tools: Remove s390 compat support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove s390 compat support from everything within tools, since s390 compat support will be removed from the kernel. Reviewed-by: Arnd Bergmann Acked-by: Thomas Weißschuh # tools/nolibc selftests/nolibc Reviewed-by: Thomas Weißschuh # selftests/vDSO Acked-by: Alexei Starovoitov # bpf bits Signed-off-by: Heiko Carstens --- src/libbpf.c | 4 ---- src/usdt.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/libbpf.c b/src/libbpf.c index 706e748..3dc8a80 100644 --- a/src/libbpf.c +++ b/src/libbpf.c @@ -11571,8 +11571,6 @@ static const char *arch_specific_syscall_pfx(void) return "ia32"; #elif defined(__s390x__) return "s390x"; -#elif defined(__s390__) - return "s390"; #elif defined(__arm__) return "arm"; #elif defined(__aarch64__) @@ -12359,8 +12357,6 @@ static const char *arch_specific_lib_paths(void) return "/lib/i386-linux-gnu"; #elif defined(__s390x__) return "/lib/s390x-linux-gnu"; -#elif defined(__s390__) - return "/lib/s390-linux-gnu"; #elif defined(__arm__) && defined(__SOFTFP__) return "/lib/arm-linux-gnueabi"; #elif defined(__arm__) && !defined(__SOFTFP__) diff --git a/src/usdt.c b/src/usdt.c index c174b40..d1524f6 100644 --- a/src/usdt.c +++ b/src/usdt.c @@ -1376,8 +1376,6 @@ static int parse_usdt_arg(const char *arg_str, int arg_num, struct usdt_arg_spec #elif defined(__s390x__) -/* Do not support __s390__ for now, since user_pt_regs is broken with -m31. */ - static int parse_usdt_arg(const char *arg_str, int arg_num, struct usdt_arg_spec *arg, int *arg_sz) { unsigned int reg;