From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762114AbcALKLH (ORCPT ); Tue, 12 Jan 2016 05:11:07 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56572 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762005AbcALKLC (ORCPT ); Tue, 12 Jan 2016 05:11:02 -0500 Date: Tue, 12 Jan 2016 02:10:46 -0800 From: "tip-bot for Naveen N. Rao" Message-ID: Cc: linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com, naveen.n.rao@linux.vnet.ibm.com, lizefan@huawei.com, hpa@zytor.com, tglx@linutronix.de, sukadev@linux.vnet.ibm.com Reply-To: sukadev@linux.vnet.ibm.com, naveen.n.rao@linux.vnet.ibm.com, hpa@zytor.com, tglx@linutronix.de, lizefan@huawei.com, wangnan0@huawei.com, mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, jolsa@kernel.org In-Reply-To: <1452520124-2073-10-git-send-email-wangnan0@huawei.com> References: <1452520124-2073-10-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf bpf: Fix build breakage due to libbpf Git-Commit-ID: d5ef3140351450d240f864208317f5665e7bbd1c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d5ef3140351450d240f864208317f5665e7bbd1c Gitweb: http://git.kernel.org/tip/d5ef3140351450d240f864208317f5665e7bbd1c Author: Naveen N. Rao AuthorDate: Mon, 11 Jan 2016 13:48:00 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 11 Jan 2016 19:22:21 -0300 perf bpf: Fix build breakage due to libbpf 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 Acked-by: Jiri Olsa Cc: Sukadev Bhattiprolu Cc: Wang Nan Cc: Zefan Li 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 Signed-off-by: Arnaldo Carvalho de Melo --- tools/lib/bpf/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 84e0e98..fc1bc75 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -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