summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2>2007-07-14 09:02:04 +0000
committeryury <yury@3ad0048d-3df7-0310-abae-a5850022a9f2>2007-07-14 09:02:04 +0000
commitffd3d71710dbe472c4522b80396f74c99f0c20c1 (patch)
tree4ea3e7cb59a658c444b89e3b51701f1391d9ceff
parent0baf40b9ea3b0327dc30aa13e75d2fbf74ac0572 (diff)
downloadfpc-ffd3d71710dbe472c4522b80396f74c99f0c20c1.tar.gz
Merged revisions 8045 via svnmerge from
http://svn.freepascal.org/svn/fpc/trunk ........ r8045 | yury | 2007-07-14 11:55:54 +0300 (Сб, 14 июл 2007) | 1 line * Made NaN = 0.0/0.0 for arm-linux. It is calculated as Nan on Florian's arm-linux box. ln(-1.0) is calculated as -Inf on arm-linux and x86. It fixes bug #9132. ........ git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@8046 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--rtl/objpas/math.pp5
1 files changed, 0 insertions, 5 deletions
diff --git a/rtl/objpas/math.pp b/rtl/objpas/math.pp
index 53639cc01a..729c7e4c71 100644
--- a/rtl/objpas/math.pp
+++ b/rtl/objpas/math.pp
@@ -116,12 +116,7 @@ interface
{$define OverflowCheckWasOn}
{$Q-}
{$endif opt Q+}
-{$if defined(CPUARM) and defined(unix)}
- { the ARM linux emulator doesn't like 0.0/0.0 }
- NaN = ln(-1.0);
-{$else CPUARM}
NaN = 0.0/0.0;
-{$endif CPUARM}
Infinity = 1.0/0.0;
{$ifdef RangeCheckWasOn}
{$R+}