From 2c5ce2fe1286fc141ccd964217826ef7fda079be Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 18 Oct 2008 14:45:03 +0000 Subject: [PATCH] + support for TEST_ABI in the testsuite + arm-linux-eabi object files git-svn-id: trunk@11918 - --- .gitattributes | 4 ++++ tests/Makefile | 13 ++++++++++++- tests/Makefile.fpc | 7 +++++++ tests/test/cg/obj/linux/arm-eabi/ctest.o | Bin 0 -> 6660 bytes tests/test/cg/obj/linux/arm-eabi/tcext3.o | Bin 0 -> 3712 bytes tests/test/cg/obj/linux/arm-eabi/tcext4.o | Bin 0 -> 1958 bytes tests/test/cg/obj/linux/arm-eabi/tcext5.o | Bin 0 -> 4797 bytes 7 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 tests/test/cg/obj/linux/arm-eabi/ctest.o create mode 100644 tests/test/cg/obj/linux/arm-eabi/tcext3.o create mode 100644 tests/test/cg/obj/linux/arm-eabi/tcext4.o create mode 100644 tests/test/cg/obj/linux/arm-eabi/tcext5.o diff --git a/.gitattributes b/.gitattributes index eafef812ef..d115a7eaa9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7208,6 +7208,10 @@ tests/test/cg/obj/go32v2/i386/ctest.o -text tests/test/cg/obj/go32v2/i386/tcext3.o -text tests/test/cg/obj/go32v2/i386/tcext4.o -text tests/test/cg/obj/go32v2/i386/tcext5.o -text +tests/test/cg/obj/linux/arm-eabi/ctest.o -text +tests/test/cg/obj/linux/arm-eabi/tcext3.o -text +tests/test/cg/obj/linux/arm-eabi/tcext4.o -text +tests/test/cg/obj/linux/arm-eabi/tcext5.o -text tests/test/cg/obj/linux/arm/ctest.o -text tests/test/cg/obj/linux/arm/tcext3.o -text tests/test/cg/obj/linux/arm/tcext4.o -text diff --git a/tests/Makefile b/tests/Makefile index 6609a3ff8c..87b324fdfb 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/07/15] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2008/10/18] # default: allexectests MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded @@ -115,6 +115,10 @@ FPC:=$(shell $(FPCPROG) -PB) endif ifneq ($(findstring Error,$(FPC)),) override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +else +ifeq ($(strip $(wildcard $(FPC))),) +FPC:=$(firstword $(FPCPROG)) +endif endif else override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) @@ -1463,10 +1467,17 @@ endif units: $(MAKE) -C units FPC_VERSION= FPC=$(TEST_FPC) CPU_TARGET=$(TEST_CPU_TARGET) OS_TARGET=$(TEST_OS_TARGET) OPT="$(TEST_OPT)" CCOMPILER=$(TEST_CCOMPILER) BINUTILSPREFIX=$(TEST_BINUTILSPREFIX) copyfiles: $(TEST_OUTPUTDIR) +ifneq ($(TEST_ABI),) + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/ctest.o test/cg + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/tcext3.o test/cg + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/tcext4.o test/cg + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/tcext5.o test/cg +else $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/tcext3.o test/cg $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/tcext4.o test/cg $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/tcext5.o test/cg +endif -$(MKDIRTREE) $(TEST_OUTPUTDIR)/test/units/system $(COPY) test/units/system/test*.txt $(TEST_OUTPUTDIR)/test/units/system testprep: testprep-stamp.$(TEST_FULL_TARGET) diff --git a/tests/Makefile.fpc b/tests/Makefile.fpc index 908a1063e4..565500d018 100644 --- a/tests/Makefile.fpc +++ b/tests/Makefile.fpc @@ -168,10 +168,17 @@ units: # copyfiles: $(TEST_OUTPUTDIR) +ifneq ($(TEST_ABI),) + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/ctest.o test/cg + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/tcext3.o test/cg + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/tcext4.o test/cg + $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)-$(TEST_ABI)/tcext5.o test/cg +else $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/ctest.o test/cg $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/tcext3.o test/cg $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/tcext4.o test/cg $(COPY) test/cg/obj/$(TEST_OS_TARGET)/$(TEST_CPU_TARGET)/tcext5.o test/cg +endif -$(MKDIRTREE) $(TEST_OUTPUTDIR)/test/units/system $(COPY) test/units/system/test*.txt $(TEST_OUTPUTDIR)/test/units/system diff --git a/tests/test/cg/obj/linux/arm-eabi/ctest.o b/tests/test/cg/obj/linux/arm-eabi/ctest.o new file mode 100644 index 0000000000000000000000000000000000000000..cd0b29b13858453d9fff3a7276a2ce8a2a22f954 GIT binary patch literal 6660 zcmb7He`s6R6+V)lGc7Y%?Yzxvy-qL>yv|mi6BC+|QHQuo#++idWOxv;WlN2{$(E6x zTc>o)X}U6o4Q9(Af250`q3akcrg){W44gQFG8%B8Q2$Xw6;GhD47w3U{}^Q7_wKt- zN0N=R2Uque=R4=zbAP<^bbt2r(03w{h}b70-BLp$FYogir{C|orByyFj(epdvR--Y z{u5=YiC1L3tg*<2|BH{wg{t;%#EtP9d5t5w7whaiEu^8O!Qhu_oLnN!(}}kNdOJc+6!t zuJN43H%{JhWU2DDY?U44n1FABVL_1RXaHE}+j-`Cg} zIeGg&80%k)^}%bCM``CEUyj%Q=JE0i?N1D7-Tn_=oBj4L-2s~u*PHK<l>OgPbH;f=hd$B<2Y2dU4!Ss_>Dr9phFFWr^DwFook{T}- zB~{21(7G?xFR6+A^mKLxCNp_2n>zl?>E5E3p7@ERFls98d4;L*IWJq}o;}#}RhaSH zWIjnE{3b28)O?*l#G%1gs`d|EH; z=KvZX#%ndA|I2a7KNa-85X*cI=}{pTXoySiH|cH-*M|B+$6VI-c`+k*8ITHXh9C9<6ueUwD6OPb^$@ zql?vz!10{Az2%B>jce;1@paH92z%z8RG7X!3X|tvn#cGbu`uu-P?-Kh3e$gB zVe)4bCO@Vy`JBS!XB8&@qQc}C6eho@F!^PL$zN8Od`V&QD+-feRhaxug~`9GF!@b| z$$zLY`MU~}|3qQ(Sk~Y%`{O7~KB+MMyA&orpfLGCg~^{%nEZ&s zRG7S{F!_0f$(Ix+|AxZkHxwqnsWAE4Yi{Nj4-1QV|ArK%|A@l$&nQfOQepCo3X{L6 zF!^^BCcmaI`M)bn{;tC0T^2?EG5H@+nEa5!^v55a;4$+XQJDN0h3P-3F!`LqFI$-Ciq#H?q( z!sK687%+Td@|jSk5DWh;7Zfp<9zwbYeo}A?mL*{X1BYzxy z63y~Igv|8W$Y;>IXqM++9PNJ|ctG*XkhTABfrl0UN67dD`;GDc40#OA#{XNu(S|&0 z@vP!MhOFcN2Y5m8aZFst{~|DRvhjNw_@{tN;M>u-em?-__rl^yV16Gg{wXlO2NwSd z_!EVH2h4h(gpTp9L1ulo_%>wLbL(G)%=&G4E-ve}#ht*c&paoLmjb>D+!^3wz-tPR z0J9!j|7l>>U;J(K{eKS3dTaeJLuP%ocoj11sl~S;vwqt3t3qbIbc1-Tb*zsTKLX5p zXz@W{*1zGv{(F#F?-BuKZDZ>R@GFp6&n$i&GV7Pce}&9?W#er_K7s?mJ?Hw|10Dpn z>$MLu>yyPDkk6pm@gIlG`eS*FLqAC*^D|Kc3D(8lUp&sJ=rX*LSFqJa`}^4<2YBi#1P(jbzQU*z9?z--az7 z>TmFztC0{J$Y*o;v}b({P}9uh=f-ncO9x2tx%|x8dK+p+wPCtYNS~{%n(thv!=#&) zm~4}h%hRmf(GoLmvg9%}Db1`FEv(8}$Iv-zebbH@5|{D032)S!nmMP34%EfzbS}4>ezdp)Go8&$%}wt>*$WK$N+Y<(_ud~-&1w94z*xtR%XDnAqMVohPUu%@y5SJT+d3pL?Mt!bLP z!YvPNW+x`o1+!40PVIH5(;FQs8&76PaDzw9VmHM0S9fp9u5cL9tm`h0{;4tp1%slN zvc5-uY`%lhocaDlXYj3|e%9QPqXkokqn^3*MxQfx+vvQx!$w~)ch%^N=1$6ZH|dXf zo9q$qZV(TjE@8YRd&C=Hk9eopBc8_|@h-AQJl@e5hyO1a_kH$=w;AAj>=EbF0Q1g8 zyKeS~*Armgr5N`_fXCP)ekQ=YE77kM^jFzqT;75FaRbc%0mKe_n+a literal 0 HcmV?d00001 diff --git a/tests/test/cg/obj/linux/arm-eabi/tcext3.o b/tests/test/cg/obj/linux/arm-eabi/tcext3.o new file mode 100644 index 0000000000000000000000000000000000000000..0bbfc6ea4d24fa92a4694ee9e40425daf7960725 GIT binary patch literal 3712 zcmb_fZ)jUp6hAL7P2*_YbL&_)>lR&y6`Qx0rgNPrWVCZttj4iHKL~AFBNpi&nm14s zL|0)S8itI4f`hxc8jj zJ?H$+dFQ@+n|^TeVX~OL3Unmnja{IDZjex6#eyB(GNN2J)Ns*K3`IN>`zX?*X_#YQ2fs* zxJ=5I7gI%_QZwFnLj}J9HHA@A6g-ZsOZQ!`;j3z7-gVTtENi4q>g0FlxE9p26LBku zi_n!a*KIhLyin>3PxY#$>ityA-8y5Y@ZNgNZ&oqr&y6FMT*JuSfV`2ayi>9tdaWVZ zU#@qvTJ^lQkyFKOC9lqLZ<{%OPZxc?mhUGE!5*l0s<$89hp3Y;wbG?c`(a_P*9`2% zTpoKqTW+`Vr3igeZjrHV>3nIJE|<;pWv|n@vbvTl`r+X(Jp-7(i-q0jA@C0uafYzQ zwX?kudQ|$cJ%aDK0pIhQalLHK=S#skt8ot1H~bC#>@PV*f3e0nQ|E)v z!e`UmG(S{WuP81IM9l;NUx{R!?ia%i%3@ z(5c?uXJZ|G*^#l#M6BCR+FkL)Q$nE=ar~OdWHTdUWE_IpaN_j9@iTn`FH$5FHFkwt zj6KF)v(?yV><=9Xk)3;Y+|7(Yy3<0wr8GDDj!X6%88<`rNG?bA=;Zi#b^>b?lWx{N z^~%|J&drRzO*T^48P}a28#(7@b4Xg>^C;Z-_fSN-^Y5T`@tY`E3Cs1zA=%HAcu@1< zCARVNBnF#m`E|la#Xu$IdyEzNDBDqBrL*bW1M;4P4LPUShadK{g&NF?;}IZL8yl{| z?`+^9CgsO6q^)1rK{SVjhp@(j`(jC5=j(4K>QN-HYbsFX(bvQD_eRCS_32i|dL@ia zLOI$~?cbo;*kA3UST?cSC^L9sn0F!HZb;U7Fy055!f+%$2+7TDllU;?EC%l*`#%kN zO~VQ3e_-(U#P(y5ttgW#Vf;K~8?dtX0;e_n67URgpY(qX@<+`+2z*bo4*{ppCguMo z@C@)7NX|D7xdN>6xxh`>xc8;~J;)2dF^NBh{0dmT|3%;x;2vrJ4AR2Oq$IuynFj8c z_-n{dfzuLy3t0y4llTT?C$>r9pMa-;Rs0h0H4S^fd`Ol3FTj3a75@+LtcDHrW?sWh zz%BUKM)~gr9@Ov?z@KY44(w@|+)-RbNqdyqGc=XSm^Bg4nxJ4!RKl95hBZ+U cYqF|9tz?mf1gjOMM1`uWqH1L(wd#`eKg1)i$p8QV literal 0 HcmV?d00001 diff --git a/tests/test/cg/obj/linux/arm-eabi/tcext4.o b/tests/test/cg/obj/linux/arm-eabi/tcext4.o new file mode 100644 index 0000000000000000000000000000000000000000..331bc800e56503a61e87d6c3fa494b0a69d52ec6 GIT binary patch literal 1958 zcmbtUO=uHA82x5<(;q?HR>ihzyG6x_W}7srZAGD_sa3REN_+6uO&T;ve(0{CCq+DX zRK)ut>e-_gK@snTFnn0}y>ADHy!+i-g<5S-ZvK7xNY<_ir=KWS<+ z&zsw|bxM72MB2@za6RtP&Bx6THLPttYqF)MO>OOEvkUtquunbOhkMELTeO6^=C?M} zj{;`h|H99t!(+f>&~ocnyFK(j-b4&hIb%_cO-__is2pI z!AlEsb7!n%zEmhXRV!y_?eSFRL|D*l3V)wdatdW)M^Gkamlvm3@{1R#OY33%#y+;6 z9nc5ZARE$#HL~4170)RkdmCZCAuF$R+ar73@f@-Xu1j{YR;iS#=v8Z8$zHg!nsPm- zc#~{wVLP6;Q7+u_O0M|(|0NuRh`%3Qk(j?5D|!Tw!smo&6gAgL>Y*$mDd+e&j@g4L z>78_^pphPw#C3;x5e>;r0Lz+FFXY18bo0QV>QP(hYzdI%8hxRz!+e5iwS%^FT(2qp z*9oF~X!fGVC;u*HRI5jt>L#k9FNfS$Vwu&xK|kBF&$He+ZP?ZSItk}>yzA;vSK~Ym zs|>w!i(ym8ZSRiwL&*KuZ!a>h`Mq#FhbD9$iTbyKGpMI$_?3e5z&{jx2{?%hkp5-hbp>Ao_7%Ja{8_=*fd_Cg(obFyzf#UF(ou)%j_YPb m92YSwVot;f5hq2Q5^-9@Oh{x-hbR<`hn{S>STKVM5}=4D0?N6Sg&LNidkO zY?zp66XKtk7?+f2jPc2bKI{R^)R^#MG7$8ICbwH^icjMeN#^gn_nh_6ly&tc_k8Df z&-s4ezjMFaUOs&6RZY`KUK%w~9uX~6IV(oHBbum^DzJWHX@zK!I+I#AZrx03zr2#v z$h2$8vTOBVGUK6S=Gm1!8S?Y|#F7a~9oUb1t^NLm-bI5F*_4&e=+N_->8uVNPqV9g zsB?y%r0-uyEV4}ldbEa5Y(u9+&al#1FZC_yhynXE-JR1Vxuq`q=VM*?=IC~;U)Kk_ z70^wYh*9Lw)0ET>b<7Z1rQ`EMm#ieJ=GfMdZzuO2JmdUph@JD#b>Msi5pNCR4Z^NY zv$+lQ7V=})`hj`Bm#7|oAb#i|52$5^%uj92`o@;E42s+qa#aehIpkxNs{>rPOL0Z1 z<^E>jn<;$T2);SwrILL+j`K8N*H*$mv`LQ$Np zDZBP5wh_H*b9~;ZYc`+T%IKGNm8h2ov2C3C-sW@W#dD6;2h6eRzy{_TqzBTEb60_L zwH&ySQ{NY(t0mjimChQ%zef0H(n+W9;4Ew4cHUd+vTF@+=->$AtgXe7YE5T$Fo)== z|Ci%AaO^Il#}@jBI106umfLam|ni z^i=MF8*rv>p@%KtJ-r=FXTW9uLFo*9vk@QqC{+VsX7!gmdFsobxW{U2s>G z;67J`TPLb4^do>i$aSpepG%_@Lw*IfBQQ58wLMNnfyD;mk=3=433hv6I1WOzTW*OdwO3ZpU1ClGB#^l zw5RntZL3!AdDcUr*!yGg$RK2V(v@fBEIx8EPNCsQJVK$tSd2nL6Jui|<9Iec5g!R1 zdE-<|EFKv;M=Id!JzUFxKE(l=tw(`$F#286_Wn z=dAk13zx9(l(WMff@pqR^?0MY;qydz0~l_@W;Ug~p$9^h|e z{?ZGy^v675H+1~}R4t$ao~@DzZL73Ae)i49)V{dqYC~QI0bxC ztbYdS$4gTua1zo4<{WZ}bH#9_z5sF4)v9L3?I%AtNwmaiqXMD*S_c>#SGwyfBu;mI@ zJM5~5UH!025Ox{DE=8NWvn?#8uqbuH!-HXKc+g=z9hsbTxADx~$TOFoXRZaFxkh;A q+Toe&F3((-dFHy!GvT^3&07)PI#2UV;XGAqekx+&y={tjZS)`IX!cV8 literal 0 HcmV?d00001