* generic/tclStrToD.c: Correct conditional compile directives to

        better detect the toolchain that needs extra work for proper underflow
        treatment instead of merely detecting the mips platform. [Bug 2902010].

2 files changed, 13 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 527f74d..f5c3080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,13 @@
+2009-12-07  Don Porter  <dgp@users.sourceforge.net>
+
+	* generic/tclStrToD.c:	Correct conditional compile directives to
+	better detect the toolchain that needs extra work for proper underflow
+	treatment instead of merely detecting the mips platform. [Bug 2902010].
+
 2009-12-02  Jan Nijtmans  <nijtmans@users.sf.net>
 
-    * tools/genStubs.tcl    Add support for win32 CALLBACK functions
-                            (needed for Tk bugfix)
+	* tools/genStubs.tcl:	Add support for win32 CALLBACK functions
+	(needed for Tk bugfix).
 
 2009-11-30  Donal K. Fellows  <dkf@users.sf.net>
 
diff --git a/generic/tclStrToD.c b/generic/tclStrToD.c
index 453a34c..eda53ac 100755
--- a/generic/tclStrToD.c
+++ b/generic/tclStrToD.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclStrToD.c,v 1.33.2.2 2009/07/16 20:50:54 dgp Exp $
+ * RCS: @(#) $Id: tclStrToD.c,v 1.33.2.3 2009/12/07 17:14:28 dgp Exp $
  *
  *----------------------------------------------------------------------
  */
@@ -71,9 +71,10 @@ typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__)));
 
 /*
  * MIPS floating-point units need special settings in control registers
- * to use gradual underflow as we expect.
+ * to use gradual underflow as we expect.  This fix is for the MIPSpro
+ * compiler.  
  */
-#if defined(__mips)
+#if defined(__sgi) && defined(_COMPILER_VERSION)
 #include <sys/fpu.h>
 #endif
 /*
@@ -2166,7 +2167,7 @@ TclInitDoubleConversion(void)
     } bitwhack;
 #endif
 
-#if defined(__mips)
+#if defined(__sgi) && defined(_COMPILER_VERSION)
     union fpc_csr mipsCR;
 
     mipsCR.fc_word = get_fpc_csr();