diff options
author | Wang Nan <wangnan0@huawei.com> | 2016-01-11 08:47:58 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-01-11 17:22:20 -0500 |
commit | 935e6bd310f20d3371ae6bd6f01dd3430a4123b6 (patch) | |
tree | 06769b7f5e4074788f4d767272148697c478006f /tools/perf/tests | |
parent | 8f9e05fb298f16c0cda2e7e78b603331a79f9c10 (diff) |
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 <naveen.n.rao@linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Signed-off-by: Wang Nan <wangnan0@huawei.com>
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 <acme@kernel.org>
Diffstat (limited to 'tools/perf/tests')
-rw-r--r-- | tools/perf/tests/make | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/perf/tests/make b/tools/perf/tests/make index 130be7c88824..df38decc48c3 100644 --- a/tools/perf/tests/make +++ b/tools/perf/tests/make | |||
@@ -1,3 +1,5 @@ | |||
1 | include ../scripts/Makefile.include | ||
2 | |||
1 | ifndef MK | 3 | ifndef MK |
2 | ifeq ($(MAKECMDGOALS),) | 4 | ifeq ($(MAKECMDGOALS),) |
3 | # no target specified, trigger the whole suite | 5 | # no target specified, trigger the whole suite |
@@ -12,7 +14,19 @@ endif | |||
12 | else | 14 | else |
13 | PERF := . | 15 | PERF := . |
14 | 16 | ||
15 | include config/Makefile.arch | 17 | # As per kernel Makefile, avoid funny character set dependencies |
18 | unexport LC_ALL | ||
19 | LC_COLLATE=C | ||
20 | LC_NUMERIC=C | ||
21 | export LC_COLLATE LC_NUMERIC | ||
22 | |||
23 | ifeq ($(srctree),) | ||
24 | srctree := $(patsubst %/,%,$(dir $(shell pwd))) | ||
25 | srctree := $(patsubst %/,%,$(dir $(srctree))) | ||
26 | #$(info Determined 'srctree' to be $(srctree)) | ||
27 | endif | ||
28 | |||
29 | include $(srctree)/tools/scripts/Makefile.arch | ||
16 | 30 | ||
17 | # FIXME looks like x86 is the only arch running tests ;-) | 31 | # FIXME looks like x86 is the only arch running tests ;-) |
18 | # we need some IS_(32/64) flag to make this generic | 32 | # we need some IS_(32/64) flag to make this generic |