Fixed ia64 FTBFS.

diff --git a/debian/changelog b/debian/changelog
index a7d66929a37e2803b2f7f0a2afa855267f10af1b..adf55364b395bdbfac7037a6f129ec39d46c4bff 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ocaml (3.08.3-7) UNRELEASED; urgency=low
+
+  Changes by Sven Luther:
+  * debian/patches/byterun_interp_ia64_fix.dpatch
+    - Removed spurious ia64 cast which broke builds with gcc 4.0
+
+ -- Sven Luther <luther@debian.org>  Tue,  9 Aug 2005 20:06:13 +0200
+
 ocaml (3.08.3-6) unstable; urgency=low
 
   Changes by Stefano Zacchiroli:

diff --git a/debian/patches/00list b/debian/patches/00list
index 8d5ec6829aabbf6711e062a9f3797c9fa72291fd..1dea05ae1912e0234cad8201aba56a27a67beaf3 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -4,3 +4,5 @@ man-ocamlmklib
 asmcomp_amd64_emit.mlp
 fix_i386_gcc4_build
 ocaml-md5sums
+byterun_interp_ia64_fix
+

diff --git a/debian/patches/byterun_interp_ia64_fix.dpatch b/debian/patches/byterun_interp_ia64_fix.dpatch
new file mode 100755 (executable)
index 0000000..49723f9
--- /dev/null
+++ b/debian/patches/byterun_interp_ia64_fix.dpatch
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## byterun_interp_ia64_fix.dpatch Sven LUther <luther@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Disabled not-really-needed ia64 cast which broke with gcc 4.0.
+
+@DPATCH@
+--- ocaml-3.08.3/byterun/interp.c.orig 2005-08-09 16:58:22.000000000 +0000
++++ ocaml-3.08.3/byterun/interp.c      2005-08-09 16:58:42.000000000 +0000
+@@ -55,11 +55,7 @@
+ #  ifdef DEBUG
+ #    define Next goto next_instr
+ #  else
+-#    ifdef __ia64__
+-#      define Next goto *(void *)(jumptbl_base + *((uint32 *) pc)++)
+-#    else
+-#      define Next goto *(void *)(jumptbl_base + *pc++)
+-#    endif
++#    define Next goto *(void *)(jumptbl_base + *pc++)
+ #  endif
+ #else
+ #  define Instruct(name) case name