riscv64: remove mpers support

There is no riscv32 Linux support in Linux mainline,
and no compat support in riscv64 as well.

* linux/riscv64/arch_defs_.h: Remove.
* linux/riscv64/ioctls_arch1.h: Likewise.
* linux/riscv64/ioctls_inc1.h: Likewise.
* linux/riscv64/syscallent1.h: Likewise.
* Makefile.am (EXTRA_DIST): Remove them.
* configure.ac (st_MPERS([m32])): Remove riscv64.
* strace.1.in (.SH "MULTIPLE PERSONALITY SUPPORT"): Remove RISC-V
from the list.

Co-Authored-by: Dmitry V. Levin <ldv@altlinux.org>

diff --git a/Makefile.am b/Makefile.am
index f4a93e9e6731953c5d82eedfd618b0059de73285..2dbc806f57f28c149f011fefda5390bea4365d0f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -739,21 +739,17 @@ EXTRA_DIST =                              \
        linux/powerpc64le/userent.h     \
        linux/ptrace_pokeuser.c         \
        linux/raw_syscall.h             \
-       linux/riscv64/arch_defs_.h      \
        linux/riscv64/arch_get_personality.c \
        linux/riscv64/arch_regs.c               \
        linux/riscv64/get_error.c               \
        linux/riscv64/get_scno.c                \
        linux/riscv64/get_syscall_args.c        \
        linux/riscv64/ioctls_arch0.h    \
-       linux/riscv64/ioctls_arch1.h    \
        linux/riscv64/ioctls_inc0.h     \
-       linux/riscv64/ioctls_inc1.h     \
        linux/riscv64/raw_syscall.h     \
        linux/riscv64/set_error.c               \
        linux/riscv64/set_scno.c                \
        linux/riscv64/syscallent.h      \
-       linux/riscv64/syscallent1.h     \
        linux/rt_sigframe.h             \
        linux/s390/arch_defs_.h         \
        linux/s390/arch_regs.c          \

diff --git a/configure.ac b/configure.ac
index 997c26f820394fd877e25fc56582f03785e07ba5..949b058af28b228ccd98943c2e41c0a3d8645bfb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -949,7 +949,7 @@ AC_ARG_ENABLE([mpers],
         esac],
        [enable_mpers=yes])
 
-st_MPERS([m32], [aarch64|powerpc64|riscv64|s390x|sparc64|tile|x32|x86_64])
+st_MPERS([m32], [aarch64|powerpc64|s390x|sparc64|tile|x32|x86_64])
 st_MPERS([mx32], [x86_64])
 
 AX_VALGRIND_DFLT([sgcheck], [off])

diff --git a/linux/riscv64/arch_defs_.h b/linux/riscv64/arch_defs_.h
deleted file mode 100644 (file)
index a9c27bc..0000000
--- a/linux/riscv64/arch_defs_.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#define HAVE_ARCH_UID16_SYSCALLS 1
-#define SUPPORTED_PERSONALITIES 2
-#define CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL 1

diff --git a/linux/riscv64/ioctls_arch1.h b/linux/riscv64/ioctls_arch1.h
deleted file mode 100644 (file)
index 41d00f9..0000000
--- a/linux/riscv64/ioctls_arch1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "ioctls_arch0.h"

diff --git a/linux/riscv64/ioctls_inc1.h b/linux/riscv64/ioctls_inc1.h
deleted file mode 100644 (file)
index 4aecf98..0000000
--- a/linux/riscv64/ioctls_inc1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "32/ioctls_inc.h"

diff --git a/linux/riscv64/syscallent1.h b/linux/riscv64/syscallent1.h
deleted file mode 100644 (file)
index 22eff67..0000000
--- a/linux/riscv64/syscallent1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "32/syscallent.h"

diff --git a/strace.1.in b/strace.1.in
index 78bbc628e3a607965b321523b91e33fe80388a92..0d22dca2240f646eac7211828256ca783738fc5b 100644 (file)
--- a/strace.1.in
+++ b/strace.1.in
@@ -1059,7 +1059,6 @@ Architecture      ABIs supported
 x86_64 i386, x32 [1]; i386 [2]
 AArch64        ARM 32-bit EABI
 PowerPC 64-bit [3]     PowerPC 32-bit
-RISC-V 64-bit  RISC-V 32-bit
 s390x  s390
 SPARC 64-bit   SPARC 32-bit
 TILE 64-bit    TILE 32-bit