From: Sven Luther Date: Tue, 9 Aug 2005 18:09:10 +0000 (+0000) Subject: Fixed ia64 FTBFS. X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~742 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3896d167fe768aa45a025eb3ccc36cddbd0dddff;p=ocaml.git Fixed ia64 FTBFS. --- diff --git a/debian/changelog b/debian/changelog index a7d66929..adf55364 100644 --- 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 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 8d5ec682..1dea05ae 100644 --- 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 index 00000000..49723f92 --- /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 +## +## 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