Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cmake for openSUSE:Factory checked in at 2021-10-16 22:47:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cmake (Old) and /work/SRC/openSUSE:Factory/.cmake.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake" Sat Oct 16 22:47:00 2021 rev:206 rq:925106 version:3.21.3 Changes: -------- --- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2021-09-26 21:48:09.894739671 +0200 +++ /work/SRC/openSUSE:Factory/.cmake.new.1890/cmake.changes 2021-10-16 22:47:18.776675371 +0200 @@ -1,0 +2,6 @@ +Wed Oct 13 12:34:11 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- Fix bundled zstd to avoid a crash on armv6 - boo#1191588: + * cmake-fix-zstd-armv6.patch + +------------------------------------------------------------------- New: ---- cmake-fix-zstd-armv6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.EPrqxO/_old 2021-10-16 22:47:19.476675961 +0200 +++ /var/tmp/diff_new_pack.EPrqxO/_new 2021-10-16 22:47:19.476675961 +0200 @@ -55,6 +55,8 @@ # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice Patch1: feature-suse-python-interp-search-order.patch Patch2: cmake-fix-png-include-dir.patch +# PATCH-FIX-UPSTREAM - https://gitlab.kitware.com/cmake/cmake/-/issues/22754 +Patch3: cmake-fix-zstd-armv6.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig ++++++ cmake-fix-zstd-armv6.patch ++++++ >From 28d0120b5ac62b56cd858bd46480c73730d044b4 Mon Sep 17 00:00:00 2001 From: "Bernhard M. Wiedemann" <bwiedem...@suse.de> Date: Tue, 11 May 2021 17:46:55 +0200 Subject: [PATCH] Avoid SIGBUS on armv6 When running armv6 userspace on armv8 hardware with a 64 bit Linux kernel, the mode 2 caused SIGBUS (unaligned memory access). Running all our arm builds in the build farm only on armv8 simplifies administration a lot. Depending on compiler and environment, this change might slow down memory accesses (did not benchmark it). The original analysis is 6 years old. Fixes #2632 [Guillaume: Add Utilities/cmzstd/ prefix to apply in cmake --- /Utilities/cmzstd/lib/common/mem.h | 4 +--- Utilities/cmzstd/lib/common/xxhash.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Utilities/cmzstd/lib/common/mem.h b/Utilities/cmzstd/lib/common/mem.h index dc6667c68b..9f3b81ab9d 100644 --- a/Utilities/cmzstd/lib/common/mem.h +++ b/Utilities/cmzstd/lib/common/mem.h @@ -143,9 +143,7 @@ MEM_STATIC size_t MEM_swapST(size_t in); * Prefer these methods in priority order (0 > 1 > 2) */ #ifndef MEM_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */ -# if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) ) -# define MEM_FORCE_MEMORY_ACCESS 2 -# elif defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__) +# if defined(__INTEL_COMPILER) || defined(__GNUC__) || defined(__ICCARM__) # define MEM_FORCE_MEMORY_ACCESS 1 # endif #endif diff --git a/Utilities/cmzstd/lib/common/xxhash.c b/Utilities/cmzstd/lib/common/xxhash.c index 0ddbf13a39..926b33604e 100644 --- a/Utilities/cmzstd/lib/common/xxhash.c +++ b/Utilities/cmzstd/lib/common/xxhash.c @@ -30,9 +30,7 @@ * Prefer these methods in priority order (0 > 1 > 2) */ #ifndef XXH_FORCE_MEMORY_ACCESS /* can be defined externally, on command line for example */ -# if defined(__GNUC__) && ( defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) ) -# define XXH_FORCE_MEMORY_ACCESS 2 -# elif (defined(__INTEL_COMPILER) && !defined(WIN32)) || \ +# if (defined(__INTEL_COMPILER) && !defined(WIN32)) || \ (defined(__GNUC__) && ( defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7S__) )) || \ defined(__ICCARM__) # define XXH_FORCE_MEMORY_ACCESS 1
