55 lines
1.7 KiB
Diff
55 lines
1.7 KiB
Diff
From 5095414bbfa881d0835506efffdc28a80aeb0a21 Mon Sep 17 00:00:00 2001
|
|
From: Arnaldo Carvalho de Melo <acme@kernel.org>
|
|
Date: Tue, 9 Jun 2020 18:16:53 -0300
|
|
Subject: [PATCH 041/201] libbpf: Define __WORDSIZE if not available
|
|
|
|
mainline inclusion
|
|
from mainline-v5.8-rc1
|
|
commit 8ca8d4a841730c02e77bf3c87bf658cc44f364b9
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/openeuler/kernel/issues/I8C0CX
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8ca8d4a841730c02e77bf3c87bf658cc44f364b9
|
|
|
|
------------------------------------------------------------------------
|
|
|
|
Some systems, such as Android, don't have a define for __WORDSIZE, do it
|
|
in terms of __SIZEOF_LONG__, as done in perf since 2012:
|
|
|
|
http://git.kernel.org/torvalds/c/3f34f6c0233ae055b5
|
|
|
|
For reference: https://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html
|
|
|
|
I build tested it here and Andrii did some Travis CI build tests too.
|
|
|
|
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
|
Acked-by: Andrii Nakryiko <andriin@fb.com>
|
|
Link: https://lore.kernel.org/bpf/20200608161150.GA3073@kernel.org
|
|
Signed-off-by: hongrongxuan <hongrongxuan@huawei.com>
|
|
---
|
|
tools/lib/bpf/hashmap.h | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h
|
|
index e823b35e7371..df59fd4fc95b 100644
|
|
--- a/tools/lib/bpf/hashmap.h
|
|
+++ b/tools/lib/bpf/hashmap.h
|
|
@@ -10,10 +10,9 @@
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
-#ifdef __GLIBC__
|
|
-#include <bits/wordsize.h>
|
|
-#else
|
|
-#include <bits/reg.h>
|
|
+#include <limits.h>
|
|
+#ifndef __WORDSIZE
|
|
+#define __WORDSIZE (__SIZEOF_LONG__ * 8)
|
|
#endif
|
|
|
|
static inline size_t hash_bits(size_t h, int bits)
|
|
--
|
|
2.27.0
|
|
|