From c9c02b5d933c192d74d90031effb12d471aee1bd Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Wed, 18 Aug 2021 18:18:56 +0800 Subject: [PATCH] loader: initial riscv32imac-unknown-xous compat Initial changes required to get the loader building for the `riscv32imac-unknown-xous-elf` target. Signed-off-by: Sean Cross --- loader/assemble.ps1 | 1 + loader/assemble.sh | 1 + loader/bin/riscv32i-unknown-none-elf.a | Bin 3462 -> 3442 bytes loader/bin/riscv32imac-unknown-none-elf.a | Bin 3462 -> 3446 bytes loader/bin/riscv32imac-unknown-xous-elf.a | Bin 0 -> 3446 bytes loader/bin/riscv32imc-unknown-none-elf.a | Bin 3462 -> 3446 bytes loader/bin/riscv64gc-unknown-none-elf.a | Bin 5290 -> 5282 bytes loader/bin/riscv64imac-unknown-none-elf.a | Bin 5290 -> 5282 bytes loader/link.x | 1 + loader/sha2/src/lib.rs | 2 +- loader/utralib/src/lib.rs | 2 +- 11 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 loader/bin/riscv32imac-unknown-xous-elf.a diff --git a/loader/assemble.ps1 b/loader/assemble.ps1 index b0295d439..a56afbec4 100644 --- a/loader/assemble.ps1 +++ b/loader/assemble.ps1 @@ -5,6 +5,7 @@ $crate = "xous-kernel" 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-elf.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/loader/assemble.sh b/loader/assemble.sh index 9ee94973b..5e305f861 100755 --- a/loader/assemble.sh +++ b/loader/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/loader/bin/riscv32i-unknown-none-elf.a b/loader/bin/riscv32i-unknown-none-elf.a index 00b0e5c35fad69b0cefff96122432a76a2b67a56..e4622674b93ab22aba1b33d35767c5d486b6d7ce 100755 GIT binary patch delta 197 zcmZpZ{veT7>Y8Blgk(w`GHK< zqB3KnOrrvW$p^V)H%l{DGchV}p3eH6m2uDHer|t8fywuQoGwM&i i%%jYz&cwhVHTgG>GNa36d0utKmdWlwGGcN*uQ&j7A2l!l delta 240 zcmew))h0bbn%&I6z`(-PV4_mI0+gwsV4wg35Yo`Vz|71{LBZI_a^gZwCLXShXC5$y zxmm^JBo?Komgg5`#}t(om*|#f=EWrEr=-SIi z=^2|cILb0GFcf7LCzmlW3Imy}MP=JH+>;k_$!z9gu3%y`+uY3hot5#z zVqJjz=4op%aiUcL6AZUoTl;6-A z5x53Iu2F+aL(ouL^dC4yU{Jr~Y0}E zV#Oehj1Zns!{N;$mS>qZ%y^V>g>jYf1;#T_ZV#s?aB46MX8G()?C=Bp#WAN$-2qH(w U91I-+98Yux=>_DGI@Fx*KY*5DtpET3 delta 641 zcmZvYJ4?e*6vyw0NfjIMF{mh**a|7d>TO!%1Ba?b(Lq5G1cRm4D8*_d@ljly)WxCY z3_6M+U7YOT2XJu^^kWDvx+sXCH>O>JXZYR!|J-xVeSCDBbQU^mHA?Bw04)Ym-G4GZ zEX!1O!ex|FP19sKrVgvcs}LvF7azmiJ6HS)wMgG^iQLxHSc=%@~8;?*eW#Px*&sw zr$Rr(@lKe7B-Z*Qm_)@lG40&5E$X&9I#!u7#Mbu8BOP7M_b}b$cZ(8iX;xjGESG&H z9`d;C55hAZ`4zaq5@QcOF`nTk;|ofn0=GED_<$zkD4vUo@WTFm9Ph=T5atMp;Hwyf RC2VX^-~tC3bC_yq`vp!SZ8ZP@ diff --git a/loader/bin/riscv32imac-unknown-xous-elf.a b/loader/bin/riscv32imac-unknown-xous-elf.a new file mode 100644 index 0000000000000000000000000000000000000000..ef790b671ce3471cdc84a4a7df0cff563c6f6d96 GIT binary patch literal 3446 zcmb7`U2GIp6vxl(v=u>WKM<;@3{$xv!m{0#HXtFbhL0F91~Ad2vCOs$tSq}Qv#ll3 z2>7D$!5U(GFedoq3nnHcHa=kF&n6^3V#NP{?wMuwqA{N2-ueB{Irn4k zy>oXr?up{rQ+rqL2s&+Kyu7PCv2$YAND!3LP`(a=v2vDwe5Hu^D2=SlB&{fJNmOZ~ zPI=~ZHEvYvve=wYwp%VXG339EGEypykB6goeTX&MBaw%B~OB3H-zdGpOyt;hj&gA7w-+0TuObuVD$oqwxzsG+q z7i4n67jN`pMLsNuT)tG0Wa&t$dF#$??@GR(<$*MMVQ_Iso?CJ4M!`##3K*ehC=nS* z`qqu@y_iT)`VI5&B|zd)urqj|sOT#c4^n-Fz6Z|TZ!1K*@=-UY8;`g;1k0nhJU-@B=I zu)7_56r}CjzC2)&cGxxAw|n~8=3I69C7d2mT%E2rqq%A<2cCa1m^vDii=$q?{Q#vyf9j>mCu%D&ajGD&7#T=aS!7FbohLoVdnJHgPtkwZaKQ*)hitR zfTPzqnrmaNOL_o-D$(&={e%-Yj^66%qNB@>9(VL!M?d4}{f<89=tGWv!O_PYJ?-e@ zj;=WRgri?|G_NLWc0b}w>Uu6XdePCZ=X4tZzO4Ai{mqcznR4}s9oGLhckX{k8(VWxZP&bWiH0K=s{itAMqdBjEL;Ob3$VPMC z0EdJ0ija-wyaf*R0wNpDd58XoP{GJXbKV1oYv~ms8_oFu9P%*1$VPKM0*6ENija-w zd;$(1rdNb)H0M)r_z1lsWTQEsfy4Fmija-wTmy%CVUmsJd`Z6^X0p+oujuD51dMDn z=X-FtfnE`^(VQQ^VSoxoHk$JjINV6D2-yTAk)Kh*FvXOO=KM;(e&}SQIXsTuR-4Zw z;yq=V+v#nx%%%5?WiFGq*)m_r;|B^0P`oEelKy6R`lI0XGpzlv&&}Gu6qEC3T2Teh zR&1ZAGHO*9TT+~hT9FhhNg~C#T91nK7Hf?fLaCmsR_0I6)N74uhojaw(M01k7*#59 zb)h31#ZlvA6@A(a42dv*!;4X?71t{BEd>9EaqB%4{lsO=XQLYozve+Kze1B{3 z;@{yV*&o*+>+c9SYXg)e2t5Xr?bu;(zQ14a^4a{j4q1P%n^KEB5)jd5Krps+v2XtyACSWIiiSl&g!o}Epds5W3t^wUUP y%%Sm_oeAoL5R+)w2j&=@6B*NKp8=q}jeXlmP|N!3htAFlL(^#ZvF7lR<^2s&Di6N^ literal 0 HcmV?d00001 diff --git a/loader/bin/riscv32imc-unknown-none-elf.a b/loader/bin/riscv32imc-unknown-none-elf.a index fe2b07cc1dfe9bb7e77a6bc1d672e3810966c834..ef790b671ce3471cdc84a4a7df0cff563c6f6d96 100755 GIT binary patch delta 570 zcmZ9Iu}cC`9LL`~@03uXLNHRgQz1=6&y()ZAyP>VqJjz=4op%aiUcL6AZUoTl;6-A z5x53Iu2F+aL(ouL^dC4yU{Jr~Y0}E zV#Oehj1Zns!{N;$mS>qZ%y^V>g>jYf1;#T_ZV#s?aB46MX8G()?C=Bp#WAN$-2qH(w U91I-+98Yux=>_DGI@Fx*KY*5DtpET3 delta 641 zcmZvYJ4?e*6vyw0NfjIMF{mh**a|7d>TO!%1Ba?b(Lq5G1cRm4D8*_d@ljly)WxCY z3_6M+U7YOT2XJu^^kWDvx+sXCH>O>JXZYR!|J-xVeSCDBbQU^mHA?Bw04)Ym-G4GZ zEX!1O!ex|FP19sKrVgvcs}LvF7azmiJ6HS)wMgG^iQLxHSc=%@~8;?*eW#Px*&sw zr$Rr(@lKe7B-Z*Qm_)@lG40&5E$X&9I#!u7#Mbu8BOP7M_b}b$cZ(8iX;xjGESG&H z9`d;C55hAZ`4zaq5@QcOF`nTk;|ofn0=GED_<$zkD4vUo@WTFm9Ph=T5atMp;Hwyf RC2VX^-~tC3bC_yq`vp!SZ8ZP@ diff --git a/loader/bin/riscv64gc-unknown-none-elf.a b/loader/bin/riscv64gc-unknown-none-elf.a index 8eeeea44c696a4997be6508035b5a3da91b70e59..6ec46e5fb710ff2986ce28650e0f66dce7f5fc1a 100755 GIT binary patch delta 809 zcmZ`%L1+^}6rGvfWD^TD*$p%yLDzV&0qIUQY1R~RQ=>*y3R(<>24XeA3PL2oQbZKm zizrCq>p>_==~2DqP|x<5i=YR=n*k3V_2wn+ZZerB9k!LW+8%CjA7&Vpw-rS ztDWRVmyx)TIio0jq6qyDdp`z+?Tt?qlXN;U_)B;GSF|S+(!E9(C|s^$^5i6Nb_Fn&KjY|5EBx(%@QaJkMT?3G=jKz z3QaMZ_dD~7ggbZ;?6(l&t!MFGtkU!NBWjrQMPoM(N*y+;FJsZC#cCe6tLXVO$bKGs z!pX@_RzPm!W6vqXXzHc_)GMplg~(59Px$lfQeX>YP5{+l17&> z5hy*q+|!Yw&TKVwri=}+v-CL;`@a*nQ}sF*>{hD|lR fP>f*J%~I$o27Lx0V$xLRe{xHlf0b z;JxDqQM|}bQoQvbxTD}*ya--~-t?k)tfDVz%F3Ys;rqV-dtZLu|H$D&Z=pLY8kExI z96ivgbAePP0K-scnW)+B`as0ax$=&&Tmd4cHY3RV0r z%)l!C5K^#)nNaGQb@H*VMiXvN@b66U?_xWYf^Ec5`TXMvnGXIAnb_e3d=}247LMU@ zSO)_ia0*@&v-nPk_@`T911k7Q^zO(@<^7dlUYv1yZ1%{{jCr2C67(~Sy=NZP$UmK5 z3<43xQ=>5B)uHzO7ee&0gG&F4v?2K$+>C1Q8rxA5KHw3+GGq!y^l1=U> t;2(JfI#^IlQRVz$_)&=Cb45F|KI};n-z!Vd#erh7rz}jHaE$Hg#DAMAi|YUY diff --git a/loader/bin/riscv64imac-unknown-none-elf.a b/loader/bin/riscv64imac-unknown-none-elf.a index 8eeeea44c696a4997be6508035b5a3da91b70e59..6ec46e5fb710ff2986ce28650e0f66dce7f5fc1a 100755 GIT binary patch delta 809 zcmZ`%L1+^}6rGvfWD^TD*$p%yLDzV&0qIUQY1R~RQ=>*y3R(<>24XeA3PL2oQbZKm zizrCq>p>_==~2DqP|x<5i=YR=n*k3V_2wn+ZZerB9k!LW+8%CjA7&Vpw-rS ztDWRVmyx)TIio0jq6qyDdp`z+?Tt?qlXN;U_)B;GSF|S+(!E9(C|s^$^5i6Nb_Fn&KjY|5EBx(%@QaJkMT?3G=jKz z3QaMZ_dD~7ggbZ;?6(l&t!MFGtkU!NBWjrQMPoM(N*y+;FJsZC#cCe6tLXVO$bKGs z!pX@_RzPm!W6vqXXzHc_)GMplg~(59Px$lfQeX>YP5{+l17&> z5hy*q+|!Yw&TKVwri=}+v-CL;`@a*nQ}sF*>{hD|lR fP>f*J%~I$o27Lx0V$xLRe{xHlf0b z;JxDqQM|}bQoQvbxTD}*ya--~-t?k)tfDVz%F3Ys;rqV-dtZLu|H$D&Z=pLY8kExI z96ivgbAePP0K-scnW)+B`as0ax$=&&Tmd4cHY3RV0r z%)l!C5K^#)nNaGQb@H*VMiXvN@b66U?_xWYf^Ec5`TXMvnGXIAnb_e3d=}247LMU@ zSO)_ia0*@&v-nPk_@`T911k7Q^zO(@<^7dlUYv1yZ1%{{jCr2C67(~Sy=NZP$UmK5 z3<43xQ=>5B)uHzO7ee&0gG&F4v?2K$+>C1Q8rxA5KHw3+GGq!y^l1=U> t;2(JfI#^IlQRVz$_)&=Cb45F|KI};n-z!Vd#erh7rz}jHaE$Hg#DAMAi|YUY diff --git a/loader/link.x b/loader/link.x index 035c30181..0664ad85d 100644 --- a/loader/link.x +++ b/loader/link.x @@ -133,6 +133,7 @@ SECTIONS /DISCARD/ : { *(.eh_frame); + *(.eh_frame_hdr); } } diff --git a/loader/sha2/src/lib.rs b/loader/sha2/src/lib.rs index 87ad49c7d..e3538eec1 100644 --- a/loader/sha2/src/lib.rs +++ b/loader/sha2/src/lib.rs @@ -1,4 +1,4 @@ -#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(any(target_os = "none", target_os = "xous"), no_std)] use digest::{BlockInput, FixedOutputDirty, Reset, Update}; use digest::consts::{U64, U128}; diff --git a/loader/utralib/src/lib.rs b/loader/utralib/src/lib.rs index 6cf78339f..24d4bdeb5 100644 --- a/loader/utralib/src/lib.rs +++ b/loader/utralib/src/lib.rs @@ -1,3 +1,3 @@ -#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(any(target_os = "none", target_os = "xous"), no_std)] pub mod generated; pub use generated::*;