diff --git a/.gitattributes b/.gitattributes index 3b38d3769a..ace69d3bd4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5830,6 +5830,7 @@ tests/test/cg/obj/win64/x86_64/tcext5.o -text tests/test/cg/obj/wince/arm/ctest.o -text tests/test/cg/obj/wince/arm/tcext3.o -text tests/test/cg/obj/wince/arm/tcext4.o -text +tests/test/cg/obj/wince/arm/tcext5.o -text tests/test/cg/ptest.pp svneol=native#text/plain tests/test/cg/taddbool.pp svneol=native#text/plain tests/test/cg/taddcard.pp svneol=native#text/plain diff --git a/tests/test/cg/obj/readme.txt b/tests/test/cg/obj/readme.txt index 7ef7c30fd6..eb5a55b630 100644 --- a/tests/test/cg/obj/readme.txt +++ b/tests/test/cg/obj/readme.txt @@ -19,4 +19,4 @@ NetBSD-m68k : GCC 2.95.3 on NetBSD elf 1.6 Macos-powerpc : MrC C Compiler 4.1.0f1c1 for MPW (dont know yet if it can be used with FPC, but at least ctest.c compiles) -wince 4.21 : GCC 3.3.1 (can't use eVC, LONG LONG not supported) \ No newline at end of file +wince 4.21 : GCC 3.3.3 diff --git a/tests/test/cg/obj/tcext5.c b/tests/test/cg/obj/tcext5.c index 35dcb37304..ae16468c77 100644 --- a/tests/test/cg/obj/tcext5.c +++ b/tests/test/cg/obj/tcext5.c @@ -1,5 +1,9 @@ #include +#ifdef __SOFTFP__ + #define NO_FLOAT +#endif + struct struct_arr1 { int8_t v[1]; }; @@ -287,12 +291,16 @@ int64_t pass313(struct struct31 s, struct struct3 s3, char c) { } int64_t pass11db10db(struct struct11 s11, double d1, uint8_t b1, struct struct10 s10, double d2, uint8_t b2) { +#ifdef NO_FLOAT + return 0; +#else if ((b1 != 35) || (b2 != 36) || ((d1 - 12345.678) > 0.001) || ((d2 - 98765.453) > 0.001)) return -1; return s10.v1 + s10.v2; +#endif } diff --git a/tests/test/cg/obj/wince/arm/ctest.o b/tests/test/cg/obj/wince/arm/ctest.o index 42b545cffa..7134c91b74 100644 Binary files a/tests/test/cg/obj/wince/arm/ctest.o and b/tests/test/cg/obj/wince/arm/ctest.o differ diff --git a/tests/test/cg/obj/wince/arm/tcext3.o b/tests/test/cg/obj/wince/arm/tcext3.o index 42b545cffa..30c8a3b5c1 100644 Binary files a/tests/test/cg/obj/wince/arm/tcext3.o and b/tests/test/cg/obj/wince/arm/tcext3.o differ diff --git a/tests/test/cg/obj/wince/arm/tcext4.o b/tests/test/cg/obj/wince/arm/tcext4.o index 42b545cffa..bf0c7ac2e0 100644 Binary files a/tests/test/cg/obj/wince/arm/tcext4.o and b/tests/test/cg/obj/wince/arm/tcext4.o differ diff --git a/tests/test/cg/obj/wince/arm/tcext5.o b/tests/test/cg/obj/wince/arm/tcext5.o new file mode 100644 index 0000000000..b7d770a6dc Binary files /dev/null and b/tests/test/cg/obj/wince/arm/tcext5.o differ diff --git a/tests/test/cg/tcalext5.pp b/tests/test/cg/tcalext5.pp index edaf8a3626..c395ee972b 100644 --- a/tests/test/cg/tcalext5.pp +++ b/tests/test/cg/tcalext5.pp @@ -9,6 +9,10 @@ program calext3; {$MODE DELPHI} +{$ifdef UNDER_CE} + {$define NO_FLOAT} +{$endif} + type int8_t = shortint; pint8_t = ^int8_t; @@ -599,7 +603,9 @@ begin verify(pass311(s31,s1,32), check1(s1), 32); verify(pass312(s31,s2,33), check2(s2), 33); verify(pass313(s31,s3,34), check3(s3), 34); +{$ifndef NO_FLOAT} verify(pass11db10db(s11,12345.678,35,s10,98745.453,36), check10(s10), 35); +{$endif} verify(pass_arr1(sa1,101), check_arr1(sa1), 101); verify(pass_arr2(sa2,102), check_arr2(sa2), 102);