Add new patch fix_i386_gcc4_build taken from Fedora to fix inline assembly in

the num library and allow building on i386 with gcc-4.0 (Closes: #309317).

diff --git a/debian/changelog b/debian/changelog
index 606046c7d5260dc264c43196f713c146cd195cd1..0fa0e77d0340e26a1209cd775f45693bec3587fd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,10 @@ 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
+    to allow building ocaml with gcc-4.0 (Closes: #309317).
 
- -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 20 Jun 2005 19:58:32 +0200
+ -- Julien Cristau <julien.cristau@ens-lyon.org>  Mon, 20 Jun 2005 20:13:17 +0200
 
 ocaml (3.08.3-3) unstable; urgency=medium
 

diff --git a/debian/patches/00list b/debian/patches/00list
index 693b7a9bce62565111b4dd675478d58c23f6a1b8..7856c9e7cbe9f9338d2cebf61c78c1137976c270 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@ versioned_libdir
 objinfo
 man-ocamlmklib
 asmcomp_amd64_emit.mlp
+fix_i386_gcc4_build

diff --git a/debian/patches/asmcomp_amd64_emit.mlp.dpatch b/debian/patches/asmcomp_amd64_emit.mlp.dpatch
index 310c2f9c0e7126f1a5e8ab54e96a30e43d2b70a8..08284cec2c9da90ac4fcee96c4d2be605797a285 100755 (executable)
--- a/debian/patches/asmcomp_amd64_emit.mlp.dpatch
+++ b/debian/patches/asmcomp_amd64_emit.mlp.dpatch
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp ocaml-3.08.3/asmcomp/amd64/emit.mlp
---- ocaml-3.08.3/asmcomp/amd64/emit.mlp        2004-07-01 18:09:03.000000000 +0200
-+++ /tmp/dpep.7xGPae/ocaml-3.08.3/asmcomp/amd64/emit.mlp       2005-06-14 03:08:25.481518269 +0200
+--- ocaml-3.08.3.orig/asmcomp/amd64/emit.mlp   2004-07-01 18:09:03.000000000 +0200
++++ ocaml-3.08.3/asmcomp/amd64/emit.mlp        2005-06-14 03:08:25.481518269 +0200
 @@ -10,7 +10,7 @@
  (*                                                                     *)
  (***********************************************************************)

diff --git a/debian/patches/fix_i386_gcc4_build.dpatch b/debian/patches/fix_i386_gcc4_build.dpatch
new file mode 100755 (executable)
index 0000000..53f4d5d
--- /dev/null
+++ b/debian/patches/fix_i386_gcc4_build.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_i386_gcc4_build.dpatch by Julien Cristau <julien.cristau@ens-lyon.org>
+##
+## 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
+
+@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 @@
+         "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)
+         : "eax", "edx");
+   }
+@@ -164,7 +164,7 @@
+         "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)
+         : "eax", "edx");
+   }