From 3356529948a21cdb5d7ebee259b388465015139c Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Wed, 5 May 2021 00:53:08 +0000
Subject: [PATCH] rename trap.S exception.S and trap_machdep.c trap.c to match
 other archs ok kettenis@

---
 sys/arch/riscv64/conf/Makefile.riscv64              | 2 +-
 sys/arch/riscv64/conf/files.riscv64                 | 4 ++--
 sys/arch/riscv64/riscv64/{trap.S => exception.S}    | 0
 sys/arch/riscv64/riscv64/{trap_machdep.c => trap.c} | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename sys/arch/riscv64/riscv64/{trap.S => exception.S} (100%)
 rename sys/arch/riscv64/riscv64/{trap_machdep.c => trap.c} (99%)

diff --git a/sys/arch/riscv64/conf/Makefile.riscv64 b/sys/arch/riscv64/conf/Makefile.riscv64
index 6d09a49aa8a..204cb8991c5 100644
--- a/sys/arch/riscv64/conf/Makefile.riscv64
+++ b/sys/arch/riscv64/conf/Makefile.riscv64
@@ -144,7 +144,7 @@ depend obj:
 locore0.o: ${_archdir}/${_arch}/locore0.S assym.h
 copy.o copystr.o copyinout.o: assym.h
 pagezero.o: assym.h
-cpuswitch.o trap.o support.o: assym.h
+cpuswitch.o exception.o support.o: assym.h
 locore.o trampoline.o: assym.h
 
 hardlink-obsd:
diff --git a/sys/arch/riscv64/conf/files.riscv64 b/sys/arch/riscv64/conf/files.riscv64
index 2294c06354b..f0d0db59a91 100644
--- a/sys/arch/riscv64/conf/files.riscv64
+++ b/sys/arch/riscv64/conf/files.riscv64
@@ -18,7 +18,7 @@ file	arch/riscv64/riscv64/disksubr.c		disk
 file	arch/riscv64/riscv64/locore.S
 file	arch/riscv64/riscv64/copy.S
 file	arch/riscv64/riscv64/copystr.S
-file	arch/riscv64/riscv64/trap.S
+file	arch/riscv64/riscv64/exception.S
 file	arch/riscv64/riscv64/cpuswitch.S
 file	arch/riscv64/riscv64/machdep.c
 file	arch/riscv64/riscv64/intr.c
@@ -31,7 +31,7 @@ file	arch/riscv64/riscv64/softintr.c
 file	arch/riscv64/riscv64/support.S
 file	arch/riscv64/riscv64/syscall.c
 file	arch/riscv64/riscv64/pagezero.S
-file	arch/riscv64/riscv64/trap_machdep.c
+file	arch/riscv64/riscv64/trap.c
 file	arch/riscv64/riscv64/sbi.c
 file	arch/riscv64/riscv64/cpufunc_asm.S
 file	arch/riscv64/riscv64/fpu.c
diff --git a/sys/arch/riscv64/riscv64/trap.S b/sys/arch/riscv64/riscv64/exception.S
similarity index 100%
rename from sys/arch/riscv64/riscv64/trap.S
rename to sys/arch/riscv64/riscv64/exception.S
diff --git a/sys/arch/riscv64/riscv64/trap_machdep.c b/sys/arch/riscv64/riscv64/trap.c
similarity index 99%
rename from sys/arch/riscv64/riscv64/trap_machdep.c
rename to sys/arch/riscv64/riscv64/trap.c
index c82f2a1b2c8..fd84ee9a6ae 100644
--- a/sys/arch/riscv64/riscv64/trap_machdep.c
+++ b/sys/arch/riscv64/riscv64/trap.c
@@ -30,7 +30,7 @@
 #include <machine/syscall.h>
 #include <machine/db_machdep.h>
 
-/* Called from trap.S */
+/* Called from exception.S */
 void do_trap_supervisor(struct trapframe *);
 void do_trap_user(struct trapframe *);
 
-- 
2.20.1