diff --git a/xous-rs/assemble.ps1 b/xous-rs/assemble.ps1 index 5c9a72a64..c2fda062d 100644 --- a/xous-rs/assemble.ps1 +++ b/xous-rs/assemble.ps1 @@ -6,6 +6,7 @@ $crate = "xous" riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/asm.S -o bin/$crate.o riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o +riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-xous.a bin/$crate.o riscv64-unknown-elf-ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/asm.S -DSKIP_MULTICORE -o bin/$crate.o diff --git a/xous-rs/assemble.sh b/xous-rs/assemble.sh index 9ee94973b..5e305f861 100644 --- a/xous-rs/assemble.sh +++ b/xous-rs/assemble.sh @@ -10,6 +10,7 @@ rm -f bin/*.a riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/asm.S -o bin/$crate.o ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o +ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/asm.S -DSKIP_MULTICORE -o bin/$crate.o diff --git a/xous-rs/bin/riscv32imac-unknown-xous-elf.a b/xous-rs/bin/riscv32imac-unknown-xous-elf.a new file mode 100644 index 000000000..001aabb3c Binary files /dev/null and b/xous-rs/bin/riscv32imac-unknown-xous-elf.a differ diff --git a/xous-rs/bin/xous-kernel.o b/xous-rs/bin/xous-kernel.o new file mode 100644 index 000000000..acb82ad9d Binary files /dev/null and b/xous-rs/bin/xous-kernel.o differ diff --git a/xous-rs/build.rs b/xous-rs/build.rs index a14e85329..5af5b4b65 100644 --- a/xous-rs/build.rs +++ b/xous-rs/build.rs @@ -25,7 +25,7 @@ fn main() { format!("bin/{}.a", target), out_dir.join(format!("lib{}.a", name)), ) - .unwrap(); + .expect("couldn't find asm support library for target platform"); println!("cargo:rustc-link-lib=static={}", name); println!("cargo:rustc-link-search={}", out_dir.display());