CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

libdeflate: fix build with -mcpu=cortex-a76+crypto without -march=armv8.2-a+crypto

Browse Source 
* fixes:
  https://github.com/ebiggers/libdeflate/issues/369

Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Martin Jansa 2024-05-04 22:13:49 +02:00 committed by Khem Raj
parent d4e3bdd519
commit 32984eb9fd
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 60 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
meta-oe/recipes-extended/libdeflate/libdeflate/0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch Normal file
View File

@ -0,0 +1,57 @@
From 684ebc7f8eb44558219d4b5be52add1250b3c0ca Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Tue, 30 Apr 2024 11:27:55 -0700
Subject: [PATCH] lib/arm: don't use explicit armv8.2-a on gcc 13.2 and later
Resolves https://github.com/ebiggers/libdeflate/issues/369
---
Upstream-Status: Backport [https://github.com/ebiggers/libdeflate/pull/370]
lib/arm/adler32_impl.h | 10 ++++++----
lib/arm/crc32_impl.h | 10 ++++++----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/lib/arm/adler32_impl.h b/lib/arm/adler32_impl.h
index 6453b8e..6144afb 100644
--- a/lib/arm/adler32_impl.h
+++ b/lib/arm/adler32_impl.h
@@ -214,11 +214,13 @@ adler32_arm_neon(u32 adler, const u8 *p, size_t len)
# ifdef __clang__
# define ATTRIBUTES _target_attribute("dotprod")
/*
- * With gcc, arch=armv8.2-a is needed for dotprod intrinsics, unless the
- * default target is armv8.3-a or later in which case it must be omitted.
- * armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT.
+ * With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b,
+ * "aarch64: Remove architecture dependencies from intrinsics"),
+ * arch=armv8.2-a is needed for the dotprod intrinsics, unless the default
+ * target is armv8.3-a or later in which case it must be omitted. armv8.3-a
+ * or later can be detected by checking for __ARM_FEATURE_JCVT.
*/
-# elif defined(__ARM_FEATURE_JCVT)
+# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT)
# define ATTRIBUTES _target_attribute("+dotprod")
# else
# define ATTRIBUTES _target_attribute("arch=armv8.2-a+dotprod")
diff --git a/lib/arm/crc32_impl.h b/lib/arm/crc32_impl.h
index 3c4bec7..5363041 100644
--- a/lib/arm/crc32_impl.h
+++ b/lib/arm/crc32_impl.h
@@ -551,11 +551,13 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len)
# ifdef __clang__
# define ATTRIBUTES _target_attribute("aes,crc,sha3")
/*
- * With gcc, arch=armv8.2-a is needed for the sha3 intrinsics, unless the
- * default target is armv8.3-a or later in which case it must be omitted.
- * armv8.3-a or later can be detected by checking for __ARM_FEATURE_JCVT.
+ * With gcc 13.1 and earlier (before gcc commit 73d3bc348190 or 9aac37ab8a7b,
+ * "aarch64: Remove architecture dependencies from intrinsics"),
+ * arch=armv8.2-a is needed for the sha3 intrinsics, unless the default
+ * target is armv8.3-a or later in which case it must be omitted. armv8.3-a
+ * or later can be detected by checking for __ARM_FEATURE_JCVT.
*/
-# elif defined(__ARM_FEATURE_JCVT)
+# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT)
# define ATTRIBUTES _target_attribute("+crypto,+crc,+sha3")
# else
# define ATTRIBUTES _target_attribute("arch=armv8.2-a+crypto+crc+sha3")

5
meta-oe/recipes-extended/libdeflate/libdeflate_1.20.bb
View File

@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7b6977026437092191e9da699ed9f780"
DEPENDS += "gzip zlib"
SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master"
SRC_URI = "git://github.com/ebiggers/libdeflate.git;protocol=https;branch=master \
file://0001-lib-arm-don-t-use-explicit-armv8.2-a-on-gcc-13.2-and.patch \
"
S = "${WORKDIR}/git"
SRCREV = "275aa5141db6eda3587214e0f1d3a134768f557d"
inherit cmake pkgconfig