On Sat, Dec 21, 2024 at 03:44:33PM +0100, Thomas Weißschuh wrote:
> nolibc already supports riscv32. Wire it up in the testsuite.

Good addition!

Reviewed-by: Charlie Jenkins <char...@rivosinc.com>
Tested-by: Charlie Jenkins <char...@rivosinc.com>

> 
> Signed-off-by: Thomas Weißschuh <li...@weissschuh.net>
> ---
>  tools/testing/selftests/nolibc/Makefile     | 5 +++++
>  tools/testing/selftests/nolibc/run-tests.sh | 2 +-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/nolibc/Makefile 
> b/tools/testing/selftests/nolibc/Makefile
> index 
> 78f47e85b389ac229ac13f3e7c8299fb3ec92197..7d14a7c0cb62608f328b251495264517d333db2e
>  100644
> --- a/tools/testing/selftests/nolibc/Makefile
> +++ b/tools/testing/selftests/nolibc/Makefile
> @@ -52,6 +52,7 @@ ARCH_ppc64       = powerpc
>  ARCH_ppc64le     = powerpc
>  ARCH_mips32le    = mips
>  ARCH_mips32be    = mips
> +ARCH_riscv32     = riscv
>  ARCH_riscv64     = riscv
>  ARCH            := $(or $(ARCH_$(XARCH)),$(XARCH))
>  
> @@ -67,6 +68,7 @@ IMAGE_ppc        = vmlinux
>  IMAGE_ppc64      = vmlinux
>  IMAGE_ppc64le    = arch/powerpc/boot/zImage
>  IMAGE_riscv      = arch/riscv/boot/Image
> +IMAGE_riscv32    = arch/riscv/boot/Image
>  IMAGE_riscv64    = arch/riscv/boot/Image
>  IMAGE_s390       = arch/s390/boot/bzImage
>  IMAGE_loongarch  = arch/loongarch/boot/vmlinuz.efi
> @@ -85,6 +87,7 @@ DEFCONFIG_ppc        = pmac32_defconfig
>  DEFCONFIG_ppc64      = powernv_be_defconfig
>  DEFCONFIG_ppc64le    = powernv_defconfig
>  DEFCONFIG_riscv      = defconfig
> +DEFCONFIG_riscv32    = rv32_defconfig
>  DEFCONFIG_riscv64    = defconfig
>  DEFCONFIG_s390       = defconfig
>  DEFCONFIG_loongarch  = defconfig
> @@ -108,6 +111,7 @@ QEMU_ARCH_ppc        = ppc
>  QEMU_ARCH_ppc64      = ppc64
>  QEMU_ARCH_ppc64le    = ppc64
>  QEMU_ARCH_riscv      = riscv64
> +QEMU_ARCH_riscv32    = riscv32
>  QEMU_ARCH_riscv64    = riscv64
>  QEMU_ARCH_s390       = s390x
>  QEMU_ARCH_loongarch  = loongarch64
> @@ -135,6 +139,7 @@ QEMU_ARGS_ppc        = -M g3beige -append "console=ttyS0 
> panic=-1 $(TEST:%=NOLIB
>  QEMU_ARGS_ppc64      = -M powernv -append "console=hvc0 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_ppc64le    = -M powernv -append "console=hvc0 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_riscv      = -M virt -append "console=ttyS0 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
> +QEMU_ARGS_riscv32    = -M virt -append "console=ttyS0 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_riscv64    = -M virt -append "console=ttyS0 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_s390       = -M s390-ccw-virtio -append "console=ttyS0 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
>  QEMU_ARGS_loongarch  = -M virt -append "console=ttyS0,115200 panic=-1 
> $(TEST:%=NOLIBC_TEST=%)"
> diff --git a/tools/testing/selftests/nolibc/run-tests.sh 
> b/tools/testing/selftests/nolibc/run-tests.sh
> index 
> caa1ae40fe9a2faf8931c299aacd19716227e2b8..67fefc847d77165f817c3befa578cfa27e6f93d8
>  100755
> --- a/tools/testing/selftests/nolibc/run-tests.sh
> +++ b/tools/testing/selftests/nolibc/run-tests.sh
> @@ -17,7 +17,7 @@ perform_download=0
>  test_mode=system
>  werror=1
>  llvm=
> -archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv64 
> s390 loongarch"
> +archs="i386 x86_64 arm64 arm mips32le mips32be ppc ppc64 ppc64le riscv32 
> riscv64 s390 loongarch"
>  
>  TEMP=$(getopt -o 'j:d:c:b:a:m:pelh' -n "$0" -- "$@")
>  
> 
> -- 
> 2.47.1
> 
> 
> _______________________________________________
> linux-riscv mailing list
> linux-ri...@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv

Reply via email to