The following commit has been merged in the master branch:
commit d05285e249c459599094e911faf86710510d319e
Author: Stephane Glondu <st...@glondu.net>
Date:   Sun Dec 25 13:25:28 2011 +0100

    Remove patch applied upstream

diff --git a/debian/patches/0001-Fix-thumb2-related-build-error.patch 
b/debian/patches/0001-Fix-thumb2-related-build-error.patch
deleted file mode 100644
index 3aab299..0000000
--- a/debian/patches/0001-Fix-thumb2-related-build-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Stephane Glondu <st...@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 <mar...@genesi-usa.com>
-Signed-off-by: Stephane Glondu <st...@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
deleted file mode 100644
index 0bde233..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-thumb2-related-build-error.patch

-- 
coq packaging

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to