[MLton-commit] r7363

[Wesley Terpstra]

Disable fpclassify on mips


----------------------------------------------------------------------

U   mlton/trunk/package/debian/changelog
U   mlton/trunk/package/debian/control
D   mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch
A   mlton/trunk/package/debian/patches/00-gcc-4.4-mips.patch
U   mlton/trunk/package/debian/rules
U   mlton/trunk/runtime/platform/linux.h

----------------------------------------------------------------------

Modified: mlton/trunk/package/debian/changelog
===================================================================
--- mlton/trunk/package/debian/changelog	2009-11-04 11:04:01 UTC (rev 7362)
+++ mlton/trunk/package/debian/changelog	2009-11-04 15:27:22 UTC (rev 7363)
@@ -1,3 +1,12 @@
+mlton (20091104) unstable; urgency=low
+
+  * Two more regressions disabled on hurd (thread2 and world5)
+  * Switch mips back to gcc-4.4
+   * Found the cause of the segfault: fpclassify is broken on mips
+   * Disable its on linux/mips and use the MLton IEEE work-around code
+
+ -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Wed, 04 Nov 2009 12:04:36 +0100
+
 mlton (20091101) unstable; urgency=low
 
   * The mips saga continues

Modified: mlton/trunk/package/debian/control
===================================================================
--- mlton/trunk/package/debian/control	2009-11-04 11:04:01 UTC (rev 7362)
+++ mlton/trunk/package/debian/control	2009-11-04 15:27:22 UTC (rev 7363)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
-Build-Depends: mlton (>= 20070826), gcc-4.1 [mips mipsel], htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52)
+Build-Depends: mlton (>= 20070826), gcc-4.4 [mips mipsel], htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52)
 Standards-Version: 3.8.3.0
 
 Package: mlton
 Architecture: alpha amd64 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc
-Depends: ${shlibs:Depends}, ${misc:Depends}, gcc, gcc-4.1 [mips mipsel], libc6-dev, libgmp3-dev (>= 4.0.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, gcc, gcc-4.4 [mips mipsel], libc6-dev, libgmp3-dev (>= 4.0.1)
 Homepage: http://mlton.org/
 Description: Optimizing compiler for Standard ML
  MLton is a whole-program optimizing compiler

Deleted: mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch
===================================================================
--- mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch	2009-11-04 11:04:01 UTC (rev 7362)
+++ mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch	2009-11-04 15:27:22 UTC (rev 7363)
@@ -1,19 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' mlton/bin/mlton-script mlton.new/bin/mlton-script
---- mlton/bin/mlton-script	2009-11-01 18:37:00.000000000 +0100
-+++ mlton.new/bin/mlton-script	2009-11-01 18:45:26.000000000 +0100
-@@ -7,7 +7,14 @@
- dir=`dirname "$0"`
- lib=`cd "$dir/../lib" && pwd`
- eval `"$lib/platform"`
--gcc='gcc'
-+case "$HOST_ARCH" in
-+mips*)
-+        gcc='gcc-4.1'
-+;;
-+*)
-+        gcc='gcc'
-+;;
-+esac
- case "$HOST_OS" in
- mingw)
- 	exe='.exe'

Added: mlton/trunk/package/debian/patches/00-gcc-4.4-mips.patch
===================================================================
--- mlton/trunk/package/debian/patches/00-gcc-4.4-mips.patch	2009-11-04 11:04:01 UTC (rev 7362)
+++ mlton/trunk/package/debian/patches/00-gcc-4.4-mips.patch	2009-11-04 15:27:22 UTC (rev 7363)
@@ -0,0 +1,19 @@
+diff -Nur -x '*.orig' -x '*~' mlton/bin/mlton-script mlton.new/bin/mlton-script
+--- mlton/bin/mlton-script	2009-11-01 18:37:00.000000000 +0100
++++ mlton.new/bin/mlton-script	2009-11-01 18:45:26.000000000 +0100
+@@ -7,7 +7,14 @@
+ dir=`dirname "$0"`
+ lib=`cd "$dir/../lib" && pwd`
+ eval `"$lib/platform"`
+-gcc='gcc'
++case "$HOST_ARCH" in
++mips*)
++        gcc='gcc-4.4'
++;;
++*)
++        gcc='gcc'
++;;
++esac
+ case "$HOST_OS" in
+ mingw)
+ 	exe='.exe'

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2009-11-04 11:04:01 UTC (rev 7362)
+++ mlton/trunk/package/debian/rules	2009-11-04 15:27:22 UTC (rev 7363)
@@ -9,7 +9,7 @@
 ifeq (,$(findstring mips, $(DEB_HOST_ARCH_CPU)))
 CC := gcc
 else
-CC := gcc-4.1
+CC := gcc-4.4
 endif
 
 # MLton compiles optimized, debug, and pic versions on its own.

Modified: mlton/trunk/runtime/platform/linux.h
===================================================================
--- mlton/trunk/runtime/platform/linux.h	2009-11-04 11:04:01 UTC (rev 7362)
+++ mlton/trunk/runtime/platform/linux.h	2009-11-04 15:27:22 UTC (rev 7363)
@@ -36,7 +36,11 @@
 #else
 #define HAS_FEROUND TRUE
 #endif
+#if defined(__mips__)
+#define HAS_FPCLASSIFY FALSE
+#else
 #define HAS_FPCLASSIFY TRUE
+#endif
 #define HAS_MSG_DONTWAIT TRUE
 #define HAS_REMAP TRUE
 #define HAS_SIGALTSTACK TRUE