[Pkg-ocaml-maint-commits] [SCM] coq packaging branch, master, updated. debian/8.3.pl1+dfsg-2-7-gf23ca11

[Stephane Glondu]

The following commit has been merged in the master branch:
commit d13e1b888485eb71d559cf2dea65ad1b49704bd8
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Apr 19 16:57:21 2011 +0200

    Add patch to fix thumb2-related build error (Closes: #622882)

diff --git a/debian/patches/0001-Fix-thumb2-related-build-error.patch b/debian/patches/0001-Fix-thumb2-related-build-error.patch
new file mode 100644
index 0000000..3aab299
--- /dev/null
+++ b/debian/patches/0001-Fix-thumb2-related-build-error.patch
@@ -0,0 +1,25 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Tue, 19 Apr 2011 12:45:34 +0200
+Subject: Fix thumb2-related build error
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622882
+Signed-off-by: Konstantinos Margaritis <markos at genesi-usa.com>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ kernel/byterun/coq_interp.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/kernel/byterun/coq_interp.c b/kernel/byterun/coq_interp.c
+index cce2319..a0cb4f1 100644
+--- a/kernel/byterun/coq_interp.c
++++ b/kernel/byterun/coq_interp.c
+@@ -145,7 +145,7 @@ sp is a local copy of the global variable extern_sp. */
+ #define SP_REG asm("a4")
+ #define ACCU_REG asm("d7")
+ #endif
+-#ifdef __arm__
++#if defined(__arm__) && !defined(__thumb2__)
+ #define PC_REG asm("r9")
+ #define SP_REG asm("r8")
+ #define ACCU_REG asm("r7")
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0bde233
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-thumb2-related-build-error.patch

-- 
coq packaging