blob: 4f91c7156a89b022c172897784ef014ef4d8cec6 [file] [log] [blame]
Andrew Geissler26e4bea2020-11-30 19:54:03 -06001From bcdc525b2e4403f9e878e93cbd0d146ce9e37bb8 Mon Sep 17 00:00:00 2001
Brad Bishop26bdd442019-08-16 17:08:17 -04002From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 25 Jul 2019 23:30:27 -0700
Andrew Geissler26e4bea2020-11-30 19:54:03 -06004Subject: [PATCH] libfdt: Undefine __wordsize if already defined
Brad Bishop26bdd442019-08-16 17:08:17 -04005
6glibc 2.30+ defines __wordsize, which is same so its easier to compile
7for multiple versions of glibc even ones which does not have this define
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
Patrick Williams520786c2023-06-25 16:20:36 -050011Upstream-Status: Pending
12
Brad Bishop26bdd442019-08-16 17:08:17 -040013 opensrc/helpers/libfdt/libfdt_env.h | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/opensrc/helpers/libfdt/libfdt_env.h b/opensrc/helpers/libfdt/libfdt_env.h
Andrew Geissler062316f2020-05-15 14:19:14 -050017index f4608be..5e83a27 100644
Brad Bishop26bdd442019-08-16 17:08:17 -040018--- a/opensrc/helpers/libfdt/libfdt_env.h
19+++ b/opensrc/helpers/libfdt/libfdt_env.h
Andrew Geissler062316f2020-05-15 14:19:14 -050020@@ -18,6 +18,10 @@
Brad Bishop26bdd442019-08-16 17:08:17 -040021 #include <string.h>
Andrew Geissler062316f2020-05-15 14:19:14 -050022 #include <limits.h>
Brad Bishop26bdd442019-08-16 17:08:17 -040023
24+#ifdef __bitwise
25+#undef __bitwise
26+#endif
27+
28 #ifdef __CHECKER__
Andrew Geissler062316f2020-05-15 14:19:14 -050029 #define FDT_FORCE __attribute__((force))
30 #define FDT_BITWISE __attribute__((bitwise))