From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762091AbcALKKp (ORCPT ); Tue, 12 Jan 2016 05:10:45 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56560 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762005AbcALKKl (ORCPT ); Tue, 12 Jan 2016 05:10:41 -0500 Date: Tue, 12 Jan 2016 02:10:25 -0800 From: tip-bot for Wang Nan Message-ID: Cc: wangnan0@huawei.com, jolsa@kernel.org, sukadev@linux.vnet.ibm.com, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org, lizefan@huawei.com, acme@kernel.org, naveen.n.rao@linux.vnet.ibm.com Reply-To: mingo@kernel.org, lizefan@huawei.com, linux-kernel@vger.kernel.org, acme@kernel.org, naveen.n.rao@linux.vnet.ibm.com, hpa@zytor.com, sukadev@linux.vnet.ibm.com, tglx@linutronix.de, wangnan0@huawei.com, jolsa@kernel.org In-Reply-To: <1452520124-2073-8-git-send-email-wangnan0@huawei.com> References: <1452520124-2073-8-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools: Move Makefile.arch from perf/ config to tools/scripts Git-Commit-ID: 935e6bd310f20d3371ae6bd6f01dd3430a4123b6 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: 935e6bd310f20d3371ae6bd6f01dd3430a4123b6 Gitweb: http://git.kernel.org/tip/935e6bd310f20d3371ae6bd6f01dd3430a4123b6 Author: Wang Nan AuthorDate: Mon, 11 Jan 2016 13:47:58 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 11 Jan 2016 19:22:20 -0300 tools: Move Makefile.arch from perf/config to tools/scripts After this patch other directories can use this architecture detector without directly including it from perf's directory. Libbpf would utilize it to get proper $(ARCH) so it can receive correct uapi include directory. Tested-by: Naveen N. Rao Acked-by: Jiri Olsa Cc: Sukadev Bhattiprolu Cc: Zefan Li Cc: pi3orama@163.com Signed-off-by: Wang Nan Link: http://lkml.kernel.org/r/1452520124-2073-8-git-send-email-wangnan0@huawei.com [ Add missing srctree definition in tests/make ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/config/Makefile | 2 +- tools/perf/tests/make | 16 +++++++++++++++- tools/{perf/config => scripts}/Makefile.arch | 0 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 0793c76..7545ba60 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -17,7 +17,7 @@ detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) -include $(src-perf)/config/Makefile.arch +include $(srctree)/tools/scripts/Makefile.arch $(call detected_var,ARCH) diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 130be7c..df38dec 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make @@ -1,3 +1,5 @@ +include ../scripts/Makefile.include + ifndef MK ifeq ($(MAKECMDGOALS),) # no target specified, trigger the whole suite @@ -12,7 +14,19 @@ endif else PERF := . -include config/Makefile.arch +# As per kernel Makefile, avoid funny character set dependencies +unexport LC_ALL +LC_COLLATE=C +LC_NUMERIC=C +export LC_COLLATE LC_NUMERIC + +ifeq ($(srctree),) +srctree := $(patsubst %/,%,$(dir $(shell pwd))) +srctree := $(patsubst %/,%,$(dir $(srctree))) +#$(info Determined 'srctree' to be $(srctree)) +endif + +include $(srctree)/tools/scripts/Makefile.arch # FIXME looks like x86 is the only arch running tests ;-) # we need some IS_(32/64) flag to make this generic diff --git a/tools/perf/config/Makefile.arch b/tools/scripts/Makefile.arch similarity index 100% rename from tools/perf/config/Makefile.arch rename to tools/scripts/Makefile.arch