From 189a936f33310d1d17ac451eeb77291a5cd5fc0d Mon Sep 17 00:00:00 2001 From: bjoern Date: Mon, 28 Jun 2021 18:03:47 +0200 Subject: [PATCH] rename asm to trap, rename blobs --- assemble.bat | 8 ++++---- assemble.ps1 | 8 ++++---- assemble.sh | 8 ++++---- bin/riscv32i-unknown-none-elf.a | Bin 5192 -> 0 bytes bin/riscv32if-unknown-none-elf.a | Bin 5196 -> 0 bytes bin/trap_riscv32i-unknown-none-elf.a | Bin 0 -> 5192 bytes bin/trap_riscv32if-unknown-none-elf.a | Bin 0 -> 5200 bytes build.rs | 2 +- asm.S => trap.S | 0 9 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 bin/riscv32i-unknown-none-elf.a delete mode 100644 bin/riscv32if-unknown-none-elf.a create mode 100644 bin/trap_riscv32i-unknown-none-elf.a create mode 100644 bin/trap_riscv32if-unknown-none-elf.a rename asm.S => trap.S (100%) diff --git a/assemble.bat b/assemble.bat index af175d9..d847741 100644 --- a/assemble.bat +++ b/assemble.bat @@ -2,10 +2,10 @@ del bin\*.a /q set crate=bl602-hal -riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32 -march=rv32i asm.S -o bin/%crate%.o -riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/%crate%.o +riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32 -march=rv32i trap.S -o bin/%crate%.o +riscv64-unknown-elf-ar crs bin/trap_riscv32i-unknown-none-elf.a bin/%crate%.o -riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32f -march=rv32if asm.S -o bin/%crate%.o -riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/%crate%.o +riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=%cd%=/%crate% -c -mabi=ilp32f -march=rv32if trap.S -o bin/%crate%.o +riscv64-unknown-elf-ar crs bin/trap_riscv32if-unknown-none-elf.a bin/%crate%.o del bin\%crate%.o diff --git a/assemble.ps1 b/assemble.ps1 index 20dd41c..41e1f62 100644 --- a/assemble.ps1 +++ b/assemble.ps1 @@ -3,10 +3,10 @@ Remove-Item -Force bin/*.a $crate = "riscv" -riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32 -march=rv32i asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o +riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32 -march=rv32i trap.S -o bin/$crate.o +riscv64-unknown-elf-ar crs bin/trap_riscv32i-unknown-none-elf.a bin/$crate.o -riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32f -march=rv32if asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/$crate.o +riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$pwd=/$crate -c -mabi=ilp32f -march=rv32if trap.S -o bin/$crate.o +riscv64-unknown-elf-ar crs bin/trap_riscv32if-unknown-none-elf.a bin/$crate.o Remove-Item bin/$crate.o diff --git a/assemble.sh b/assemble.sh index f8f2aad..67a377b 100644 --- a/assemble.sh +++ b/assemble.sh @@ -7,10 +7,10 @@ crate=bl602-hal # remove existing blobs because otherwise this will append object files to the old blobs rm -f bin/*.a -riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32 -march=rv32i asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o +riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32 -march=rv32i trap.S -o bin/$crate.o +riscv64-unknown-elf-ar crs bin/trap_riscv32i-unknown-none-elf.a bin/$crate.o -riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32f -march=rv32if asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32if-unknown-none-elf.a bin/$crate.o +riscv64-unknown-elf-gcc -ggdb3 -fdebug-prefix-map=$(pwd)=/$crate -c -mabi=ilp32f -march=rv32if trap.S -o bin/$crate.o +riscv64-unknown-elf-ar crs bin/trap_riscv32if-unknown-none-elf.a bin/$crate.o rm bin/$crate.o diff --git a/bin/riscv32i-unknown-none-elf.a b/bin/riscv32i-unknown-none-elf.a deleted file mode 100644 index bbe287fed917a3dffe3585e6c5a7d40a308c600b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5192 zcmdUzZ-`u18OGl;XJ&Srq}xnVZE9M*d(P&~>}E4NJDaSDjqOftnrPG7kQ6OcHnYi^ zUEC&{*-5NaF~b$Lps2J$MWGES7OG%SP{D|!{m??8EmSDzhXw@wpx9Euih{n+J@5S4 zqecDL1NYwF^PK0rcjnx==ic4X1C8d%rCT>lCF|StY;AgPZU4UM{Yg^Ix(4@2Qrpwb zpV&Y|Mz#m$*IJEcYrfTNtj;erR%l^mwp!aQR5_cKf2*3))#~i*Y?AD)?g=MJPHgz> z!6SDXgR-F+dLuhYSHHSB(4Op2rY%(Jc4fz{#=Pm15_xx&{8)oLpCe!H7(eln@sn4L zue@%2aw+HC<(wbujgh?wBRQj z1z$N=kp3a*AM#_DhCE*$^5yBGpQsnN=FPC5Y!_z=hW`B86Msz;L#eBi^=(Rhhit`| zv{E;As%_G#jF!Q39W_JN)rah8duWZ4>QWTY{F zAGucc*~JjoP-E@E%CRupg&dByWNhvl>9Xc+wIBSi0 zuGT;^7fp#a7fWV~u_N0@c8qK-XfLk3jvmPOG5iLmdbckWac&$B#w29O=nO_opS)3u_ueLGO$52O>Qe={q8QIMPQVeQ%_XNBX0Y zejw5(B7G{-OOalQ^lGGAk$x!BpN{m!NPjNUUySsZBK_4!KNji7BmJ#NKN;z7NBXHq ze=pKMi1d#l{gX)lEYiP-^fQruHqy^W`o&1U9O+jg{o6>t8tLCf`VW!*W29e;^j{+V zW~BcS>HZ=R?w9_07xZv%{R?{2fbNwNur%B+m391kzBe@Mm*=7!iy31VbpK7{+FlR9 z5?+=1%?^x&YiVP@Gt=?-k#!?B%lh!nff1X*l_S-J;y1BD-8{e6%3jY1_eJTxP+(jR zMi>7XVW(dT%WNCNdvQHmW3UjN7BHonX|$!n>->gYvw$By_jIu%){`v z$W9uVHPaS$c+rvuX3cy-*j*2o2+W%KvaovxTp}=Q=22m%7Z%K#`3C$OWG4;Gnt4Ll zZG%e$X3cy@*xd-12+W#!TG+h{E)keDb6MDJhf4%z&HPx{-2|5i%$m6(>~4lj1ZK_r zO4z*{E)keD^PI4I4_qQJYvu)Em&i^Um^JfjVK)kw2+RqH=r^)CyxvFyvu3UeI}eu# z%$oVVup5I*1ZK_rN!aaxO9W=kydmruF3DdV;%nw_!fq#AA~0*_pTe#Tmk7+7k=K86 z`d@yU~9Q<2?4`$7L68?eUgIP15f&c#CgIO~v z{9A($X3abT|F+%j-JX1)pk_TYnAGne3hAoyU`%y;465qvOf z=KJsu1|Q6t`62u}gAZoS{1pD7;DcE+SKuEGKA1IA6w7=#_*k0Fy@9cenhyoWl4tG; zjOEE335=!0+#NUp-xD~i`N6<(9j|pzbEnp)%G#$MY&90-*lLF3QkPnb54EUrs?lmt zWnpcND$T`}Mg{-AP&~D`aQ^iC%JP}Tb;k0UkDrxsS!ZKmp}BZrU3a6|ICFYY%7uiS zO}g>NP^HmoHJ2C8x1{rbZQCU%Q`&p(>n+k7o>v;xoK+p?Py-E16CT6=Er(lr@Vs-P z=ek9}vY}zg!DpD04eiu5M7Y-1$p#-AG;WQ7;dD{NF9(b+;?^Ckw<`6H%SA^$T>EZ4 z{4}~_1nGA9LJZK>?ZeMOhk5AMyI;6FMv#`I9)3sN*6mvnqs!>KD7gfn z4K>kD%Qkr4ZSrHSiih)V)IQA1!?K|s`p}+~diuD`H2Sc8UN-4k%}m){5uuOg%t8hY w$6Q8X_lo3B6o};X+4sh00?V|bUa##FLmw-d*R59)HJCdrgCFmW>d(c$0C-VWi2wiq diff --git a/bin/riscv32if-unknown-none-elf.a b/bin/riscv32if-unknown-none-elf.a deleted file mode 100644 index 896652ca79046e41941404b337613fcb622447be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5196 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 WCGpaJ_-WId+ruY6-8rj!-5&tN16CUV literal 0 HcmV?d00001 diff --git a/bin/trap_riscv32if-unknown-none-elf.a b/bin/trap_riscv32if-unknown-none-elf.a new file mode 100644 index 0000000000000000000000000000000000000000..f762ef3befd59ee3721686978f14a0ebcbc28908 GIT binary patch literal 5200 zcmdUyPi$P(6~^zKJ2N&RxOS34S|B{XJ2{z5oblLkoB#nl{0V6>X@DTn3e_GHCvoKl zGoD02AjmKXA%qY}s6q&dP*oKRR1uU#R8@fyED*{9qzbWM0fInulD_kH(!XU6x<`{UtVwfa4WuU$17t*o)h@rj*RZr`zEdlXfYsopV)#wXJJ z>?&i7_*qOFuQ|4cq4)#nF|$*`D6jG|d%hSI5Izt-BXeKcfze4Fuwn(=g>@x`|FrT45K z`PlmMm)1uwWqf=p;|uMKr}r|x_;JRUzRdU$>wJ00`KX!o@iSRp7|wYb%lTq8=S#Qc z{75b5%lGAYzK`eoeBq@&PpA5PaV+mk)%@D5?e`Y0-=kMbm*I(qY{=D%Ci+N1W zj>&efBb=?CvM2128O#saHP#JWIU<&4#Xye)y1OvaPws69iQXCHcLjPX&^HEp zPoSp*y)V%F1ASMZ?+)~ApbrH4aG)0hy%gw1ppOUo!9bq~^rL}(JkU=D`sqMF8|dc( z{X(Em2KrBdemT&u1p3uLpAPhyK>sb!Zv^_SK))U6bAf(0(0>o~2Z8=D&>sc*(?FjO z^k;$oBG6w2`s+Y{8|dy$K(3eWZBKN6=Qb#Mb&u|}VsNIv+bWs(&wS_5WS*aoyzfgG zgXlFqx`PbP;FYOc&g8p-$(aiSeNmtXRvaBhBn)j`2+50+VK@nPXiFFlpv? z___pO(#&1(SM$IHCe8eoIo2ftlV%RUAK-xtOq%%}bNmyy#(+sPOU!Yyc*cN9GsocT z>m`^p^B{aZ$zamVBk=LU#RVqKV4dT2a80u2q?xB!$3IPM118Np3tvwxm^AY|{7ZP? z0+VJ=GRNzA;5x}0Y39$&@y~eR0+VK5VUB+e*BCHq<~8Q{Qn@VAK%Ce7@DKOsJtG_x1}cJaZanf>r5#RrpSegl7p_+Zk^ zEc~6~gGn<7;a@2}m^8Bp|0?mpq?tPWtHlSCW{$((B|exm^AP-N#0QgR9)*9c_+Zk^ z6Y#GSA55Bg8vc~{VA9MV;8(>5lV)Ckf4%r%(##*>-ylAiH1jh28^s5cX8r>ICh@_f znbYuhiw`Ev{1yJq;)6*uXW{P=A55Cbvt@rJ{%Y_(;X&{(h1Y>^5nd0T7RIf_-YOh{ z_X;OHe<2+9@!AJHH)(%UUcUeLjoKXV8+F+qPN^|}ykW`*YK@vH&n+*Ta(#ZWR>prg ziU;QBjvks>TsShn!dN(R@LoPHnXJvt)#s0`n6A}pM-I(%J4x`T@ihJ?D%To~`oi4N z22cL4gGt+J&i(fDNk>1N`?Mc^8tE~N<_7+Q2%weD z;b+;~?;JPU&mQ_=9nyZkW=@Y`Gz;7hzoWF$xkWZo#@q?cMF1`IL>=O-_j4ouu~yi_ z=U%9DSeFNQLqE)+PI5neEG8Or*dF7Jr#*B*RCXo6Q-+AD{f) h_)cJ6R`l!C6dU?jNxZZlUTu1F`}pAJI!ATa;ybu#SPK9E literal 0 HcmV?d00001 diff --git a/build.rs b/build.rs index 8c774ea..cc43fb0 100644 --- a/build.rs +++ b/build.rs @@ -18,7 +18,7 @@ fn main() { let target = target.to_string(); fs::copy( - format!("bin/{}.a", target), + format!("bin/trap_{}.a", target), out_dir.join(format!("lib{}.a", name)), ) .unwrap(); diff --git a/asm.S b/trap.S similarity index 100% rename from asm.S rename to trap.S