From dab45de6711a7ba0e88bb44149280859c4f06e36 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 6 Dec 2018 22:35:07 +0000
Subject: [PATCH] Rename riscv64-freebsd.c to riscv-freebsd.c.

This fixes truss when built as part of a riscv64sf world.  Additionally,
if FreeBSD ever supports RV32 RISC-V most of this file can be used as-is
just as a single file is used for all of the MIPS ABIs.

Sponsored by:	DARPA
---
 .../truss/{riscv64-freebsd.c => riscv-freebsd.c} | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 rename usr.bin/truss/{riscv64-freebsd.c => riscv-freebsd.c} (88%)

diff --git a/usr.bin/truss/riscv64-freebsd.c b/usr.bin/truss/riscv-freebsd.c
similarity index 88%
rename from usr.bin/truss/riscv64-freebsd.c
rename to usr.bin/truss/riscv-freebsd.c
index 758496a423e..063372077b9 100644
--- a/usr.bin/truss/riscv64-freebsd.c
+++ b/usr.bin/truss/riscv-freebsd.c
@@ -26,7 +26,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/* FreeBSD/riscv64-specific system call handling. */
+/* FreeBSD/riscv-specific system call handling. */
 
 #include <sys/ptrace.h>
 #include <sys/syscall.h>
@@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$");
 #include "truss.h"
 
 static int
-riscv64_fetch_args(struct trussinfo *trussinfo, u_int narg)
+riscv_fetch_args(struct trussinfo *trussinfo, u_int narg)
 {
 	struct reg regs;
 	struct current_syscall *cs;
@@ -77,7 +77,7 @@ riscv64_fetch_args(struct trussinfo *trussinfo, u_int narg)
 }
 
 static int
-riscv64_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
+riscv_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
 {
 	struct reg regs;
 	lwpid_t tid;
@@ -94,13 +94,13 @@ riscv64_fetch_retval(struct trussinfo *trussinfo, long *retval, int *errorp)
 	return (0);
 }
 
-static struct procabi riscv64_freebsd = {
+static struct procabi riscv_freebsd = {
 	"FreeBSD ELF64",
 	SYSDECODE_ABI_FREEBSD,
-	riscv64_fetch_args,
-	riscv64_fetch_retval,
-	STAILQ_HEAD_INITIALIZER(riscv64_freebsd.extra_syscalls),
+	riscv_fetch_args,
+	riscv_fetch_retval,
+	STAILQ_HEAD_INITIALIZER(riscv_freebsd.extra_syscalls),
 	{ NULL }
 };
 
-PROCABI(riscv64_freebsd);
+PROCABI(riscv_freebsd);