diff --git a/ccache.changes b/ccache.changes index 37fa965..43db19a 100644 --- a/ccache.changes +++ b/ccache.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 17 15:25:36 UTC 2021 - Dirk Müller + +- add xxhash-avoid-armv6-unaligned-access.patch (bsc#1193317) + ------------------------------------------------------------------- Thu Dec 2 21:57:55 UTC 2021 - Dirk Müller diff --git a/ccache.spec b/ccache.spec index e111822..65110c8 100644 --- a/ccache.spec +++ b/ccache.spec @@ -25,6 +25,7 @@ URL: https://ccache.dev/ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc Source2: %{name}.keyring +Patch1: xxhash-avoid-armv6-unaligned-access.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libzstd-devel >= 1.1.2 @@ -38,7 +39,7 @@ being done again. Supported languages are C, C++, Objective-C and Objective-C++. %prep -%setup -q +%autosetup -p1 %build %cmake \ diff --git a/xxhash-avoid-armv6-unaligned-access.patch b/xxhash-avoid-armv6-unaligned-access.patch new file mode 100644 index 0000000..7ce927a --- /dev/null +++ b/xxhash-avoid-armv6-unaligned-access.patch @@ -0,0 +1,17 @@ +Index: ccache-4.5.1/src/third_party/xxhash.h +=================================================================== +--- ccache-4.5.1.orig/src/third_party/xxhash.h ++++ ccache-4.5.1/src/third_party/xxhash.h +@@ -806,10 +806,8 @@ XXH_PUBLIC_API XXH128_hash_t XXH128(cons + * Prefer these methods in priority order (0 > 1 > 2 > 3) + */ + #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 +-# elif !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \ +- (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7))) ++# if !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \ ++ (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 6))) + # define XXH_FORCE_MEMORY_ACCESS 1 + # endif + #endif