From 07e35de6feeb44a192e73b46fb6c483257eecb0c Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 20 Jul 2005 22:28:28 +0000 Subject: [PATCH] Replace patch from Fedora with upstream fix for #309317, which is release critical now that gcc-4.0 is the default compiler. --- debian/changelog | 4 ++-- debian/patches/fix_i386_gcc4_build.dpatch | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0e1f3dab..1dd067cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ ocaml (3.08.3-3+SVN) UNRELEASED; urgency=low generation on amd64 (reported by John Skaller). * debian/control: Add a dependency on emacsen-common, because this is needed to install the caml emacs mode in ocaml-nox (Closes: #312618). - * Add patch from Fedora to fix inline i386 assembly in the num library + * Add patch from upstream to fix inline i386 assembly in the num library to allow building ocaml with gcc-4.0 (Closes: #309317). Changes by Stefano Zacchiroli: @@ -26,7 +26,7 @@ ocaml (3.08.3-3+SVN) UNRELEASED; urgency=low - ignore error on clean target for config.{sub,guess} so that svn-buildpackage does not fail at clean time - -- Debian OCaml Maintainers Sat, 09 Jul 2005 14:21:31 +0200 + -- Debian OCaml Maintainers Thu, 21 Jul 2005 00:24:26 +0200 ocaml (3.08.3-3) unstable; urgency=medium diff --git a/debian/patches/fix_i386_gcc4_build.dpatch b/debian/patches/fix_i386_gcc4_build.dpatch index 53f4d5d9..ff4c1977 100755 --- a/debian/patches/fix_i386_gcc4_build.dpatch +++ b/debian/patches/fix_i386_gcc4_build.dpatch @@ -2,28 +2,33 @@ ## fix_i386_gcc4_build.dpatch by Julien Cristau ## ## All lines beginning with `## DP:' are a description of the patch. -## DP: Patch from Fedora to fix build on i386 with gcc4. -## DP: http://cvs.fedora.redhat.com/viewcvs/devel/ocaml/ocaml-num-gcc4.patch?root=extras&rev=1.1&view=markup +## DP: Patch from upstream to fix build on i386 with gcc4. +## DP: This is recorded as PR#3604 and PR#3637 +## DP: http://camlcvs.inria.fr/cgi-bin/cvsweb/ocaml/otherlibs/num/bng_ia32.c.diff?r1=1.3;r2=1.3.6.1 @DPATCH@ diff -urNad ocaml-3.08.3.orig/otherlibs/num/bng_ia32.c ocaml-3.08.3/otherlibs/num/bng_ia32.c --- ocaml-3.08.3.orig/otherlibs/num/bng_ia32.c 2003-10-26 10:51:11.000000000 +0100 +++ ocaml-3.08.3/otherlibs/num/bng_ia32.c 2005-06-20 17:34:10.015173470 +0200 -@@ -121,7 +121,7 @@ +@@ -121,8 +121,8 @@ "leal 4(%1), %1 \n\t" "decl %2 \n\t" "jnz 1b" - : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&r" (out) -+ : "+&r" (a), "+&r" (b), "+m" (blen), "+&r" (out) - : "rm" (d) +- : "rm" (d) ++ : "+&r" (a), "+&r" (b), "+&r" (blen), "=m" (out) ++ : "m" (d) : "eax", "edx"); } -@@ -164,7 +164,7 @@ + if (alen == 0) return out; +@@ -164,8 +164,8 @@ "leal 4(%1), %1 \n\t" "decl %2 \n\t" "jnz 1b" - : "+&r" (a), "+&r" (b), "+&rm" (blen), "+&rm" (out), "=&r" (tmp) -+ : "+&r" (a), "+&r" (b), "+m" (blen), "+m" (out), "=&r" (tmp) - : "rm" (d) +- : "rm" (d) ++ : "+&r" (a), "+&r" (b), "=m" (blen), "=m" (out), "=&r" (tmp) ++ : "m" (d) : "eax", "edx"); } + if (alen == 0) return out; -- 2.30.2