[packages/libgcrypt] upstream patch to fix build on arm

atler atler at pld-linux.org
Fri Jan 22 15:14:28 CET 2021


commit 1f0aeb157a63949a3a27163446475b516d7fd2a3
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Jan 22 15:13:56 2021 +0100

    upstream patch to fix build on arm

 ...sic-fix-build-on-ARM32-when-NEON-disabled.patch | 41 ++++++++++++++++++++++
 libgcrypt.spec                                     |  2 ++
 2 files changed, 43 insertions(+)
---
diff --git a/libgcrypt.spec b/libgcrypt.spec
index c4bd25b..dfcb18b 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -18,6 +18,7 @@ Patch0:		%{name}-info.patch
 Patch1:		%{name}-libgcrypt_config.patch
 Patch2:		%{name}-poll.patch
 Patch3:		kdf-selftest.patch
+Patch4:		0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch
 URL:		https://directory.fsf.org/wiki/Libgcrypt
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake >= 1:1.14
@@ -123,6 +124,7 @@ Biblioteka statyczna dietlibc libgcrypt.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__rm} m4/libtool.m4
diff --git a/0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch b/0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch
new file mode 100644
index 0000000..7e6cdd1
--- /dev/null
+++ b/0001-tests-basic-fix-build-on-ARM32-when-NEON-disabled.patch
@@ -0,0 +1,41 @@
+From eb1aa965124ddd831fe569c70acc3459a6a93f87 Mon Sep 17 00:00:00 2001
+From: Jussi Kivilinna <jussi.kivilinna at iki.fi>
+Date: Tue, 19 Jan 2021 20:50:58 +0200
+Subject: [PATCH] tests/basic: fix build on ARM32 when NEON disabled
+
+* tests/basic.c (CLUTTER_VECTOR_REGISTER_NEON)
+(CLUTTER_VECTOR_REGISTER_AARCH64): Remove check for __ARM_FEATURE_SIMD32.
+--
+
+Cluttering of NEON vector registers was enabled even if NEON was
+not active for current compiler target. Issue was caused by
+enabling NEON cluttering by wrong feature macro __ARM_FEATURE_SIMD32.
+
+GnuPG-bug-id: 5251
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
+---
+ tests/basic.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/basic.c b/tests/basic.c
+index 46e4c0f8..8b333bae 100644
+--- a/tests/basic.c
++++ b/tests/basic.c
+@@ -223,12 +223,12 @@ progress_handler (void *cb_data, const char *what, int printchar,
+ # define CLUTTER_VECTOR_REGISTER_COUNT 8
+ #elif defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
+       defined(HAVE_GCC_INLINE_ASM_AARCH64_NEON) && \
+-      (defined(__ARM_FEATURE_SIMD32) || defined(__ARM_NEON))
++      defined(__ARM_NEON)
+ # define CLUTTER_VECTOR_REGISTER_AARCH64 1
+ # define CLUTTER_VECTOR_REGISTER_COUNT 32
+ #elif defined(HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS) && \
+       defined(HAVE_GCC_INLINE_ASM_NEON) && \
+-      (defined(__ARM_FEATURE_SIMD32) || defined(__ARM_NEON))
++      defined(__ARM_NEON)
+ # define CLUTTER_VECTOR_REGISTER_NEON 1
+ # define CLUTTER_VECTOR_REGISTER_COUNT 16
+ #endif
+-- 
+2.27.0
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libgcrypt.git/commitdiff/1f0aeb157a63949a3a27163446475b516d7fd2a3



More information about the pld-cvs-commit mailing list