Skip to content

Commit

Permalink
rename asm to trap, rename blobs
Browse files Browse the repository at this point in the history
  • Loading branch information
bjoernQ authored and 9names committed Jun 29, 2021
1 parent 72971f0 commit 189a936
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions assemble.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions assemble.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions assemble.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file removed bin/riscv32i-unknown-none-elf.a
Binary file not shown.
Binary file removed bin/riscv32if-unknown-none-elf.a
Binary file not shown.
Binary file added bin/trap_riscv32i-unknown-none-elf.a
Binary file not shown.
Binary file added bin/trap_riscv32if-unknown-none-elf.a
Binary file not shown.
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
File renamed without changes.

0 comments on commit 189a936

Please sign in to comment.