Index: configure
===================================================================
--- configure	(revision 64576)
+++ configure	(working copy)
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 64002 .
+# From configure.in Revision: 64567 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 2.6.
 #
@@ -4684,6 +4684,19 @@
     ;;
 esac
 
+# when using Sun's compiler on Solaris, we need the -xlibmieee option
+# to ensure that libm functions use IEEE 754 style return values
+
+if test "$CC" = cc
+then
+  case $ac_sys_system/$ac_sys_release in
+    SunOS/5*)
+      BASECFLAGS="$BASECFLAGS -xlibmieee"
+      LDFLAGS="$LDFLAGS -xlibmieee"
+    ;;
+  esac
+fi
+
 if test "$Py_DEBUG" = 'true'; then
   :
 else
@@ -12996,7 +13009,7 @@
 	SunOS/5*)
 		if test "$GCC" = "yes"
 		then LDSHARED='$(CC) -shared'
-		else LDSHARED='$(CC) -G';
+		else LDSHARED='$(CC) $(LDFLAGS) -G';
 		fi ;;
 	hp*|HP*)
 		if test "$GCC" = "yes"
Index: configure.in
===================================================================
--- configure.in	(revision 64576)
+++ configure.in	(working copy)
@@ -943,6 +943,19 @@
     ;;
 esac
 
+# when using Sun's compiler on Solaris, we need the -xlibmieee option
+# to ensure that libm functions use IEEE 754 style return values
+
+if test "$CC" = cc
+then
+  case $ac_sys_system/$ac_sys_release in
+    SunOS/5*)
+      BASECFLAGS="$BASECFLAGS -xlibmieee"
+      LDFLAGS="$LDFLAGS -xlibmieee"
+    ;;
+  esac
+fi
+
 if test "$Py_DEBUG" = 'true'; then
   :
 else
@@ -1587,7 +1600,7 @@
 	SunOS/5*) 
 		if test "$GCC" = "yes"
 		then LDSHARED='$(CC) -shared'
-		else LDSHARED='$(CC) -G';
+		else LDSHARED='$(CC) $(LDFLAGS) -G';
 		fi ;;
 	hp*|HP*)
 		if test "$GCC" = "yes"