Workround unligned access on armhf by not running an optimised loop there. Closes: #846094

1654c4f5 · Ole Streicher · 7f7a201f · 1654c4f5 · 1654c4f5 · 1654c4f5
Commit 1654c4f5 authored 8 years ago by Ole Streicher
--- a/debian/changelog
+++ b/debian/changelog
+cpl (7.0-4) UNRELEASED; urgency=low
+
+  * Workround unligned access on armhf by not running an optimised loop
+    there. Closes: #846094
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Mon, 28 Nov 2016 13:01:28 +0000
+
 cpl (7.0-3) unstable; urgency=medium

  [ Andreas Tille ]

--- a/debian/patches/cpl_mask_count_window_no_unaligned_access_armhf
+++ b/debian/patches/cpl_mask_count_window_no_unaligned_access_armhf
+Description: Don't run a loop which causes unaligned access (SIGBUS) on armhf
+Author: Iain Lane <iain.lane@canonical.com>
+Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=846094
+
+--- cpl-7.0.orig/cplcore/cpl_mask.c
+++ cpl-7.0/cplcore/cpl_mask.c
+@@ -1127,7 +1127,7 @@ cpl_size cpl_mask_count_window(const cpl
+ 
+     for (j = lly - 1; j < ury; j++, pi += self->nx) {
+         i = llx - 1;
+-#ifdef CPL_MASK_WORD
+#if defined (CPL_MASK_WORD) && !defined(__arm__)
+         /* FIXME: Should really ensure byte-wise iteration to word-boundary */
+         for (; i < llx - 1 + CPL_MASK_PAD2WORD2(llx - 1); i++) {
+             if (pi[i] != CPL_BINARY_0) count++;
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ serial-tests
 reproducible_build.patch
 workaround_mips_ftbfs.patch
 fix_i386_failure.patch
+cpl_mask_count_window_no_unaligned_access_armhf