diff --git a/assemble.bat b/assemble.bat
index af175d9..d847741 100644
--- a/assemble.bat
+++ b/assemble.bat
@@ -2,10 +2,10 @@ del bin\*.a /q
 
 set crate=bl602-hal
 
-riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32 -march=rv32i asm.S -o bin/%crate%.o
-riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/%crate%.o
+riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32 -march=rv32i trap.S -o bin/%crate%.o
+riscv64-unknown-elf-ar crs bin/trap_riscv32i-unknown-none-elf.a bin/%crate%.o
 
-riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32f -march=rv32if asm.S -o bin/%crate%.o
-riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/%crate%.o
+riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32f -march=rv32if trap.S -o bin/%crate%.o
+riscv64-unknown-elf-ar crs bin/trap_riscv32if-unknown-none-elf.a bin/%crate%.o
 
 del bin\%crate%.o
diff --git a/assemble.ps1 b/assemble.ps1
index 20dd41c..41e1f62 100644
--- a/assemble.ps1
+++ b/assemble.ps1
@@ -3,10 +3,10 @@ Remove-Item -Force bin/*.a
 
 $crate = "riscv"
 
-riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32 -march=rv32i asm.S -o bin/$crate.o
-riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o
+riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32 -march=rv32i trap.S -o bin/$crate.o
+riscv64-unknown-elf-ar crs bin/trap_riscv32i-unknown-none-elf.a bin/$crate.o
 
-riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32f -march=rv32if asm.S -o bin/$crate.o
-riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/$crate.o
+riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32f -march=rv32if trap.S -o bin/$crate.o
+riscv64-unknown-elf-ar crs bin/trap_riscv32if-unknown-none-elf.a bin/$crate.o
 
 Remove-Item bin/$crate.o
diff --git a/assemble.sh b/assemble.sh
index f8f2aad..67a377b 100644
--- a/assemble.sh
+++ b/assemble.sh
@@ -7,10 +7,10 @@ crate=bl602-hal
 # remove existing blobs because otherwise this will append object files to the old blobs
 rm -f bin/*.a
 
-riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32 -march=rv32i asm.S -o bin/$crate.o
-riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o
+riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32 -march=rv32i trap.S -o bin/$crate.o
+riscv64-unknown-elf-ar crs bin/trap_riscv32i-unknown-none-elf.a bin/$crate.o
 
-riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32f -march=rv32if asm.S -o bin/$crate.o
-riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/$crate.o
+riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32f -march=rv32if trap.S -o bin/$crate.o
+riscv64-unknown-elf-ar crs bin/trap_riscv32if-unknown-none-elf.a bin/$crate.o
 
 rm bin/$crate.o
diff --git a/bin/riscv32i-unknown-none-elf.a b/bin/riscv32i-unknown-none-elf.a
deleted file mode 100644
index bbe287f..0000000
Binary files a/bin/riscv32i-unknown-none-elf.a and /dev/null differ
diff --git a/bin/riscv32if-unknown-none-elf.a b/bin/riscv32if-unknown-none-elf.a
deleted file mode 100644
index 896652c..0000000
Binary files a/bin/riscv32if-unknown-none-elf.a and /dev/null differ
diff --git a/bin/trap_riscv32i-unknown-none-elf.a b/bin/trap_riscv32i-unknown-none-elf.a
new file mode 100644
index 0000000..c746e83
Binary files /dev/null and b/bin/trap_riscv32i-unknown-none-elf.a differ
diff --git a/bin/trap_riscv32if-unknown-none-elf.a b/bin/trap_riscv32if-unknown-none-elf.a
new file mode 100644
index 0000000..f762ef3
Binary files /dev/null and b/bin/trap_riscv32if-unknown-none-elf.a differ
diff --git a/build.rs b/build.rs
index 8c774ea..cc43fb0 100644
--- a/build.rs
+++ b/build.rs
@@ -18,7 +18,7 @@ fn main() {
         let target = target.to_string();
 
         fs::copy(
-            format!("bin/{}.a", target),
+            format!("bin/trap_{}.a", target),
             out_dir.join(format!("lib{}.a", name)),
         )
         .unwrap();
diff --git a/asm.S b/trap.S
similarity index 100%
rename from asm.S
rename to trap.S