From a062ad61b05bb015f4b7810edfa04ed5ca023da9 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Thu, 14 Jul 2011 08:15:16 +0200 Subject: [PATCH] ndk: Fix android-3/arch-arm crt{begin,end}_so.o Turns out that the previously commited versions of these files do not allow for proper linking with a patched toolchain. With -shared, gcc complains that: .preinit_array section is not allowed in DSO So use the versions from android-9/arch-arm instead, which seems to work fine. Change-Id: I9aeaab449ddad058451c7d6493c983ab2ed1c4eb --- .../android-3/arch-arm/lib/crtbegin_so.o | Bin 1340 -> 1068 bytes .../android-3/arch-arm/lib/crtend_so.o | Bin 945 -> 716 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/ndk/platforms/android-3/arch-arm/lib/crtbegin_so.o b/ndk/platforms/android-3/arch-arm/lib/crtbegin_so.o index 63d4efae49d29589922a14813b0b1e6b17dc6e2b..52301789652bfe506009b599a814965a0c726460 100644 GIT binary patch literal 1068 zcma)5%}T>S5S}z?ss9yvP((afp&$egdK0vuf}kR$7eQFICelD`C0W6G@e%Z4d;}lC zClI{&5Y}&!Oqv!C4s5>pX1~nr%qGvrXD60rk(fnI8Z)AgbfdhRV3X!)h8%kNBzpb& z8I8W>J;70C%v&pXXkT{&vKHZ%_d3T^ajF)%@$k;*F3?0N_QZ?)&^7*}A=lGJliQ7B za)W+gl#U`jB$oxZ2ncVr&s}Xy6m%bqA9LOR+6IK&YbASud#q(XgUn$K{!AfWcT(MK zrU9iY)>g)CAlp$2`BU<3Bf@&oUBWNc6@LeDo?B7JwZtUfAp%QSqU*rt{9>ZpN1)h8 z1Ibv&eeevVk2Cnlbq`4F8qd|tXOMi$@TDflAFx;}COXEF1c7fLH3aA2FJN(9?wQY4 z%=Zp*ftZ-&6aE+4`RUSKdmBvo5Y>j#R8eTYzyZVG<9i3Uj_SgWJ~@x^g=v)X}X6J|$fK(s$V z=(BJAYt}d4`~${wvpe10Xz;@9x#!$7A3J;ZOJ`@>aU8PY&<5pTMmL{+>>M@+g^R1U`7DbJ4zzqKssq$hnBL`mo=jnul%uWHK}| z02-a*zRh%W;G5{skUx+{k{=`q`C}caSQ#O;mJ{-e`Fjwnhi0VVZuegJ(ip9Rk0wg~ zKJ6mq4hnoFwaoAoxRvD$jV!+jJeTDR%hl9(0Xfh2FqSaxX50mGj8iy!rq@q&4+{JL z=i{^R8HzsM%Z6R=2?V}x>odsz<$DhOQo(n)!1o$DuWi@+w7~Z^^_;!t5%>)Z8}@vw z5bRo9`-Ty7l7;m#R;&nYVA2@kGUpilPK^95it8Pr@D-X3yPoA1i@Ha@rdDTkOMeRU z;ttHcQg84L-N!s``80~Fv%fm4+baHsJVoZB>v(=1whL3mrTSdGo?DT*=%Dg^?x;Lm z+|r|*(i+bDxWM@yyK{WE#H;kK#A`Gv@j87jaqJ(cQLMt&feONw)ZzZ7)WcRLhS~(t z2NjFKB$h)J`g_!r)EtmVjMRpN;Aw(?bs9<)LwMEeba%Ub(eCxyZ-js{N4LQX)o1;e lJ+af>>%+_McN>j&g>fzYPL<0jqi|GIW diff --git a/ndk/platforms/android-3/arch-arm/lib/crtend_so.o b/ndk/platforms/android-3/arch-arm/lib/crtend_so.o index 5b76af8da7f957928c0fffe2ffda418c0d768996..c54db97fd39d76f814f80041a4f2ac9153902153 100644 GIT binary patch delta 183 zcmdnUeui~|g769kFkm$SQyL6h4D1uFeZ?~KGE3qUi;5B}8T8VC90+^j7OROLY8d$@ z=Q1j@S^#zMPoB!CEa(DcF*7g}fQ9Gn2EW0|~`NqpiRk%!etdOY)0~ zCr-1Pc&?67V6rcxGOIOEJ>TR~MrA>FAd4S}nV}}wOm1Wp7YqjS7?DIBz@kwQkpiev z2A9bz8P!>%f!wUgR~eNpS1>U!JOJ{zftU}7S%6poh(WG{nGa+#bO1S;AO;jLPTVLy z@dF13h|9w8@&9BGCI?2f$(>B{KyoFMe5M*qC75PI;W0C?GoZ?|qsar!P0GyA%S_hK g$xKStPb^B#&`m7L)rSfu7nP*urRW7SsH89e08HC94gdfE