21 files changed, 25 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index b4f31568f..f4a93e9e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -739,21 +739,21 @@ EXTRA_DIST =				\
 	linux/powerpc64le/userent.h	\
 	linux/ptrace_pokeuser.c		\
 	linux/raw_syscall.h		\
-	linux/riscv/arch_defs_.h	\
-	linux/riscv/arch_get_personality.c \
-	linux/riscv/arch_regs.c		\
-	linux/riscv/get_error.c		\
-	linux/riscv/get_scno.c		\
-	linux/riscv/get_syscall_args.c	\
-	linux/riscv/ioctls_arch0.h	\
-	linux/riscv/ioctls_arch1.h	\
-	linux/riscv/ioctls_inc0.h	\
-	linux/riscv/ioctls_inc1.h	\
-	linux/riscv/raw_syscall.h	\
-	linux/riscv/set_error.c		\
-	linux/riscv/set_scno.c		\
-	linux/riscv/syscallent.h	\
-	linux/riscv/syscallent1.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 9c1d16fa0..997c26f82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -143,9 +143,9 @@ powerpc*)
 		esac
 	fi
 	;;
-riscv*)
-	arch=riscv
-	AC_DEFINE([RISCV], 1, [Define for the RISC-V architecture])
+riscv64*)
+	arch=riscv64
+	AC_DEFINE([RISCV64], 1, [Define for the RISC-V 64-bit architecture])
 	;;
 s390)
 	arch=s390
@@ -949,7 +949,7 @@ AC_ARG_ENABLE([mpers],
 	 esac],
 	[enable_mpers=yes])
 
-st_MPERS([m32], [aarch64|powerpc64|riscv|s390x|sparc64|tile|x32|x86_64])
+st_MPERS([m32], [aarch64|powerpc64|riscv64|s390x|sparc64|tile|x32|x86_64])
 st_MPERS([mx32], [x86_64])
 
 AX_VALGRIND_DFLT([sgcheck], [off])
diff --git a/linux/riscv/arch_defs_.h b/linux/riscv64/arch_defs_.h
index a9c27bc7a..a9c27bc7a 100644
--- a/linux/riscv/arch_defs_.h
+++ b/linux/riscv64/arch_defs_.h
diff --git a/linux/riscv/arch_get_personality.c b/linux/riscv64/arch_get_personality.c
index aba7779ed..aba7779ed 100644
--- a/linux/riscv/arch_get_personality.c
+++ b/linux/riscv64/arch_get_personality.c
diff --git a/linux/riscv/arch_regs.c b/linux/riscv64/arch_regs.c
index cbf5a67e8..cbf5a67e8 100644
--- a/linux/riscv/arch_regs.c
+++ b/linux/riscv64/arch_regs.c
diff --git a/linux/riscv/get_error.c b/linux/riscv64/get_error.c
index d40665345..d40665345 100644
--- a/linux/riscv/get_error.c
+++ b/linux/riscv64/get_error.c
diff --git a/linux/riscv/get_scno.c b/linux/riscv64/get_scno.c
index 6b4256e74..6b4256e74 100644
--- a/linux/riscv/get_scno.c
+++ b/linux/riscv64/get_scno.c
diff --git a/linux/riscv/get_syscall_args.c b/linux/riscv64/get_syscall_args.c
index 9418b8e4f..9418b8e4f 100644
--- a/linux/riscv/get_syscall_args.c
+++ b/linux/riscv64/get_syscall_args.c
diff --git a/linux/riscv/ioctls_arch0.h b/linux/riscv64/ioctls_arch0.h
index 9c039fc86..57fd6eed5 100644
--- a/linux/riscv/ioctls_arch0.h
+++ b/linux/riscv64/ioctls_arch0.h
@@ -1 +1 @@
-/* Generated by ioctls_gen.sh from definitions found in $linux/arch/riscv/include/ tree. */
+/* Generated by ioctls_gen.sh from definitions found in $linux/arch/riscv64/include/ tree. */
diff --git a/linux/riscv/ioctls_arch1.h b/linux/riscv64/ioctls_arch1.h
index 41d00f92a..41d00f92a 100644
--- a/linux/riscv/ioctls_arch1.h
+++ b/linux/riscv64/ioctls_arch1.h
diff --git a/linux/riscv/ioctls_inc0.h b/linux/riscv64/ioctls_inc0.h
index f9939faa4..f9939faa4 100644
--- a/linux/riscv/ioctls_inc0.h
+++ b/linux/riscv64/ioctls_inc0.h
diff --git a/linux/riscv/ioctls_inc1.h b/linux/riscv64/ioctls_inc1.h
index 4aecf983e..4aecf983e 100644
--- a/linux/riscv/ioctls_inc1.h
+++ b/linux/riscv64/ioctls_inc1.h
diff --git a/linux/riscv/raw_syscall.h b/linux/riscv64/raw_syscall.h
index e069b11cd..e069b11cd 100644
--- a/linux/riscv/raw_syscall.h
+++ b/linux/riscv64/raw_syscall.h
diff --git a/linux/riscv/set_error.c b/linux/riscv64/set_error.c
index b9038c907..b9038c907 100644
--- a/linux/riscv/set_error.c
+++ b/linux/riscv64/set_error.c
diff --git a/linux/riscv/set_scno.c b/linux/riscv64/set_scno.c
index 6e3272c5c..6e3272c5c 100644
--- a/linux/riscv/set_scno.c
+++ b/linux/riscv64/set_scno.c
diff --git a/linux/riscv/syscallent.h b/linux/riscv64/syscallent.h
index b82745861..b82745861 100644
--- a/linux/riscv/syscallent.h
+++ b/linux/riscv64/syscallent.h
diff --git a/linux/riscv/syscallent1.h b/linux/riscv64/syscallent1.h
index 22eff673c..22eff673c 100644
--- a/linux/riscv/syscallent1.h
+++ b/linux/riscv64/syscallent1.h
diff --git a/riscv.c b/riscv.c
index 7f37281fb..ecbe4ab90 100644
--- a/riscv.c
+++ b/riscv.c
@@ -9,7 +9,7 @@
 
 #include "defs.h"
 
