riscv: rename to riscv64

The only currently supported RISC-V architecture is the 64-bit RISC-V.
As the generic name we use causes confusion [1], rename it to riscv64.

[1] https://lists.strace.io/pipermail/strace-devel/2019-August/009057.html

* Makefile.am (EXTRA_DIST): Rename linux/riscv to linux/riscv64.
* configure.ac: Rename riscv to riscv64, RISCV to RISCV64.
* linux/riscv: Rename to linux/riscv64.
* riscv.c: Rename RISCV to RISCV64.
* tests/options-syntax.test: Rename riscv to riscv64.
* tests/qualify_personality.sh: Likewise.
* tests/strace-V.test: Likewise.

diff --git a/Makefile.am b/Makefile.am
index b4f31568fddf957f8d3c8df413706c9cec75bb32..f4a93e9e6731953c5d82eedfd618b0059de73285 100644 (file)
--- 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 9c1d16fa05962a315897e5855809678a447a0c31..997c26f820394fd877e25fc56582f03785e07ba5 100644 (file)
--- 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
similarity index 100%
rename from linux/riscv/arch_defs_.h
rename to linux/riscv64/arch_defs_.h

diff --git a/linux/riscv/arch_get_personality.c b/linux/riscv64/arch_get_personality.c
similarity index 100%
rename from linux/riscv/arch_get_personality.c
rename to linux/riscv64/arch_get_personality.c

diff --git a/linux/riscv/arch_regs.c b/linux/riscv64/arch_regs.c
similarity index 100%
rename from linux/riscv/arch_regs.c
rename to linux/riscv64/arch_regs.c

diff --git a/linux/riscv/get_error.c b/linux/riscv64/get_error.c
similarity index 100%
rename from linux/riscv/get_error.c
rename to linux/riscv64/get_error.c

diff --git a/linux/riscv/get_scno.c b/linux/riscv64/get_scno.c
similarity index 100%
rename from linux/riscv/get_scno.c
rename to linux/riscv64/get_scno.c

diff --git a/linux/riscv/get_syscall_args.c b/linux/riscv64/get_syscall_args.c
similarity index 100%
rename from linux/riscv/get_syscall_args.c
rename to linux/riscv64/get_syscall_args.c

diff --git a/linux/riscv/ioctls_arch0.h b/linux/riscv64/ioctls_arch0.h
similarity index 68%
rename from linux/riscv/ioctls_arch0.h
rename to linux/riscv64/ioctls_arch0.h
index 9c039fc868399efdb75082df62a9d80cee5a45c4..57fd6eed5cfcef8a63d42021daa88d1dc90823f5 100644 (file)
--- 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
similarity index 100%
rename from linux/riscv/ioctls_arch1.h
rename to linux/riscv64/ioctls_arch1.h

diff --git a/linux/riscv/ioctls_inc0.h b/linux/riscv64/ioctls_inc0.h
similarity index 100%
rename from linux/riscv/ioctls_inc0.h
rename to linux/riscv64/ioctls_inc0.h

diff --git a/linux/riscv/ioctls_inc1.h b/linux/riscv64/ioctls_inc1.h
similarity index 100%
rename from linux/riscv/ioctls_inc1.h
rename to linux/riscv64/ioctls_inc1.h

diff --git a/linux/riscv/raw_syscall.h b/linux/riscv64/raw_syscall.h
similarity index 100%
rename from linux/riscv/raw_syscall.h
rename to linux/riscv64/raw_syscall.h

diff --git a/linux/riscv/set_error.c b/linux/riscv64/set_error.c
similarity index 100%
rename from linux/riscv/set_error.c
rename to linux/riscv64/set_error.c

diff --git a/linux/riscv/set_scno.c b/linux/riscv64/set_scno.c
similarity index 100%
rename from linux/riscv/set_scno.c
rename to linux/riscv64/set_scno.c

diff --git a/linux/riscv/syscallent.h b/linux/riscv64/syscallent.h
similarity index 100%
rename from linux/riscv/syscallent.h
rename to linux/riscv64/syscallent.h

diff --git a/linux/riscv/syscallent1.h b/linux/riscv64/syscallent1.h
similarity index 100%
rename from linux/riscv/syscallent1.h
rename to linux/riscv64/syscallent1.h

diff --git a/riscv.c b/riscv.c
index 7f37281fbe08a0e7b70a38e63d94da7b10761468..ecbe4ab902f416a6a48602729308445b050def5f 100644 (file)
--- 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 5e43b3ab8a9abcf26378bdd1307189b537039dd6..7aff8fa16a8ba5f64348f1308452434d785b0904 100755 (executable)
--- 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 d57314fc7672877a8b15a5b75566f781bcd374bf..abe59a0c84a33d512fd0285137f839413c7cdfb9 100644 (file)
--- 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 a0274c282f938d906ea571b8b5b61b73cba84fe8..b1fd5ade9e99bf0e19441b6e9ce1559cb9dbe388 100755 (executable)
--- 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