* [tip:perf/urgent] libbpf: fix missing __WORDSIZE definition
[not found] <20190718173021.2418606-1-andriin@fb.com>
@ 2019-07-29 21:36 ` tip-bot for Andrii Nakryiko
0 siblings, 0 replies; only message in thread
From: tip-bot for Andrii Nakryiko @ 2019-07-29 21:36 UTC (permalink / raw)
To: linux-tip-commits
Cc: andriin, andrii.nakryiko, ast, acme, linux-kernel, tglx, daniel,
hpa, mingo
Commit-ID: 8aa259b10a6a759c50137bbbf225df0c17ca5d27
Gitweb: https://git.kernel.org/tip/8aa259b10a6a759c50137bbbf225df0c17ca5d27
Author: Andrii Nakryiko <andriin@fb.com>
AuthorDate: Thu, 18 Jul 2019 10:30:21 -0700
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 29 Jul 2019 10:18:08 -0300
libbpf: fix missing __WORDSIZE definition
hashmap.h depends on __WORDSIZE being defined. It is defined by
glibc/musl in different headers. It's an explicit goal for musl to be
"non-detectable" at compilation time, so instead include glibc header if
glibc is explicitly detected and fall back to musl header otherwise.
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@fb.com>
Cc: Andrii Nakryiko <andrii.nakryiko@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Fixes: e3b924224028 ("libbpf: add resizable non-thread safe internal hashmap")
Link: https://lkml.kernel.org/r/20190718173021.2418606-1-andriin@fb.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/lib/bpf/hashmap.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/lib/bpf/hashmap.h b/tools/lib/bpf/hashmap.h
index 03748a742146..bae8879cdf58 100644
--- a/tools/lib/bpf/hashmap.h
+++ b/tools/lib/bpf/hashmap.h
@@ -10,6 +10,11 @@
#include <stdbool.h>
#include <stddef.h>
+#ifdef __GLIBC__
+#include <bits/wordsize.h>
+#else
+#include <bits/reg.h>
+#endif
#include "libbpf_internal.h"
static inline size_t hash_bits(size_t h, int bits)
^ permalink raw reply [flat|nested] only message in thread