Commit 169ebcbb authored by Heiko Carstens's avatar Heiko Carstens
Browse files

tools: Remove s390 compat support 



Remove s390 compat support from everything within tools, since s390 compat
support will be removed from the kernel.

Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: Thomas Weißschuh <linux@weissschuh.net> # tools/nolibc selftests/nolibc
Reviewed-by: Thomas Weißschuh <linux@weissschuh.net> # selftests/vDSO
Acked-by: Alexei Starovoitov <ast@kernel.org> # bpf bits
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 7afb095d

tools/arch/s390/include/uapi/asm/bitsperlong.h

+0 −4
Original line number Diff line number Diff line
@@ -2,11 +2,7 @@ 
#ifndef __ASM_S390_BITSPERLONG_H

#define __ASM_S390_BITSPERLONG_H



#ifndef __s390x__

#define __BITS_PER_LONG 32

#else

#define __BITS_PER_LONG 64

#endif



#include <asm-generic/bitsperlong.h>

tools/include/nolibc/arch-s390.h

+0 −5
Original line number Diff line number Diff line
@@ -143,13 +143,8 @@ 
void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _start(void)

{

	__asm__ volatile (

#ifdef __s390x__

		"lgr	%r2, %r15\n"          /* save stack pointer to %r2, as arg1 of _start_c */

		"aghi	%r15, -160\n"         /* allocate new stackframe                        */

#else

		"lr	%r2, %r15\n"

		"ahi	%r15, -96\n"

#endif

		"xc	0(8,%r15), 0(%r15)\n" /* clear backchain                                */

		"brasl	%r14, _start_c\n"     /* transfer to c runtime                          */

	);

tools/include/nolibc/arch.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "arch-powerpc.h"

#elif defined(__riscv)

#include "arch-riscv.h"

#elif defined(__s390x__) || defined(__s390__)

#elif defined(__s390x__)

#include "arch-s390.h"

#elif defined(__loongarch__)

#include "arch-loongarch.h"

tools/lib/bpf/libbpf.c

+0 −4
Original line number Diff line number Diff line
@@ -11325,8 +11325,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__)
@@ -12113,8 +12111,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__)

tools/lib/bpf/usdt.c

+0 −2
Original line number Diff line number Diff line
@@ -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;