1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
From 7f9179e0dcff95f0d194cc007ed93b8000610bee Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Tue, 6 Aug 2024 22:50:18 -0700
Subject: [PATCH] lib/arm: avoid build error with gcc 13.3 + binutils 2.40
Resolves https://github.com/ebiggers/libdeflate/issues/383
---
lib/arm/adler32_impl.h | 18 ++++++++++++------
lib/arm/crc32_impl.h | 18 ++++++++++++------
2 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/lib/arm/adler32_impl.h b/lib/arm/adler32_impl.h
index 6144afbc..9e833c39 100644
--- a/lib/arm/adler32_impl.h
+++ b/lib/arm/adler32_impl.h
@@ -214,13 +214,19 @@ adler32_arm_neon(u32 adler, const u8 *p, size_t len)
# ifdef __clang__
# define ATTRIBUTES _target_attribute("dotprod")
/*
- * 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.
+ * Both gcc and binutils originally considered dotprod to depend on
+ * arch=armv8.2-a or later. This was fixed in gcc 13.2 by commit
+ * 9aac37ab8a7b ("aarch64: Remove architecture dependencies from intrinsics")
+ * and in binutils 2.41 by commit 205e4380c800 ("aarch64: Remove version
+ * dependencies from features"). Unfortunately, always using arch=armv8.2-a
+ * causes build errors with some compiler options because it may reduce the
+ * arch rather than increase it. Therefore we try to omit the arch whenever
+ * possible. If gcc is 14 or later, then both gcc and binutils are probably
+ * fixed, so we omit the arch. We also omit the arch if a feature that
+ * depends on armv8.2-a or later (in gcc 13.1 and earlier) is present.
*/
-# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT)
+# elif GCC_PREREQ(14, 0) || defined(__ARM_FEATURE_JCVT) \
+ || defined(__ARM_FEATURE_DOTPROD)
# 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 53630416..01d0283a 100644
--- a/lib/arm/crc32_impl.h
+++ b/lib/arm/crc32_impl.h
@@ -551,13 +551,19 @@ crc32_arm_pmullx4(u32 crc, const u8 *p, size_t len)
# ifdef __clang__
# define ATTRIBUTES _target_attribute("aes,crc,sha3")
/*
- * 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.
+ * Both gcc and binutils originally considered sha3 to depend on
+ * arch=armv8.2-a or later. This was fixed in gcc 13.2 by commit
+ * 9aac37ab8a7b ("aarch64: Remove architecture dependencies from intrinsics")
+ * and in binutils 2.41 by commit 205e4380c800 ("aarch64: Remove version
+ * dependencies from features"). Unfortunately, always using arch=armv8.2-a
+ * causes build errors with some compiler options because it may reduce the
+ * arch rather than increase it. Therefore we try to omit the arch whenever
+ * possible. If gcc is 14 or later, then both gcc and binutils are probably
+ * fixed, so we omit the arch. We also omit the arch if a feature that
+ * depends on armv8.2-a or later (in gcc 13.1 and earlier) is present.
*/
-# elif GCC_PREREQ(13, 2) || defined(__ARM_FEATURE_JCVT)
+# elif GCC_PREREQ(14, 0) || defined(__ARM_FEATURE_JCVT) \
+ || defined(__ARM_FEATURE_DOTPROD)
# define ATTRIBUTES _target_attribute("+crypto,+crc,+sha3")
# else
# define ATTRIBUTES _target_attribute("arch=armv8.2-a+crypto+crc+sha3")
|
