Merge pull request #392 from Foundation-Devices/remove-arm-assembly

xous-rs: Remove arm assembly code
This commit is contained in:
bunnie 2023-07-03 19:57:45 -07:00 committed by GitHub
commit f0f420d610
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 24 deletions

View file

@ -9,7 +9,7 @@ set -euxo pipefail
crate=xous-kernel
usage() {
echo "Usage: $0 [-a <riscv|arm>]"
echo "Usage: $0 [-a riscv]"
exit 1
}
@ -47,13 +47,6 @@ case $arch in
ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o
;;
arm)
rm -f bin/arm*.a
arm-none-eabi-gcc -ggdb3 -c -march=armv7-a src/arch/arm/asm.S -o bin/$crate.o
ar crs bin/armv7a-unknown-xous-elf.a bin/$crate.o
;;
default)
usage
;;

View file

@ -8,7 +8,7 @@ fn main() {
let target = env::var("TARGET").unwrap();
let name = env::var("CARGO_PKG_NAME").unwrap();
if target.starts_with("riscv") || target.starts_with("arm") {
if target.starts_with("riscv") {
fs::copy(
format!("bin/{}.a", target),
out_dir.join(format!("lib{}.a", name)),

View file

@ -1,15 +0,0 @@
.global arm_cache_flush
arm_cache_flush:
dsb
isb
# Return
bx lr
.global __aeabi_unwind_cpp_pr0
__aeabi_unwind_cpp_pr0:
b __aeabi_unwind_cpp_pr0
.global __aeabi_unwind_cpp_pr1
__aeabi_unwind_cpp_pr1:
b __aeabi_unwind_cpp_pr1