From 054d4831db961ccdf3dae8661a9320ad4f74da3d Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 27 Jun 2023 16:56:06 +0200 Subject: [PATCH] xous-rs: Remove arm assembly code It was not used and it probably won't get used in the future Signed-off-by: Jean-Pierre De Jesus DIAZ --- xous-rs/assemble.sh | 9 +-------- xous-rs/bin/armv7a-unknown-xous-elf.a | Bin 1712 -> 0 bytes xous-rs/build.rs | 2 +- xous-rs/src/arch/arm/asm.S | 15 --------------- 4 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 xous-rs/bin/armv7a-unknown-xous-elf.a delete mode 100644 xous-rs/src/arch/arm/asm.S diff --git a/xous-rs/assemble.sh b/xous-rs/assemble.sh index b5c4c7880..55bdb58d3 100755 --- a/xous-rs/assemble.sh +++ b/xous-rs/assemble.sh @@ -9,7 +9,7 @@ set -euxo pipefail crate=xous-kernel usage() { - echo "Usage: $0 [-a ]" + 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 ;; diff --git a/xous-rs/bin/armv7a-unknown-xous-elf.a b/xous-rs/bin/armv7a-unknown-xous-elf.a deleted file mode 100644 index 68c6a02bcef518f3908069d592b80220c4025473..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1712 zcma)6OHUI~6h70TJgU_4SePI>J}?-=JW5--For513lT#l(T&4QJJ80`)|n|{LV^pI z{uK(_gHST7vTSng0PRS}QmCI&+ zaVf89Mbknc4qK*KDimOq1$HN6+j{lc#>(oNR^8lsvbsVN{jF}Pbaq{3Kofgxz>aqyoGP6cYJ$%U*yHGUN;!1rU5PBVZ^O;2GiAwxfw4Waq?=0oo=B)#s04(V|r zaebbTzfLh9=ZYMt^bUNJm4rlW8Ma*SE$Wrw<9hsS5cM8I7dcSrJy_nKh`9r}kFYhc zAfA=!Iau!dLE1C_ibUU+(786>o9Qd~ex$_*$C!`6*l{=ZV()Oy3ImccOf1o=PwQ}e lhIIja4$OUXV4h998C04_(mhrZ67?ov%eYU#@va34+;2^!v04BC diff --git a/xous-rs/build.rs b/xous-rs/build.rs index 786cb5a59..0e1ebcfd5 100644 --- a/xous-rs/build.rs +++ b/xous-rs/build.rs @@ -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)), diff --git a/xous-rs/src/arch/arm/asm.S b/xous-rs/src/arch/arm/asm.S deleted file mode 100644 index 172958928..000000000 --- a/xous-rs/src/arch/arm/asm.S +++ /dev/null @@ -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