tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
selftests/nolibc: rename s390 to s390x
Support for 32-bit s390 is about to be added.
As "s39032" would look horrible, use the another naming scheme.
32-bit s390 is "s390" and 64-bit s390 is "s390x",
similar to how it is handled in various toolchain components.
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250206-nolibc-s390-v2-1-991ad97e3d58@weissschuh.net
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
+8
-6
+6
-5
tools/testing/selftests/nolibc/Makefile
+6
-5
tools/testing/selftests/nolibc/Makefile
···
54
54
ARCH_mips32be = mips
55
55
ARCH_riscv32 = riscv
56
56
ARCH_riscv64 = riscv
57
+
ARCH_s390x = s390
57
58
ARCH := $(or $(ARCH_$(XARCH)),$(XARCH))
58
59
59
60
# kernel image names by architecture
···
71
70
IMAGE_riscv = arch/riscv/boot/Image
72
71
IMAGE_riscv32 = arch/riscv/boot/Image
73
72
IMAGE_riscv64 = arch/riscv/boot/Image
74
-
IMAGE_s390 = arch/s390/boot/bzImage
73
+
IMAGE_s390x = arch/s390/boot/bzImage
75
74
IMAGE_loongarch = arch/loongarch/boot/vmlinuz.efi
76
75
IMAGE = $(objtree)/$(IMAGE_$(XARCH))
77
76
IMAGE_NAME = $(notdir $(IMAGE))
···
90
89
DEFCONFIG_riscv = defconfig
91
90
DEFCONFIG_riscv32 = rv32_defconfig
92
91
DEFCONFIG_riscv64 = defconfig
93
-
DEFCONFIG_s390 = defconfig
92
+
DEFCONFIG_s390x = defconfig
94
93
DEFCONFIG_loongarch = defconfig
95
94
DEFCONFIG = $(DEFCONFIG_$(XARCH))
96
95
···
113
112
QEMU_ARCH_riscv = riscv64
114
113
QEMU_ARCH_riscv32 = riscv32
115
114
QEMU_ARCH_riscv64 = riscv64
116
-
QEMU_ARCH_s390 = s390x
115
+
QEMU_ARCH_s390x = s390x
117
116
QEMU_ARCH_loongarch = loongarch64
118
117
QEMU_ARCH = $(QEMU_ARCH_$(XARCH))
119
118
···
141
140
QEMU_ARGS_riscv = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
142
141
QEMU_ARGS_riscv32 = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
143
142
QEMU_ARGS_riscv64 = -M virt -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
144
-
QEMU_ARGS_s390 = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
143
+
QEMU_ARGS_s390x = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
145
144
QEMU_ARGS_loongarch = -M virt -append "console=ttyS0,115200 panic=-1 $(TEST:%=NOLIBC_TEST=%)"
146
145
QEMU_ARGS = -m 1G $(QEMU_ARGS_$(XARCH)) $(QEMU_ARGS_BIOS) $(QEMU_ARGS_EXTRA)
147
146
···
159
158
CFLAGS_ppc = -m32 -mbig-endian -mno-vsx $(call cc-option,-mmultiple)
160
159
CFLAGS_ppc64 = -m64 -mbig-endian -mno-vsx $(call cc-option,-mmultiple)
161
160
CFLAGS_ppc64le = -m64 -mlittle-endian -mno-vsx $(call cc-option,-mabi=elfv2)
162
-
CFLAGS_s390 = -m64
161
+
CFLAGS_s390x = -m64
163
162
CFLAGS_mips32le = -EL -mabi=32 -fPIC
164
163
CFLAGS_mips32be = -EB -mabi=32
165
164
CFLAGS_STACKPROTECTOR ?= $(call cc-option,-mstack-protector-guard=global $(call cc-option,-fstack-protector-all))
+2
-1
tools/testing/selftests/nolibc/run-tests.sh
+2
-1
tools/testing/selftests/nolibc/run-tests.sh
···
23
23
mips32le mips32be
24
24
ppc ppc64 ppc64le
25
25
riscv32 riscv64
26
-
s390
26
+
s390x
27
27
loongarch
28
28
)
29
29
archs="${all_archs[@]}"
···
109
109
riscv) echo riscv64;;
110
110
loongarch) echo loongarch64;;
111
111
mips*) echo mips;;
112
+
s390*) echo s390;;
112
113
*) echo "$1";;
113
114
esac
114
115
}