perf bpf: Fix build breakage due to libbpf (d5ef3140) · Commits · 戴 / test

perf build is currently (v4.4-rc5) broken on powerpc: bpf.c:28:4: error: #error __NR_bpf not defined. libbpf does not support your arch. # error __NR_bpf not defined. libbpf does not support your arch. ^ Fix this by including tools/scripts/Makefile.arch for the proper $ARCH macro. While at it, remove redundant LP64 macro definition. Also, since libbpf require $(srctree) now, detect the path of srctree like perf. Signed-off-by:

Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Acked-by:

Jiri Olsa <jolsa@kernel.org> Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Cc: Wang Nan <wangnan0@huawei.com> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1452520124-2073-10-git-send-email-wangnan0@huawei.com [Use tools/scripts/Makefile.arch] Signed-off-by:

Wang Nan <wangnan0@huawei.com> Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/lib/bpf/Makefile

+8 −8

Original line number	Diff line number	Diff line
		@@ -6,6 +6,12 @@ BPF_EXTRAVERSION = 1

		MAKEFLAGS += --no-print-directory

		ifeq ($(srctree),)
		srctree := $(patsubst %/,%,$(dir $(shell pwd)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		#$(info Determined 'srctree' to be $(srctree))
		endif

		# Makefiles suck: This macro sets a default value of $(2) for the
		# variable named by $(1), unless the variable has been set by
		@@ -31,7 +37,8 @@ INSTALL = install
		DESTDIR ?=
		DESTDIR_SQ = '$(subst ','\'',$(DESTDIR))'

		LP64 := $(shell echo __LP64__ \| ${CC} ${CFLAGS} -E -x c - \| tail -n 1)
		include $(srctree)/tools/scripts/Makefile.arch

		ifeq ($(LP64), 1)
		libdir_relative = lib64
		else
		@@ -57,13 +64,6 @@ ifndef VERBOSE
		VERBOSE = 0
		endif

		ifeq ($(srctree),)
		srctree := $(patsubst %/,%,$(dir $(shell pwd)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		#$(info Determined 'srctree' to be $(srctree))
		endif

		FEATURE_USER = .libbpf
		FEATURE_TESTS = libelf libelf-getphdrnum libelf-mmap bpf
		FEATURE_DISPLAY = libelf bpf

Admin message