Back out the two last changes to the floating point code, since it

broke the package for NetBSD 1.6.

8 files changed, 1 insertions, 277 deletions

diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 242f6c90151..527a43d0af2 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.78 2005/06/16 21:38:09 martin Exp $
+$NetBSD: distinfo,v 1.79 2005/06/20 06:56:14 kristerw Exp $
 
 SHA1 (mozilla-1.7.8-source.tar.bz2) = ca682415a9ba99a3c4bd55636e1f9fda53a2545f
 RMD160 (mozilla-1.7.8-source.tar.bz2) = 3e91b559c2ab76ba6dc1f99fca57b921660ab673
@@ -36,10 +36,3 @@ SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711
 SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b
 SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908
 SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76
-SHA1 (patch-cg) = 5991f102f19ef73ae771f9fc352ece5ce89eb928
-SHA1 (patch-ch) = 281dc9957784b4f75170377d09c22735ce7f8500
-SHA1 (patch-ci) = b9868757c31ea577c2df99eb7f41503d55d904f0
-SHA1 (patch-cj) = a17331d248dd0d3ed85c81f6c1095f384d810b0d
-SHA1 (patch-ck) = 5db42f8047046e10f388bdaf299c35c415a50f8d
-SHA1 (patch-cl) = 1450e99f5e5f31f0e8d01b68bb50494f84eed068
-SHA1 (patch-cm) = 2a347bcf5814816539835caf65dd888f71ceea20
diff --git a/www/mozilla/patches/patch-cg b/www/mozilla/patches/patch-cg
deleted file mode 100644
index c98ff3b15f3..00000000000
--- a/www/mozilla/patches/patch-cg
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/base/Double.cpp.orig	2004-01-15 22:23:18.000000000 +0100
-+++ extensions/transformiix/source/base/Double.cpp	2005-06-16 09:47:09.000000000 +0200
-@@ -48,114 +48,34 @@
-  * Utility class for doubles
-  */
- 
--//A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
--#ifdef __FreeBSD__
--#include <ieeefp.h>
--#ifdef __alpha__
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
--#else
--fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
--#endif
--fp_except_t oldmask = fpsetmask(~allmask);
--#endif
--
--/**
-- * Macros to workaround math-bugs bugs in various platforms
-- */
--
--/**
-- * Stefan Hanske <sh990154@mail.uni-greifswald.de> reports:
-- *  ARM is a little endian architecture but 64 bit double words are stored
-- * differently: the 32 bit words are in little endian byte order, the two words
-- * are stored in big endian`s way.
-- */
--
--#if defined(__arm) || defined(__arm32__) || defined(_arm26__) || defined(__arm__)
--#define CPU_IS_ARM
--#endif
--
--#if (__GNUC__ == 2 && __GNUC_MINOR__ > 95) || __GNUC__ > 2
--/**
-- * This version of the macros is safe for the alias optimizations
-- * that gcc does, but uses gcc-specific extensions.
-- */
--
--typedef union txdpun {
--    PRFloat64 d;
--    struct {
--#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
--        PRUint32 lo, hi;
--#else
--        PRUint32 hi, lo;
--#endif
--    } s;
--} txdpun;
--
--#define TX_DOUBLE_HI32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.hi; }))
--#define TX_DOUBLE_LO32(x) (__extension__ ({ txdpun u; u.d = (x); u.s.lo; }))
--
--#else // __GNUC__
-+double Double::NaN()
-+{
-+	return NAN;
-+}
- 
--/* We don't know of any non-gcc compilers that perform alias optimization,
-- * so this code should work.
-- */
-+double Double::PositiveInfinity()
-+{
-+	return INFINITY;
-+}
- 
--#if defined(IS_LITTLE_ENDIAN) && !defined(CPU_IS_ARM)
--#define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[1])
--#define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[0])
--#else
--#define TX_DOUBLE_HI32(x)        (((PRUint32 *)&(x))[0])
--#define TX_DOUBLE_LO32(x)        (((PRUint32 *)&(x))[1])
--#endif
--
--#endif // __GNUC__
--
--#define TX_DOUBLE_HI32_SIGNBIT   0x80000000
--#define TX_DOUBLE_HI32_EXPMASK   0x7ff00000
--#define TX_DOUBLE_HI32_MANTMASK  0x000fffff
--
--//-- Initialize Double related constants
--#ifdef IS_BIG_ENDIAN
--const PRUint32 nanMask[2] =    {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK,
--                                0xffffffff};
--const PRUint32 infMask[2] =    {TX_DOUBLE_HI32_EXPMASK, 0};
--const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0};
--#else
--const PRUint32 nanMask[2] =    {0xffffffff,
--                                TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK};
--const PRUint32 infMask[2] =    {0, TX_DOUBLE_HI32_EXPMASK};
--const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT};
--#endif
--
--const double Double::NaN = *((double*)nanMask);
--const double Double::POSITIVE_INFINITY = *((double*)infMask);
--const double Double::NEGATIVE_INFINITY = *((double*)negInfMask);
-+double Double::NegativeInfinity()
-+{
-+	return -INFINITY;
-+}
- 
--/*
-- * Determines whether the given double represents positive or negative
-- * inifinity
-- */
- MBool Double::isInfinite(double aDbl)
- {
--    return ((TX_DOUBLE_HI32(aDbl) & ~TX_DOUBLE_HI32_SIGNBIT) == TX_DOUBLE_HI32_EXPMASK &&
--            !TX_DOUBLE_LO32(aDbl));
-+	return isinf(aDbl);
- }
- 
--/*
-- * Determines whether the given double is NaN
-- */
- MBool Double::isNaN(double aDbl)
- {
--    return ((TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_EXPMASK) == TX_DOUBLE_HI32_EXPMASK &&
--            (TX_DOUBLE_LO32(aDbl) || (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_MANTMASK)));
-+	return isnan(aDbl);
- }
- 
--/*
-- * Determines whether the given double is negative
-- */
- MBool Double::isNeg(double aDbl)
- {
--    return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0;
-+	return aDbl<0.0;
- }
- 
- /*
-@@ -244,7 +164,7 @@
-     {
-         if (mState == eIllegal || mBuffer.IsEmpty() ||
-             (mBuffer.Length() == 1 && mBuffer[0] == '.')) {
--            return Double::NaN;
-+            return Double::NaN();
-         }
-         return mSign*PR_strtod(mBuffer.get(), 0);
-     }
diff --git a/www/mozilla/patches/patch-ch b/www/mozilla/patches/patch-ch
deleted file mode 100644
index 528089d3107..00000000000
--- a/www/mozilla/patches/patch-ch
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ch,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/base/primitives.h.orig	2003-01-17 13:43:05.000000000 +0100
-+++ extensions/transformiix/source/base/primitives.h	2005-06-16 09:46:56.000000000 +0200
-@@ -51,10 +51,9 @@
-     /*
-      * Usefull constants
-      */
--
--    static const double NaN;
--    static const double POSITIVE_INFINITY;
--    static const double NEGATIVE_INFINITY;
-+    static double NaN();
-+    static double PositiveInfinity();
-+    static double NegativeInfinity();
- 
-     /*
-      * Determines whether the given double represents positive or negative
diff --git a/www/mozilla/patches/patch-ci b/www/mozilla/patches/patch-ci
deleted file mode 100644
index 004347983db..00000000000
--- a/www/mozilla/patches/patch-ci
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ci,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/xpath/FunctionCall.cpp.orig	2003-11-04 16:13:03.000000000 +0100
-+++ extensions/transformiix/source/xpath/FunctionCall.cpp	2005-06-16 09:14:19.000000000 +0200
-@@ -92,7 +92,7 @@
-     nsRefPtr<txAExprResult> exprResult;
-     nsresult rv = aExpr->evaluate(aContext, getter_AddRefs(exprResult));
-     if (NS_FAILED(rv))
--        return Double::NaN;
-+        return Double::NaN();
- 
-     return exprResult->numberValue();
- }
diff --git a/www/mozilla/patches/patch-cj b/www/mozilla/patches/patch-cj
deleted file mode 100644
index 611b5745d25..00000000000
--- a/www/mozilla/patches/patch-cj
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-cj,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/xpath/MultiplicativeExpr.cpp.orig	2003-11-20 00:06:14.000000000 +0100
-+++ extensions/transformiix/source/xpath/MultiplicativeExpr.cpp	2005-06-16 09:29:24.000000000 +0200
-@@ -71,22 +71,22 @@
- #if defined(XP_WIN)
-                 /* XXX MSVC miscompiles such that (NaN == 0) */
-                 if (Double::isNaN(rightDbl))
--                    result = Double::NaN;
-+                    result = Double::NaN();
-                 else
- #endif
-                 if (leftDbl == 0 || Double::isNaN(leftDbl))
--                    result = Double::NaN;
-+                    result = Double::NaN();
-                 else if (Double::isNeg(leftDbl) ^ Double::isNeg(rightDbl))
--                    result = Double::NEGATIVE_INFINITY;
-+                    result = Double::NegativeInfinity();
-                 else
--                    result = Double::POSITIVE_INFINITY;
-+                    result = Double::PositiveInfinity();
-             }
-             else
-                 result = leftDbl / rightDbl;
-             break;
-         case MODULUS:
-             if (rightDbl == 0) {
--                result = Double::NaN;
-+                result = Double::NaN();
-             }
-             else {
- #if defined(XP_WIN)
diff --git a/www/mozilla/patches/patch-ck b/www/mozilla/patches/patch-ck
deleted file mode 100644
index 350ec0e1583..00000000000
--- a/www/mozilla/patches/patch-ck
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ck,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp.orig	2003-06-17 00:31:17.000000000 +0200
-+++ extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp	2005-06-16 10:06:22.000000000 +0200
-@@ -112,12 +112,12 @@
-         return aContext->recycler()->getStringResult(format->mNaN, aResult);
-     }
- 
--    if (value == Double::POSITIVE_INFINITY) {
-+    if (value == Double::PositiveInfinity()) {
-         return aContext->recycler()->getStringResult(format->mInfinity,
-                                                      aResult);
-     }
- 
--    if (value == Double::NEGATIVE_INFINITY) {
-+    if (value == Double::NegativeInfinity()) {
-         nsAutoString res;
-         res.Append(format->mMinusSign);
-         res.Append(format->mInfinity);
diff --git a/www/mozilla/patches/patch-cl b/www/mozilla/patches/patch-cl
deleted file mode 100644
index c84355bbf36..00000000000
--- a/www/mozilla/patches/patch-cl
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp.orig	2004-01-29 23:04:29.000000000 +0100
-+++ extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp	2005-06-16 09:18:13.000000000 +0200
-@@ -258,7 +258,7 @@
-               txStylesheetCompilerState& aState,
-               double& aNumber)
- {
--    aNumber = Double::NaN;
-+    aNumber = Double::NaN();
-     txStylesheetAttr* attr = nsnull;
-     nsresult rv = getStyleAttr(aAttributes, aAttrCount, kNameSpaceID_None,
-                                aName, aRequired, &attr);
-@@ -479,7 +479,7 @@
-     NS_ENSURE_SUCCESS(rv, rv);
- 
-     txExpandedName nullExpr;
--    double prio = Double::NaN;
-+    double prio = Double::NaN();
-     nsAutoPtr<txPattern> match(new txRootPattern(MB_TRUE));
-     NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY);
- 
-@@ -1038,7 +1038,7 @@
-                       aState, mode);
-     NS_ENSURE_SUCCESS(rv, rv);
- 
--    double prio = Double::NaN;
-+    double prio = Double::NaN();
-     rv = getNumberAttr(aAttributes, aAttrCount, txXSLTAtoms::priority,
-                        PR_FALSE, aState, prio);
-     NS_ENSURE_SUCCESS(rv, rv);
diff --git a/www/mozilla/patches/patch-cm b/www/mozilla/patches/patch-cm
deleted file mode 100644
index 336b931f716..00000000000
--- a/www/mozilla/patches/patch-cm
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cm,v 1.1 2005/06/16 21:38:09 martin Exp $
-
---- extensions/transformiix/source/xslt/txXSLTPatterns.cpp.orig	2003-11-18 23:56:46.000000000 +0100
-+++ extensions/transformiix/source/xslt/txXSLTPatterns.cpp	2005-06-16 09:17:00.000000000 +0200
-@@ -99,7 +99,7 @@
- double txUnionPattern::getDefaultPriority()
- {
-     NS_ASSERTION(0, "Don't call getDefaultPriority on txUnionPattern");
--    return Double::NaN;
-+    return Double::NaN();
- }
- 
- /*