From 4779ddaaf29e1d6aa2d26980103a1c1bbaa29462 Mon Sep 17 00:00:00 2001 From: Jack Date: Tue, 4 Jan 2022 14:47:57 +0800 Subject: [PATCH] fix the bug that phy libs still have ets_printf --- .gitlab-ci.yml | 12 ++++++++++++ esp32c3/libbtbb.a | Bin 8506 -> 8506 bytes esp32c3/libphy.a | Bin 158600 -> 158600 bytes esp32h2/libbtbb.a | Bin 10052 -> 10052 bytes esp32h2/libphy.a | Bin 149494 -> 149494 bytes esp32s3/libbtbb.a | Bin 18178 -> 18182 bytes esp32s3/libphy.a | Bin 188348 -> 188196 bytes fix_printf.sh | 12 ++++++++++-- 8 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76e2d5c..b9dcc03 100755 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,17 @@ stages: - deploy + - check + +check_lib_reversion: + stage: check + except: + - master + - /^release\/v/ + image: $CI_DOCKER_REGISTRY/esp32-ci-env + script: + - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w printf | wc -l) -eq 0; done; + - for dir in esp32 esp32s2 esp32s3; do test $(xtensa-esp32-elf-nm $dir/*.a | grep -w ets_printf | wc -l) -eq 0; done; + push_master_to_github: stage: deploy diff --git a/esp32c3/libbtbb.a b/esp32c3/libbtbb.a index 8d30c9c167ca4a84db288e67bfe3f7813c1f5f85..b9f3f44039c2a672aa5d70b90f2117cbf5b2ba64 100644 GIT binary patch delta 66 xcmdnxw99FN1ebvV3~W>?VUj~|6%-(B2x(?w0#vto3sa>ab5Tk1W&;r}UI5kj4c!0$ delta 66 zcmdnxw99FN1ec+iv4yFjiK(&CMx_!aIXKr+LBZ6}OaVq38W@iy4km~IM2N>sg5K?}MgJ~Tz qVTT)=7#e{bzWoRf(=~mt@pEmMy0r-z|1XoNi*fpeOeO)MR004@{!#J( delta 381 zcmeCU&e?IDbAkkyp_#FTsiBFfq4`FoT_SQYu92~Vf~ldI0*o{?FfcPS+5Ai76^kl< zH3|wwMiwR(lNm+THycQ0YBHym6mOp6d_%NF8^DUwzOXeDP`tgXoUz#hqn93 BT%P~{ diff --git a/esp32h2/libbtbb.a b/esp32h2/libbtbb.a index 0eb776e64ffcb750930a70c81d115096317a75d2..ad1c3b5eeae0d4cceedf1a7c287560bed05b26da 100644 GIT binary patch delta 66 xcmX@&cf@ak1ebvV3~W@AVwOX26%-(B2x(?w0#vs-ig}6%b5Tk1=8xjR`~cAw4uk*z delta 66 zcmX@&cf@ak1ec+iv7x1zxrwp)MkOg`IT+W(KtaLO&`beF8X6dwnVD>kVxA(xoLW-6 J`J;F+KL8>z5Q+c* diff --git a/esp32h2/libphy.a b/esp32h2/libphy.a index bd0a0bed0bd870506816574eb552a770cb5d1d4b..d66e76ae92467fceb3c01ebfdb800c4fe770a60d 100644 GIT binary patch delta 355 zcmey?&-tyNbAkkyfdUL{RO*nFLvR%oAZ!R}W?}+VxA}zRD;7d(F32TYa}{J%#upT2 z=9Q#PUcg?td0Ui&iz@j=sa|l~wWN2<|1hQuPq4$heHNZM&NihAjvB5^A4oNvU*H}Tp)X+=;Mj9Fzn3>?QsU^kn1x1;8C25lvuvc#07Ukfgir;LIO$G)glg~@4Z+4o$Kb{$A#AcTNS?L7q z+uoDL=++juPK+HC2*{aiz+uVta-0ip#yiwxaCXS}A1i!3row83kc_$Ir74!NqRc|FQ3 z_9>D1y+lvEwhnzmR;~(U98%OiEiysX3KUUw3#C>4Kx?XIXGFFKHCMla^ut6Qe1$Kl z8%lAFC9orCoa;1k!HQ7xBz#FR@ZiIR7;s9c&m;B7#yr?EX^~32Scv@STacJ4nMo7zgk#wLY%+zz4Af!Kl@0soK~!RS=(T;~=Q`T7*u%K&;q;4o)KKAXSK< zL!pA8ZXy{RD(Ix6Zo0TR3c3gmg8q9Y0S_+Wm;Zg=ak=fJu$dGN>^52Pbp~W#Kz%3iOc_$5gW`hy)>#^S1cQiv#z$d4CMGfmOB{$)87^|Y_NKtFT5 z=G$fy@#xCx;&Nh6j|rlnpGrR!+Cqt_t(27NnXb5%y*ChDpnO6L_NeU8X=n%PZX`=}B2*1250DjRJg@(9_wHE6>{Byl}Jsb-@~b)U*YEks2;n}>$osNr3%p%ZA2XNCPL z^LU7scsAW1W5>`I*CVo;R-;SpfXbY0M0Y%kL2rlXSkRW_)ys&*rbLLO6>P{`CT zG-GNcq_PB*+dU0^L&bcD56J2z8sh2=<3vz5*M9hj?LxUf(H>FV7cwp;KX>9Wtg&Kd p`;=qi=FD*~YM&9&fj>bO^CQts4Ure+liGQt*8X1iKhCbsjz2zybW{KU diff --git a/esp32s3/libphy.a b/esp32s3/libphy.a index d6dcc9ec9c5c718b71d453876746c6125d7ac8a3..e5fc84515bb390c96c46d299e146eb4b557eaa7d 100644 GIT binary patch delta 7271 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/dev/null 2>&1 if [ $? -eq 0 ]; then echo $dir/librtc.a fixed $TOOLCHAIN-objcopy --redefine-sym ets_printf=rtc_printf librtc.a fi + elif [ $dir != esp32s2 ]; then + git status libbtbb.a | grep "modified" >/dev/null 2>&1 + if [ $? -eq 0 ]; then + echo $dir/libbtbb.a fixed + $TOOLCHAIN-objcopy --redefine-sym ets_printf=rtc_printf libbtbb.a + fi fi git status libphy.a | grep "modified" >/dev/null 2>&1