From 306fdee180e8b0f4156dd3312d612efad165baef Mon Sep 17 00:00:00 2001 From: eupn Date: Thu, 9 Mar 2023 20:13:28 +0400 Subject: [PATCH] loader: add asm binary and ix build script to pick ARM asm and link.x --- loader/bin/armv7a-unknown-xous-elf.a | Bin 0 -> 2736 bytes loader/bin/assemble.sh | 15 +++++++++++++++ loader/build.rs | 24 +++++++++++++++++++++--- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 loader/bin/armv7a-unknown-xous-elf.a create mode 100755 loader/bin/assemble.sh diff --git a/loader/bin/armv7a-unknown-xous-elf.a b/loader/bin/armv7a-unknown-xous-elf.a new file mode 100644 index 0000000000000000000000000000000000000000..1f82f9d538e681ad387dcf1942b6f660edf0f31b GIT binary patch literal 2736 zcmb7GO>Ep$5T0izX_~glCMAGqN}M)Dk)ZbOCTSK?K_aCEiI${ID~dR{-d(4$nq4op zH%(EcwgV%`rkHVjkNC@cQ-QD{`R?n z!M48dR_ok=XbT8pq^u+hpq^`QMF-QD zai2DiG-=alNqhr!DAQ>DwYBvN^kHUHYiFVCTa4}fR%TRhXGRCxB6GVXhHit4HrJ5q zZ{GZE0XjUor~N%ta++;4wZ%qLr$)1fK7Y`KckR7*_UGX(tI2cmekGDIJ_gWf22V}= z-hY5_HhdgVVVYJLl&spS6D|8e#d4z1sW{W+JhGjzVlE{I*R63a{h+WQXRMr+RsNhS_#Z^y z@m25{={vG@>e|J-ca0FcG6X$=5tlln1dRh53eN#gDEuUFR^hJz7ZiR0nAeqvpw|I7 zClL|9&y$jZ6@eEOUICs}_;ui03V#RqD}{duJl;8cK|KGw!aJz|I`yg)95;j_I_=zl zoen5b9*^5Z5uN(!BZX(Mo=-ckv&=Sy{N=2JCFQ9_BReknOIQ+*;)M zReQ}XMSc)c;D&CLGOAb0?y@A|HBZ8tQ|#oF6+B)hFL+C4EqfgpgllE#w!Nws*kR+WZUrcr6ocmD2BfbYa97R9 zU605tJCQ?XF$^hon7m(Pa=h#o>sRbmuj;DYt1kN(6~~-nF>u$^sDmB8;-XfPfa%Db zJAc-6qA2i+^$4N=EZ8dUoKAPo0;~5N?+eQz=w9e7lw|@NF#$UO0i@^g zWAF@vRAlT`aJAkg6e+;R^|-FA_a?9$14uUNZQq64F}~x}ymjOmJRlXW$>KrPdGBCe zJ}aJ=Zz4JG4PdUv`^fSE>hV1&g=4JmLU9%~>HigZ+#6CjhlMRd9odgT1{^#$_Xy9+ hnBPsFEg(IIU)Dbuq$2C_e`{)91M7HSCc( +# SPDX-License-Identifier: Apache-2.0 + +set -euxo pipefail + +rm -f arm*.a + +crate=loader + +arm-none-eabi-gcc -ggdb3 -mfpu=vfpv4-d16 -mfloat-abi=hard -c -march=armv7-a ../src/platform/atsama5d27/asm.S -o $crate.o +ar crs armv7a-unknown-xous-elf.a $crate.o + +rm $crate.o \ No newline at end of file diff --git a/loader/build.rs b/loader/build.rs index 5386b2fcc..27c93aefb 100644 --- a/loader/build.rs +++ b/loader/build.rs @@ -8,15 +8,33 @@ fn main() { let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); let target = env::var("TARGET").unwrap(); - if target.starts_with("riscv") { + let linker_file_path = if target.starts_with("riscv") { println!("cargo:rustc-link-search={}", out_dir.display()); println!("cargo:rustc-link-arg=-Tlink.x"); - } + + PathBuf::from("link.x") + } else if target.starts_with("armv7a") { + let name = env::var("CARGO_PKG_NAME").unwrap(); + + fs::copy( + format!("bin/{}.a", target), + out_dir.join(format!("lib{}.a", name)), + ).expect("copy arm assembly binary"); + + println!("cargo:rustc-link-lib=static={}", name); + println!("cargo:rustc-link-search={}", out_dir.display()); + println!("cargo:rerun-if-changed=bin/{}.a", target); + println!("cargo:rustc-link-arg=-Tlink.x"); + + PathBuf::from("src/platform/atsama5d27/link.x") + } else { + unreachable!("unsupported target"); + }; // Put the linker script somewhere the linker can find it fs::File::create(out_dir.join("link.x")) .unwrap() - .write_all(include_bytes!("link.x")) + .write_all(fs::read_to_string(linker_file_path).expect("linker file read").as_bytes()) .unwrap(); println!("cargo:rustc-link-search={}", out_dir.display());