diff options
| author | Arnaldo Carvalho de Melo <acme@kernel.org> | 2020-06-09 23:16:53 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-06-10 01:19:25 +0200 |
| commit | 8ca8d4a841730c02e77bf3c87bf658cc44f364b9 (patch) | |
| tree | b699f3f002299f989c1cd419c759eaab9fcc23e3 /tools | |
| parent | bpf: Selftests and tools use struct bpf_devmap_val from uapi (diff) | |
| download | linux-8ca8d4a841730c02e77bf3c87bf658cc44f364b9.tar.xz linux-8ca8d4a841730c02e77bf3c87bf658cc44f364b9.zip | |
libbpf: Define __WORDSIZE if not available
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/bpf/hashmap.h | 7 |
1 files 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) |