Skip to content

Commit 169ebcb

Browse files
hcahcahcahca
committed
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: Arnd 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: Heiko Carstens <hca@linux.ibm.com>
1 parent 7afb095 commit 169ebcb

9 files changed

Lines changed: 2 additions & 69 deletions

File tree

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
#ifndef __ASM_S390_BITSPERLONG_H
33
#define __ASM_S390_BITSPERLONG_H
44

5-
#ifndef __s390x__
6-
#define __BITS_PER_LONG 32
7-
#else
85
#define __BITS_PER_LONG 64
9-
#endif
106

117
#include <asm-generic/bitsperlong.h>
128

‎tools/include/nolibc/arch-s390.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,8 @@
143143
void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _start(void)
144144
{
145145
__asm__ volatile (
146-
#ifdef __s390x__
147146
"lgr %r2, %r15\n" /* save stack pointer to %r2, as arg1 of _start_c */
148147
"aghi %r15, -160\n" /* allocate new stackframe */
149-
#else
150-
"lr %r2, %r15\n"
151-
"ahi %r15, -96\n"
152-
#endif
153148
"xc 0(8,%r15), 0(%r15)\n" /* clear backchain */
154149
"brasl %r14, _start_c\n" /* transfer to c runtime */
155150
);

‎tools/include/nolibc/arch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "arch-powerpc.h"
2828
#elif defined(__riscv)
2929
#include "arch-riscv.h"
30-
#elif defined(__s390x__) || defined(__s390__)
30+
#elif defined(__s390x__)
3131
#include "arch-s390.h"
3232
#elif defined(__loongarch__)
3333
#include "arch-loongarch.h"

‎tools/lib/bpf/libbpf.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11325,8 +11325,6 @@ static const char *arch_specific_syscall_pfx(void)
1132511325
return "ia32";
1132611326
#elif defined(__s390x__)
1132711327
return "s390x";
11328-
#elif defined(__s390__)
11329-
return "s390";
1133011328
#elif defined(__arm__)
1133111329
return "arm";
1133211330
#elif defined(__aarch64__)
@@ -12113,8 +12111,6 @@ static const char *arch_specific_lib_paths(void)
1211312111
return "/lib/i386-linux-gnu";
1211412112
#elif defined(__s390x__)
1211512113
return "/lib/s390x-linux-gnu";
12116-
#elif defined(__s390__)
12117-
return "/lib/s390-linux-gnu";
1211812114
#elif defined(__arm__) && defined(__SOFTFP__)
1211912115
return "/lib/arm-linux-gnueabi";
1212012116
#elif defined(__arm__) && !defined(__SOFTFP__)

‎tools/lib/bpf/usdt.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1376,8 +1376,6 @@ static int parse_usdt_arg(const char *arg_str, int arg_num, struct usdt_arg_spec
13761376

13771377
#elif defined(__s390x__)
13781378

1379-
/* Do not support __s390__ for now, since user_pt_regs is broken with -m31. */
1380-
13811379
static int parse_usdt_arg(const char *arg_str, int arg_num, struct usdt_arg_spec *arg, int *arg_sz)
13821380
{
13831381
unsigned int reg;

‎tools/testing/selftests/nolibc/Makefile.nolibc‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ IMAGE_riscv = arch/riscv/boot/Image
8787
IMAGE_riscv32 = arch/riscv/boot/Image
8888
IMAGE_riscv64 = arch/riscv/boot/Image
8989
IMAGE_s390x = arch/s390/boot/bzImage
90-
IMAGE_s390 = arch/s390/boot/bzImage
9190
IMAGE_loongarch = arch/loongarch/boot/vmlinuz.efi
9291
IMAGE_sparc32 = arch/sparc/boot/image
9392
IMAGE_sparc64 = arch/sparc/boot/image
@@ -117,7 +116,6 @@ DEFCONFIG_riscv = defconfig
117116
DEFCONFIG_riscv32 = rv32_defconfig
118117
DEFCONFIG_riscv64 = defconfig
119118
DEFCONFIG_s390x = defconfig
120-
DEFCONFIG_s390 = defconfig compat.config
121119
DEFCONFIG_loongarch = defconfig
122120
DEFCONFIG_sparc32 = sparc32_defconfig
123121
DEFCONFIG_sparc64 = sparc64_defconfig
@@ -156,7 +154,6 @@ QEMU_ARCH_riscv = riscv64
156154
QEMU_ARCH_riscv32 = riscv32
157155
QEMU_ARCH_riscv64 = riscv64
158156
QEMU_ARCH_s390x = s390x
159-
QEMU_ARCH_s390 = s390x
160157
QEMU_ARCH_loongarch = loongarch64
161158
QEMU_ARCH_sparc32 = sparc
162159
QEMU_ARCH_sparc64 = sparc64
@@ -197,7 +194,6 @@ QEMU_ARGS_riscv = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_T
197194
QEMU_ARGS_riscv32 = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
198195
QEMU_ARGS_riscv64 = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
199196
QEMU_ARGS_s390x = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
200-
QEMU_ARGS_s390 = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
201197
QEMU_ARGS_loongarch = -M virt -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
202198
QEMU_ARGS_sparc32 = -M SS-5 -m 256M -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
203199
QEMU_ARGS_sparc64 = -M sun4u -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
@@ -223,7 +219,6 @@ CFLAGS_ppc = -m32 -mbig-endian -mno-vsx $(call cc-option,-mmultiple)
223219
CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple)
224220
CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2)
225221
CFLAGS_s390x = -m64
226-
CFLAGS_s390 = -m31
227222
CFLAGS_mips32le = -EL -mabi=32 -fPIC
228223
CFLAGS_mips32be = -EB -mabi=32
229224
CFLAGS_mipsn32le = -EL -mabi=n32 -fPIC -march=mips64r2

‎tools/testing/selftests/nolibc/run-tests.sh‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ all_archs=(
2323
mips32le mips32be mipsn32le mipsn32be mips64le mips64be
2424
ppc ppc64 ppc64le
2525
riscv32 riscv64
26-
s390x s390
26+
s390x
2727
loongarch
2828
sparc32 sparc64
2929
m68k
@@ -185,10 +185,6 @@ test_arch() {
185185
exit 1
186186
esac
187187
printf '%-15s' "$arch:"
188-
if [ "$arch" = "s390" ] && ([ "$llvm" = "1" ] || [ "$test_mode" = "user" ]); then
189-
echo "Unsupported configuration"
190-
return
191-
fi
192188
if [ "$arch" = "m68k" -o "$arch" = "sh4" ] && [ "$llvm" = "1" ]; then
193189
echo "Unsupported configuration"
194190
return

‎tools/testing/selftests/rseq/rseq-s390.h‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ do { \
2828
RSEQ_WRITE_ONCE(*(p), v); \
2929
} while (0)
3030

31-
#ifdef __s390x__
32-
3331
#define LONG_L "lg"
3432
#define LONG_S "stg"
3533
#define LONG_LT_R "ltgr"
@@ -63,43 +61,6 @@ do { \
6361
".quad " __rseq_str(start_ip) ", " __rseq_str(exit_ip) "\n\t" \
6462
".popsection\n\t"
6563

66-
#elif __s390__
67-
68-
#define __RSEQ_ASM_DEFINE_TABLE(label, version, flags, \
69-
start_ip, post_commit_offset, abort_ip) \
70-
".pushsection __rseq_cs, \"aw\"\n\t" \
71-
".balign 32\n\t" \
72-
__rseq_str(label) ":\n\t" \
73-
".long " __rseq_str(version) ", " __rseq_str(flags) "\n\t" \
74-
".long 0x0, " __rseq_str(start_ip) ", 0x0, " __rseq_str(post_commit_offset) ", 0x0, " __rseq_str(abort_ip) "\n\t" \
75-
".popsection\n\t" \
76-
".pushsection __rseq_cs_ptr_array, \"aw\"\n\t" \
77-
".long 0x0, " __rseq_str(label) "b\n\t" \
78-
".popsection\n\t"
79-
80-
/*
81-
* Exit points of a rseq critical section consist of all instructions outside
82-
* of the critical section where a critical section can either branch to or
83-
* reach through the normal course of its execution. The abort IP and the
84-
* post-commit IP are already part of the __rseq_cs section and should not be
85-
* explicitly defined as additional exit points. Knowing all exit points is
86-
* useful to assist debuggers stepping over the critical section.
87-
*/
88-
#define RSEQ_ASM_DEFINE_EXIT_POINT(start_ip, exit_ip) \
89-
".pushsection __rseq_exit_point_array, \"aw\"\n\t" \
90-
".long 0x0, " __rseq_str(start_ip) ", 0x0, " __rseq_str(exit_ip) "\n\t" \
91-
".popsection\n\t"
92-
93-
#define LONG_L "l"
94-
#define LONG_S "st"
95-
#define LONG_LT_R "ltr"
96-
#define LONG_CMP "c"
97-
#define LONG_CMP_R "cr"
98-
#define LONG_ADDI "ahi"
99-
#define LONG_ADD_R "ar"
100-
101-
#endif
102-
10364
#define RSEQ_ASM_DEFINE_TABLE(label, start_ip, post_commit_ip, abort_ip) \
10465
__RSEQ_ASM_DEFINE_TABLE(label, 0x0, 0x0, start_ip, \
10566
(post_commit_ip - start_ip), abort_ip)

‎tools/testing/selftests/vDSO/vdso_config.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
#define VDSO_VERSION 1
2626
#define VDSO_NAMES 0
2727
#define VDSO_32BIT 1
28-
#elif defined (__s390__) && !defined(__s390x__)
29-
#define VDSO_VERSION 2
30-
#define VDSO_NAMES 0
31-
#define VDSO_32BIT 1
3228
#elif defined (__s390x__)
3329
#define VDSO_VERSION 2
3430
#define VDSO_NAMES 0

0 commit comments

Comments
 (0)