From: Stefano Zacchiroli <zack@debian.org>
Date: Wed, 25 Jul 2007 15:53:07 +0000 (+0000)
Subject: * add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~552
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3318d21f62bd7f66bc3c9b628848b93469ff9fec;p=ocaml.git

* add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
  FTBFS on arm
---

diff --git a/debian/changelog b/debian/changelog
index fef40100..36e87e87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,14 @@
-ocaml (3.10.0-5) experimental; urgency=low
-  
-  [ Ralf Treinen ]
+ocaml (3.10.0-5) UNRELEASED; urgency=low
 
+  [ Ralf Treinen ]
   * ocaml-mode.emacsen-install: do not hardcode the emacs flavours for which
     to compile ocaml-mode (closes: Bug#433082)
 
- -- Ralf Treinen <treinen@debian.org>  Wed, 18 Jul 2007 18:31:31 +0200
+  [ Stefano Zacchiroli ]
+  * add patch arm_ccheckbound_typo, fix a typing error typo which makes ocaml
+    FTBFS on arm
+
+ -- Stefano Zacchiroli <zack@debian.org>  Wed, 25 Jul 2007 17:52:23 +0200
 
 ocaml (3.10.0-4) experimental; urgency=low
 
diff --git a/debian/patches/00list b/debian/patches/00list
index dffcd3e7..0fd76ca2 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,3 +8,4 @@ no_rpath.dpatch
 stdlib_man_section.dpatch
 install_scripts_config.dpatch
 install_ocamlbuild.dpatch
+arm_ccheckbound_typo.dpatch
diff --git a/debian/patches/arm_ccheckbound_typo.dpatch b/debian/patches/arm_ccheckbound_typo.dpatch
new file mode 100755
index 00000000..41113478
--- /dev/null
+++ b/debian/patches/arm_ccheckbound_typo.dpatch
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## arm_ccheckbound_typo.dpatch by Stefano Zacchiroli <zack@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix typo (which induce typing error and in turn FTBFS) in the usage of
+## DP: the Ccheckbound type constructore in the arm asm compiler
+
+@DPATCH@
+diff -urNad trunk~/asmcomp/arm/selection.ml trunk/asmcomp/arm/selection.ml
+--- trunk~/asmcomp/arm/selection.ml	2001-03-30 14:22:32.000000000 +0200
++++ trunk/asmcomp/arm/selection.ml	2007-07-25 17:51:02.000000000 +0200
+@@ -106,7 +106,7 @@
+       | _ ->
+           (Iextcall("__modsi3", false), args)
+       end
+-  | Ccheckbound ->
++  | Ccheckbound _ ->
+       begin match args with
+         [Cop(Clsr, [arg1; Cconst_int n]); arg2]
+         when n > 0 && n < 32 && not(is_intconst arg2) ->