[MLton-commit] r7324

[Wesley Terpstra]

Try gcc-4.1 for mips*


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

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

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

Modified: mlton/trunk/package/debian/changelog
===================================================================
--- mlton/trunk/package/debian/changelog	2009-11-01 06:28:02 UTC (rev 7323)
+++ mlton/trunk/package/debian/changelog	2009-11-01 17:51:42 UTC (rev 7324)
@@ -1,3 +1,14 @@
+mlton (20091101) unstable; urgency=low
+
+  * The mips saga continues
+   * gcc-4.4 miscompiles code
+   * gcc-4.3 outputs bad branch statements
+   * => gcc-4.1 might work!
+  * Don't override gcc version on any architecture but mips[el]
+  * Change dependencies to require gcc-4.1 only on mips[el]
+
+ -- Wesley W. Terpstra (Debian) <terpstra at debian.org>  Sun, 01 Nov 2009 18:38:37 +0100
+
 mlton (20091029) unstable; urgency=low
 
   * Bump the heap-size up a bit to 800m (850m for align8) -> fixes s390.

Modified: mlton/trunk/package/debian/control
===================================================================
--- mlton/trunk/package/debian/control	2009-11-01 06:28:02 UTC (rev 7323)
+++ mlton/trunk/package/debian/control	2009-11-01 17:51:42 UTC (rev 7324)
@@ -2,12 +2,12 @@
 Section: devel
 Priority: optional
 Maintainer: Wesley W. Terpstra (Debian) <terpstra at debian.org>
-Build-Depends: mlton (>= 20070826), gcc-4.4, htmldoc, libgmp3-dev (>= 4.0.1), texlive-latex-base, procps, debhelper (>= 7.0.0), cdbs (>= 0.4.52)
+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)
 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-4.4, libc6-dev, libgmp3-dev (>= 4.0.1)
+Depends: ${shlibs:Depends}, ${misc:Depends}, gcc, gcc-4.1 [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

Copied: mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch (from rev 7323, mlton/trunk/package/debian/patches/00-gcc-4.4.patch)
===================================================================
--- mlton/trunk/package/debian/patches/00-gcc-4.4.patch	2009-11-01 06:28:02 UTC (rev 7323)
+++ mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch	2009-11-01 17:51:42 UTC (rev 7324)
@@ -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.1'
++;;
++*)
++        gcc='gcc'
++;;
++esac
+ case "$HOST_OS" in
+ mingw)
+ 	exe='.exe'


Property changes on: mlton/trunk/package/debian/patches/00-gcc-4.1-mips.patch
___________________________________________________________________
Name: svn:mergeinfo
   + 

Deleted: mlton/trunk/package/debian/patches/00-gcc-4.4.patch
===================================================================
--- mlton/trunk/package/debian/patches/00-gcc-4.4.patch	2009-11-01 06:28:02 UTC (rev 7323)
+++ mlton/trunk/package/debian/patches/00-gcc-4.4.patch	2009-11-01 17:51:42 UTC (rev 7324)
@@ -1,12 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' mlton/bin/mlton-script mlton.new/bin/mlton-script
---- mlton/bin/mlton-script	2009-10-15 21:39:37.000000000 +0200
-+++ mlton.new/bin/mlton-script	2009-10-28 16:44:33.000000000 +0100
-@@ -7,7 +7,7 @@
- dir=`dirname "$0"`
- lib=`cd "$dir/../lib" && pwd`
- eval `"$lib/platform"`
--gcc='gcc'
-+gcc='gcc-4.4'
- case "$HOST_OS" in
- mingw)
- 	exe='.exe'

Modified: mlton/trunk/package/debian/rules
===================================================================
--- mlton/trunk/package/debian/rules	2009-11-01 06:28:02 UTC (rev 7323)
+++ mlton/trunk/package/debian/rules	2009-11-01 17:51:42 UTC (rev 7324)
@@ -5,9 +5,15 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 HEAPSIZE := $(shell . debian/heap-size)
+	
+ifeq (,$(findstring mips, $(DEB_HOST_ARCH_CPU)))
+CC := gcc
+else
+CC := gcc-4.1
+endif
 
 # MLton compiles optimized, debug, and pic versions on its own.
-DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) CC="gcc-4.4 -std=gnu99"
+DEB_MAKE_INVOKE = $(DEB_MAKE_ENVVARS) make -C $(DEB_BUILDDIR) CC="$(CC) -std=gnu99"
 
 # The MLton guide is html. Don't compress example .sml files.
 DEB_COMPRESS_EXCLUDE = mlton/guide .sml