Hello, On Wed, Dec 05, 2012 at 06:43:35PM +0200, Jani Monoses wrote: > https://github.com/crossroads-io/libxs/commit/1c2f3a290efa328cd29ee7c032b230e09e4d8458
I have uploaded the previous fix to DELAYED/3, debdiff follows up: diff -Nru libxs-1.2.0/debian/changelog libxs-1.2.0/debian/changelog --- libxs-1.2.0/debian/changelog 2012-06-13 19:26:54.000000000 +0200 +++ libxs-1.2.0/debian/changelog 2013-08-04 19:18:14.000000000 +0200 @@ -1,3 +1,11 @@ +libxs (1.2.0-1.1) unstable; urgency=low + + * Non-maintainer upload. + * d/p/0001-atomic_ptr-Add-IT-instruction-for-arm-thumb2.patch: + - Fix FTBFS on armhf. (Closes: #678370) + + -- Hector Oron <zu...@debian.org> Sun, 04 Aug 2013 19:16:31 +0200 + libxs (1.2.0-1) unstable; urgency=low * New upstream release. diff -Nru libxs-1.2.0/debian/patches/0001-atomic_ptr-Add-IT-instruction-for-arm-thumb2.patch libxs-1.2.0/debian/patches/0001-atomic_ptr-Add-IT-instruction-for-arm-thumb2.patch --- libxs-1.2.0/debian/patches/0001-atomic_ptr-Add-IT-instruction-for-arm-thumb2.patch 1970-01-01 01:00:00.000000000 +0100 +++ libxs-1.2.0/debian/patches/0001-atomic_ptr-Add-IT-instruction-for-arm-thumb2.patch 2013-08-04 19:17:05.000000000 +0200 @@ -0,0 +1,27 @@ +From 1c2f3a290efa328cd29ee7c032b230e09e4d8458 Mon Sep 17 00:00:00 2001 +From: Patrick Trantham <patrick.trant...@fuel7.com> +Date: Thu, 14 Jun 2012 11:50:56 -0500 +Subject: [PATCH 01/13] atomic_ptr: Add IT instruction for arm-thumb2 + +Add IT instruction prior to strexeq to fix compilation in thumb mode. + +Signed-off-by: Patrick Trantham <patrick.trant...@fuel7.com> +--- + src/atomic_ptr.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/atomic_ptr.hpp b/src/atomic_ptr.hpp +index adf1c87..baa28ff 100644 +--- a/src/atomic_ptr.hpp ++++ b/src/atomic_ptr.hpp +@@ -132,6 +132,7 @@ namespace xs + "1: ldrex %1, [%3]\n\t" + " mov %0, #0\n\t" + " teq %1, %4\n\t" ++ " it eq\n" + " strexeq %0, %5, [%3]\n\t" + " teq %0, #0\n\t" + " bne 1b\n\t" +-- +1.8.3.2 + diff -Nru libxs-1.2.0/debian/patches/series libxs-1.2.0/debian/patches/series --- libxs-1.2.0/debian/patches/series 2012-06-13 19:27:11.000000000 +0200 +++ libxs-1.2.0/debian/patches/series 2013-08-04 19:18:40.000000000 +0200 @@ -1 +1,2 @@ debian-changes +0001-atomic_ptr-Add-IT-instruction-for-arm-thumb2.patch -- Hector Oron
signature.asc
Description: Digital signature