-#ifdef RISCV
+#ifdef RISCV64
 
 # include "xlat/riscv_flush_icache_flags.h"
 
@@ -30,4 +30,4 @@ SYS_FUNC(riscv_flush_icache)
 	return RVAL_DECODED;
 }
 
-#endif /* RISCV */
+#endif /* RISCV64 */
diff --git a/tests/options-syntax.test b/tests/options-syntax.test
index 5e43b3ab8..7aff8fa16 100755
--- a/tests/options-syntax.test
+++ b/tests/options-syntax.test
@@ -59,7 +59,7 @@ x32)
 	check_h "must have PROG [ARGS] or -p PID" -e trace=getcwd@32
 	check_h "must have PROG [ARGS] or -p PID" -e trace=getcwd@x32
 	;;
-aarch64|powerpc64|riscv|s390x|sparc64|tile)
+aarch64|powerpc64|riscv64|s390x|sparc64|tile)
 	check_h "must have PROG [ARGS] or -p PID" -e trace=getcwd@64
 	check_h "must have PROG [ARGS] or -p PID" -e trace=getcwd@32
 	check_h "incorrect personality designator 'x32' in qualification 'getcwd@x32'" -e trace=getcwd@x32
diff --git a/tests/qualify_personality.sh b/tests/qualify_personality.sh
index d57314fc7..abe59a0c8 100644
--- a/tests/qualify_personality.sh
+++ b/tests/qualify_personality.sh
@@ -25,7 +25,7 @@ x86_64)
 x32)
 	supported_pers='x32 32'
 	;;
-aarch64|powerpc64|riscv|s390x|sparc64|tile)
+aarch64|powerpc64|riscv64|s390x|sparc64|tile)
 	supported_pers='64 32'
 	;;
 *)
diff --git a/tests/strace-V.test b/tests/strace-V.test
index a0274c282..b1fd5ade9 100755
--- a/tests/strace-V.test
+++ b/tests/strace-V.test
@@ -49,7 +49,7 @@ x86_64)
 	option_m32=$(getoption HAVE_M32_MPERS ' m32-mpers' ' no-m32-mpers')
 	option_mx32=$(getoption HAVE_MX32_MPERS ' mx32-mpers' ' no-mx32-mpers')
 	;;
-aarch64|powerpc64|riscv|s390x|sparc64|tile|x32)
+aarch64|powerpc64|riscv64|s390x|sparc64|tile|x32)
 	option_m32=$(getoption HAVE_M32_MPERS ' m32-mpers' ' no-m32-mpers')
 	;;
 esac