bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* libbpf's hashmap use of __WORDSIZE
@ 2020-06-08 16:11 Arnaldo Carvalho de Melo
  2020-06-08 17:32 ` Andrii Nakryiko
  0 siblings, 1 reply; 7+ messages in thread
From: Arnaldo Carvalho de Melo @ 2020-06-08 16:11 UTC (permalink / raw)
  To: Andrii Nakryiko
  Cc: Peter Zijlstra, Ian Rogers, Namhyung Kim, Pekka Enberg,
	Jiri Olsa, Irina Tirdea, bpf, Linux Kernel Mailing List

Hi Andrii,

	We've got that hashmap.[ch] copy from libbpf so that we can
build perf in systems where libbpf isn't available, and to make it build
in all the containers I regularly test build perf I had to add the patch
below, I test build with many versions of both gcc and clang and
multiple libcs.


The way that tools/include/linux/bitops.h has been doing since 2012 is
explained in:


Please take a look and see if you find it acceptable,


- Arnaldo
  Warning: Kernel ABI header at 'tools/perf/util/hashmap.h' differs from latest version at 'tools/lib/bpf/hashmap.h'
  diff -u tools/perf/util/hashmap.h tools/lib/bpf/hashmap.h

$ diff -u tools/lib/bpf/hashmap.h tools/perf/util/hashmap.h
--- tools/lib/bpf/hashmap.h	2020-06-05 13:25:27.822079838 -0300
+++ tools/perf/util/hashmap.h	2020-06-05 13:25:27.838079794 -0300
@@ -10,10 +10,9 @@
 #include <stdbool.h>
 #include <stddef.h>
-#ifdef __GLIBC__
-#include <bits/wordsize.h>
-#include <bits/reg.h>
+#include <limits.h>
+#ifndef __WORDSIZE
+#define __WORDSIZE (__SIZEOF_LONG__ * 8)
 static inline size_t hash_bits(size_t h, int bits)

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2020-06-09 23:22 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-08 16:11 libbpf's hashmap use of __WORDSIZE Arnaldo Carvalho de Melo
2020-06-08 17:32 ` Andrii Nakryiko
2020-06-08 18:12   ` Arnaldo Carvalho de Melo
2020-06-09 15:34   ` [PATCH] libbpf: Define __WORDSIZE if not available Arnaldo Carvalho de Melo
2020-06-09 20:37     ` Daniel Borkmann
2020-06-09 21:16       ` Arnaldo Carvalho de Melo
2020-06-09 23:21         ` Daniel Borkmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).