From e63f855e4f5f5c5d5d6767ed1752233b88c20e16 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Fri, 3 Mar 2023 15:47:54 -0800 Subject: [PATCH] Manually add `-gdwarf-3` to pin the dwarf version. --- build.rs | 9 ++++++++- .../outline/debug/librustix_outline_aarch64.a | Bin 5926 -> 5910 bytes .../outline/debug/librustix_outline_arm.a | Bin 5794 -> 5710 bytes .../debug/librustix_outline_powerpc64.a | Bin 5766 -> 5766 bytes .../outline/debug/librustix_outline_riscv64.a | Bin 10894 -> 10982 bytes .../outline/debug/librustix_outline_x86.a | Bin 7182 -> 7178 bytes .../outline/debug/librustix_outline_x86_64.a | Bin 5574 -> 5574 bytes 7 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build.rs b/build.rs index 6acf74e1a..afda72a1c 100644 --- a/build.rs +++ b/build.rs @@ -175,7 +175,14 @@ fn link_in_librustix_outline(arch: &str, asm_name: &str) { #[cfg(feature = "cc")] { let out_dir = var("OUT_DIR").unwrap(); - Build::new().file(&asm_name).compile(&name); + // Add `-gdwarf-3` so that we always get the same output, regardless + // of the Rust version we're using. + let mut build = Build::new(); + if profile == "debug" { + build.flag("-gdwarf-3"); + } + build.file(&asm_name); + build.compile(&name); println!("cargo:rerun-if-changed={}", asm_name); if std::fs::metadata(".git").is_ok() { let from = format!("{}/lib{}.a", out_dir, name); diff --git a/src/backend/linux_raw/arch/outline/debug/librustix_outline_aarch64.a b/src/backend/linux_raw/arch/outline/debug/librustix_outline_aarch64.a index a6ea6670e3d159349e59c7aa1b65ba6f87a70f76..ceea3cd20f1ce0768bb7fbad2601d1fdf00d3281 100644 GIT binary patch delta 1021 zcmZ{iO=uHQ5Xax_=BwFFvTJtp@=+29niNXY9^%KX!GZ~TP?2JLDnVn52Pum9aWR5I zJ*7C{2M8ia@t~mOB6?`f3fha{S)q7RJa`Zfac1{LmSX?x?#%plX5O2}+o;{Ey*vwA zy^iN#Mm|f5e`BAH!kcLY5GqwM&Rq-C#-wu7y(1~Ti zrVcKCiRN`F9P-n6IF<+YTznVJgX~|9y#hFaKMV;Sd>of>9ZRN!9)2YMDIO>P4GziQ z!W-mo z^HGK=!^ELcvL{q7)2K(KS+WlW=$J>RiM9gN@Mx3hLVzYbx5r~yh8M9fZ87I z5nT(=G}HcaBB|l+)X`A;!g2>crB3$uT4f!6V>5lweh~BX2dXTGy|mPifxw&KjyQlrMV*%g(zw;3TT0+BCY#IT)9zPvX+MbCO4DEsc`` zTE(GTow~nE_lD`G4paqqmv|~O=}z#mlGb(K@`WuTW+ve^Zf0iVg6{%p1F&Tk{{nnR BftCOO delta 1174 zcmb_b&ubGw6rR~lOuA{d8#bFw(#G9ZOb?+k2irPK}mC<4)d6YBou z3KF44jF4P$>Hj~d`8Dua;RehEESL(X;ae!FCRrT032#Dao{&3QIL%FgRFx&0)+@ohMd_%VD!{1WaU{s8-k zzreO;r@Zor55kyDF@%Z2o@SS0_*;#&#(!S9TXx8a|r#@F`@%(WxnkVh`xlC784vb&ksh>-$dLBd}>WrCDSFyin|1 zBHQlsz$4<~n;JMfbxo4L=0#PQ0ypDX^%hZAft`4^ve6^@lIC4+Qxp;1#OaUz5bq1Q z{>)l%%o(9edp)dZ&fD lqbH%1$XNwZUL3DTrRX;Y?k94*4cm!ntwqhZ%b{T${s)pugK7W( diff --git a/src/backend/linux_raw/arch/outline/debug/librustix_outline_arm.a b/src/backend/linux_raw/arch/outline/debug/librustix_outline_arm.a index e7def3073704f56f4b8c79bc4da889d1b116d848..07ab58bc5dcea527c66bdbd3a33c737aa822ec58 100644 GIT binary patch delta 1049 zcmZ8gziU%b7(MsBq|Hm~>q`?#HNi&HlBA?fO(JNCnxUX#hCnSih!TprXess&NZs9T zG1N^vC{BfJ&dx<}bkM<}t2h?a^WD66Tk?_bo_oIg{Wv$ddB1d2Iowokz0uH5RVjTu z39)#?KnZo!2Je)ovfmkSaf_>?PW*FFG!nYfZ{5NKx-VZW?+Azf<-Dm~H2GW*lbE$K zcX#P(SEUe)ZH&2o)?e_`ap)8GaGWRqXgV2d>*LtsAc+5TbUqQNvQ~*X-QupIe~-_p z>Y$t0SG_h1oH+1EFbQl6P64k3Gr*qUdEkQ}HGLK=07rr)U`((I$hDmnAP~F)uoO-W zm<=%(qRC$l^Qd`0dA*mAGioqBh^7a%m>xvagPKeaVqWrjI3FTq7>$(>DZ^-Ogm_Jm znwufE1X;8;#Dmm?t1tPtW8JN1PxO|*dhp3tUWTef*oq!Z^}U>B>p|a}x9ksD#WJ1h zdkxF#(|xaL**CH^%XZRzuWea6b5H%yk28hdea1wdTw#G8qca4@HBW`Rp=BN5azu#H z6Zy-yN8Sq0_E;>v#EbN(pFh&?2J5DQURZY8Fh7#mVd4XuH54Z_$Go$Hzi{v!#%1s# zJsMmM`$=5vBl~R(w_G`2ZX$kjWHA3c=-9;5!K)*KC#hnWc`{&$9u00YkDqOZjCDvZ rM1*L*L0z0lm!I?GE1jQ9R$1qE#dy;u+xYc(|#YLFyeq!by-gb8hdGwn%-a zzk%j)@}x*VxhPS=x17j6n{~c-VcM>RXMz$u?GkwMUgXYdwf=T zSjjdteP=q0R))F#&$T1ijO?aTbDWJk-_jj{ck+Z05Vv zN3c0>H`*DvWn#R`W-mNXLFe)Kv$!rLr=NSgE%aN&x(oMsXLjl?xVp?j;M;TIo^PSc zxD4Yt6w#Rf!>;jV)ZyY)Zbw1QxS zQuI{ep(1$kVihVD_99-IgHX?2^q`a?o_o-nhxWbAM3zE6n3?bWcJ{s5H|%PCwZ8eB zd%npcDL6MH*JNX?2=DpJqRJT)>@?B@|7VUcj=}&3hs8uC%UI{mQu}V_#`N)H_XsoS zDxZvTGy(@>DR?c4+2mYOm_>8K%&8G&EZi0fABlo}DVVjU;HnkK;e~-}D)2z_xedFj z3)i&*Y-m1wRYze)D{wFTslDU;B3v*$ehc=~9`C|K^v_^Y_xJ{UK>rz9=zqWt`oFNI zd-E7HCN$9C9JuQy(#PO^D%a?AzCuKYq=TI|#!Fj{C2fG7&N}X_^ zWt8lraxYOjodZiqPsFH(J_Bn=&&Fsf+PjW)K1S0K-9maZM)in(L%JNJMnw0JK9120 z(QrG1-T!UQB(5zkv|-Ac4Ogs+P|_UUW~c2G6-V`=nXx?VWj%3@GkC<^^e(jnRe^P@ zbm|O735=SAV)`O;Je4euE8U31Y|yPs{j6NTPOd6$%cu+`r+TG5B=OsL{Z#j6dHwC?Uao*dv5SC=%z4>O|xAVT4eOtw?;@jt7 zA0(JCh4!*QWj4x=;w#ub^PA!*>thq-BLM%51OqaPXc2JvN5T}sril0{1AL~u$E8RX zSCm|?xpt?z-n=<|YNEwDu}jP-gFbS2A1rLBTHKzqRb#|BVI-s8Lsfz63xdQsjA>%0 zE!73}cgc0*b>zHa)Kp*qUq&o^r)99NIe1ocAT2TvvRlNvqnpZK+w4*Mi>!UnQJc>>T>DXvhL|cE+LjG1 zs(zg%-q6C+9+&RuK5O51j5m~~6~6Sfyi`s}vKiaMij^_5`Qf)M}! diff --git a/src/backend/linux_raw/arch/outline/debug/librustix_outline_riscv64.a b/src/backend/linux_raw/arch/outline/debug/librustix_outline_riscv64.a index 14d7740cf17591735e7579081937e2727f4cf496..e2cbdd72a2ccb23a209ee946fe99742d36cafe88 100644 GIT binary patch literal 10982 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 diff --git a/src/backend/linux_raw/arch/outline/debug/librustix_outline_x86.a b/src/backend/linux_raw/arch/outline/debug/librustix_outline_x86.a index fac944e0dbfb02787bfae1d5c784f7d246c7365c..6741a82e93f66fd056a895928a49788c0f947f93 100644 GIT binary patch delta 1132 zcmZ9L&r6g+7{|ZkyFV<~Z8vqb-F`@`q_Bj6)fz&3h<;(|!N7w?MUjL=QNkk83VD!< zSQ>>r2AzZ8g$_|vhoD=3Lf*OtU4kI{e#d!r*$3wR%slh_nCF>!UzDGg-;M=l)Se24 zy3hqDqwYI|K@5b8!7EevXn+8xsW#?sx|3f+4LFSbnJ9LkT0U{~fz}8o<5hF)AZGyw z5R-CShB>>yVU|r6nZ%VukS?SL(_L{pnf#OF#wNvHO|FIS+wTN+I+Zbbdpvb0tAINa z;6S*TS`TUy)R{J5PGrLSVhng9#({>I0N#j<|5a=UHpE@PKXEsZQ7Ik3pqK*6VkdA( zOanK>J;0Kf0oKJVP9oG~FTfly-2i=IdKgg50aU^C0)3wQ9qmTuWsS#hXLl~F!MU&o z=R!Ic*5X{qe%Z680nZ_kc}t!nB5Ty`iDi*V#yu+{Yd*8Z8qRCN;wL<(L^fgCb4KLp zW<9ToY|2f~d6CUo@VqCoNe?}%BCC4jxh!UZ6-Opo)r8G^9{$dL2<)exbFu4pZ{M=1 zTsb_On+?nt`+8ro*5DardYFSPMU11JV}wm&`?qC{YuQ8+?Ukr!-KhADe%7F7$yQB{ z;*Gb&d&f0TSM+W>$u74TehX|ppBuYKb#tC6=BfKUg{C}n-d$&q%-bLN-r7P-(9b+p zW6QvORk38gCCdi0==rJ|{UuQ~kA1v0IZCYrhT9dTI+SXWYX=$tYiAANLT@*w?DS|?Z#n6_vsU#@|5#mNs z5h*_0xR5N0xRPQ(T!>o*SAt8ou3aj)@tphK(~^NZ=iZrlGiUCd_c-@7w{yxdId|F_ z>G|FbE61!J!66JcHl4beeq(?zS};L}G3HM!DxeWu+zf>D#UNLR`>xPA?#!H2BOk7s z!O7)~^}=Lnvsf&YCU0+)R=F=%R;oV0oeF1XtGN>sWq5jk--cmY2r2>aI7b6y@1=+_Pe&hgXl`yq{3E5t?snC%j$&HX{-CK&RXroci4Tq)!w(> zS4nHhSUqI5gS{$4F?TMb@v1%VB>FsquN`FEWMsf?iNq6X?!P$L-HuKN7YAFNLJ_PS_576?OnWg`He_vpqmc$a@_XMsXEq zwTS^&gk8X@Fb+HrCV*`rM}#?H*l<*s1n7cE1Kh&&0_t4YZ_(X~KdaeLa_^Ce+-(TC z>ng;3SV-<;LUKPMWSx^ja<{#cyB#cYwDJbiBiay6!-Nj_)=V4)a;d zK@d@Kl4?`oDL&gn+ErNNU>jzAZ21W}Hdd-kI365mQJ~~WQ^NPV5)RRC6B0#W*XP*g koYiSKNPBS8aqjgT?#E2ToOi!u4)@M*oL;a*AVD900T@DN?f?J) diff --git a/src/backend/linux_raw/arch/outline/debug/librustix_outline_x86_64.a b/src/backend/linux_raw/arch/outline/debug/librustix_outline_x86_64.a index b45d87ed223ce13a56df950581b8eeea5f9bea7a..c0de84f6fced25a3f5fd222fdb35681f4a255595 100644 GIT binary patch delta 1008 zcmZ`%L1+_E5dD+QZnB&7x0__yq=}8RG$}-_qSoFT6eQ?DJQUkgv{)1cEr`(KrGf{& z)X0GLAVd%Z4{9Zdcrpj+wc~5AeOB)Zt zpBoUnCt$7Rywd$?}=8DhfdDBuHm6rad~T7F|Y{1Whol?IobJp5!0 zV=j`wrWrO2k!tLTJO?;~_Z=TD;*9OX3ce@4hS!Nd#h=9AVV(F#%*T9a;g;=ZtZq%= zP>w0iDUKc6pY6R9-__DFoT)VW0H|5#J2RUlM4z}E5ZiW2_%^(Vq!O4VgoCbln!L#3RCxlUK$^40v zwBrWKENO^xbwaJ1M27MpEhX=c_FUIB^ciq(vS3_M+cx0&WMO`>kNdi^`J%Ze{^Pzv z&-3dZROfoBhF_CK<6gHIw6U5j&fn=%Yl$aDSY;yucjD3dx0A=J7JqsjHLRzK`ycgj sZ}Y!JXa=$C?&Ggi$*b^K2@}e2nD`(b_DZmXRd2@GQ2+Nc!0&S8FUzujIRF3v delta 1148 zcmZ`&O=uHA6rQ)6Y_hT0{B^r&Vw1FDQjFA!wu&GP6a=9lRw51lr2dppC>2c#MFs0k zPbyDDPYNDHP%Gx*NqXv4FM@bc5D`y;C$Ug{GkN)8X$EHA`@VVe-ZyV&*YoT7*AKvn z2SsZXlvfY~VmrQsYlprQ_6olkAqxN-R!|y{ND*mG9iT;nv=&lG?h3$~wu-wv8Qj!| zQeyewczJyPNVV;xDab3pPX=#-9Tl(w5fOHZj&3EbomR|?Gy3M~k_wYiLip55i+2mp z*n(@vnXTQn7pVXBya5Q~Wsj}vA}TF@HWK*4h(n)3zm48{%J&e?4RPrJ*^YLJtc%Yu z9(D1PjK^I36yw8~4mdE4@BI!`@EG~m@gMp3@CNzMaF6N0J6t9IBbH64ztIpOq@Hb@ zLz*DoF`Z(B8M$lG>|tzo@FDi4>38wF84q;wxM6;Spwj6mor6keUg;cDIwzFQqe|xq zsk45z$ER5r=gu!x$_w+0bLDF73SO|LjK#{re6@yk>v-J=Wpwz7x#)q&41cAJdO|`Z z@KV$nJR+YODQWhUMTw^zRm2~$w0;WIJ2L+;y90Bf^yEoG9y(BH9%8%94ZO=ZK{iaY z+1EJpl}1)AsbMCT)vq!f)o?bJEiHA)?l&99KXDeBJx0@={WhJKa@{xkfL~%c{Sn`2 zSZ|~`BX3l?-=*ePuDR9-7P4j^O?S;#T(kA#a{MiP+?(6`yi4{c@+r|+Q!9NLva&~h m{1tG}vcq;kwwXqO6DP?J<32kND_FKC0<-)~-vSPYQvU&~R(*f~