diff -Nru xxhash-0.8.0/debian/changelog xxhash-0.8.0/debian/changelog --- xxhash-0.8.0/debian/changelog 2021-01-11 12:57:57.000000000 +0000 +++ xxhash-0.8.0/debian/changelog 2021-01-22 12:43:57.000000000 +0000 @@ -1,3 +1,11 @@ +xxhash (0.8.0-2+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 0.8.0-1+rpi1 by Peter Michael Green at Thu, 07 Jan 2021 21:20:41 +0000] + * Use XXH_FORCE_MEMORY_ACCESS 1 instead of XXH_FORCE_MEMORY_ACCESS 2 + on armv6 to fix unaligned access issue. + + -- Raspbian forward porter Fri, 22 Jan 2021 12:43:57 +0000 + xxhash (0.8.0-2) unstable; urgency=medium * Use hardware-accelerated XXH3 computation on x86 architecture, and diff -Nru xxhash-0.8.0/debian/patches/fix-unaligned-access-on-armv6.patch xxhash-0.8.0/debian/patches/fix-unaligned-access-on-armv6.patch --- xxhash-0.8.0/debian/patches/fix-unaligned-access-on-armv6.patch 1970-01-01 00:00:00.000000000 +0000 +++ xxhash-0.8.0/debian/patches/fix-unaligned-access-on-armv6.patch 2021-01-22 12:43:57.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Use XXH_FORCE_MEMORY_ACCESS 1 instead of XXH_FORCE_MEMORY_ACCESS 2 on armv6 to fix unaligned access issue. +Author: Peter Michael Green + +--- xxhash-0.8.0.orig/xxhash.h ++++ xxhash-0.8.0/xxhash.h +@@ -807,7 +807,7 @@ XXH_PUBLIC_API XXH128_hash_t XXH128(cons + */ + #ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */ + # if !defined(__clang__) && defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED) && defined(__ARM_ARCH) && (__ARM_ARCH == 6) +-# define XXH_FORCE_MEMORY_ACCESS 2 ++# define XXH_FORCE_MEMORY_ACCESS 1 + # elif !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \ + (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7))) + # define XXH_FORCE_MEMORY_ACCESS 1 diff -Nru xxhash-0.8.0/debian/patches/series xxhash-0.8.0/debian/patches/series --- xxhash-0.8.0/debian/patches/series 2021-01-11 12:57:57.000000000 +0000 +++ xxhash-0.8.0/debian/patches/series 2021-01-22 12:43:57.000000000 +0000 @@ -1,2 +1,3 @@ reproducible-build.patch upstream-b4dbf5fefc37b8a-fix-empty-version-in-pc-file +fix-unaligned-access-on-armv6.patch