Commit 8aa259b1 authored Jul 18, 2019 by Andrii Nakryiko Committed by Arnaldo Carvalho de Melo Jul 29, 2019

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: e3b92422 ("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>

parent 2e9a06dd

tools/lib/bpf/hashmap.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -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)

Admin message