summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch')
-rw-r--r--meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch52
1 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch b/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
deleted file mode 100644
index 9e3a30be23..0000000000
--- a/meta/recipes-extended/mdadm/files/0001-Define-alignof-using-_Alignof-when-using-C11-or-newe.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 82c893bb9e01f914a6bdef1bef943af746cfc3e1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Jan 2023 12:42:18 -0800
4Subject: [PATCH] Define alignof using _Alignof when using C11 or newer
5
6WG14 N2350 made very clear that it is an UB having type definitions
7within "offsetof" [1]. This patch enhances the implementation of macro
8alignof_slot to use builtin "_Alignof" to avoid undefined behavior on
9when using std=c11 or newer
10
11clang 16+ has started to flag this [2]
12
13Fixes build when using -std >= gnu11 and using clang16+
14
15Older compilers gcc < 4.9 or clang < 8 has buggy _Alignof even though it
16may support C11, exclude those compilers too
17
18[1] https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2350.htm
19[2] https://reviews.llvm.org/D133574
20
21Upstream-Status: Submitted [https://lore.kernel.org/linux-raid/20230118083236.24418-1-raj.khem@gmail.com/T/#u]
22Signed-off-by: Khem Raj <raj.khem@gmail.com>
23---
24 sha1.c | 12 +++++++++++-
25 1 file changed, 11 insertions(+), 1 deletion(-)
26
27diff --git a/sha1.c b/sha1.c
28index 89b32f4..1e4ad5d 100644
29--- a/sha1.c
30+++ b/sha1.c
31@@ -229,7 +229,17 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx)
32 if (len >= 64)
33 {
34 #if !_STRING_ARCH_unaligned
35-# define alignof(type) offsetof (struct { char c; type x; }, x)
36+/* GCC releases before GCC 4.9 had a bug in _Alignof. See GCC bug 52023
37+ <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
38+ clang versions < 8.0.0 have the same bug. */
39+# if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
40+ || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
41+ && !defined __clang__) \
42+ || (defined __clang__ && __clang_major__ < 8))
43+# define alignof(type) offsetof (struct { char c; type x; }, x)
44+# else
45+# define alignof(type) _Alignof(type)
46+# endif
47 # define UNALIGNED_P(p) (((size_t) p) % alignof (sha1_uint32) != 0)
48 if (UNALIGNED_P (buffer))
49 while (len > 64)
50--
512.39.0
52