summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Richardson <Alexander.Richardson@cl.cam.ac.uk>2021-07-12 15:39:59 +0300
committerAnup Patel <anup@brainfault.org>2021-07-17 14:10:07 +0300
commitf3a8f603a702b10f13f0fad7c0c815b21fb2384a (patch)
tree083b4a45cbcd1f0cda1fd75f7a1621601fe09e45
parent7210e907858be23a207479e26fde947e968b7f29 (diff)
downloadopensbi-f3a8f603a702b10f13f0fad7c0c815b21fb2384a.tar.xz
include: types: Use __builtin_offsetof when supported
Clang provides a __builtin_offsetof which can be detected using __has_builtin(). Signed-off-by: Alex Richardson <Alexander.Richardson@cl.cam.ac.uk> Reviewed-by: Anup Patel <anup.patel@wdc.com>
-rw-r--r--include/sbi/sbi_types.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/sbi/sbi_types.h b/include/sbi/sbi_types.h
index 38e3565..7fb1af7 100644
--- a/include/sbi/sbi_types.h
+++ b/include/sbi/sbi_types.h
@@ -68,8 +68,14 @@ typedef unsigned long physical_size_t;
#define likely(x) __builtin_expect((x), 1)
#define unlikely(x) __builtin_expect((x), 0)
+#ifndef __has_builtin
+#define __has_builtin(...) 0
+#endif
+
#undef offsetof
-#ifdef __compiler_offsetof
+#if __has_builtin(__builtin_offsetof)
+#define offsetof(TYPE, MEMBER) __builtin_offsetof(TYPE,MEMBER)
+#elif defined(__compiler_offsetof)
#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE,MEMBER)
#else
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)