[tip:perf/core] perf tools: Remove superfluous ARCH Makefile includes
From: tip-bot for Jiri Olsa
Date: Wed Apr 13 2016 - 03:14:29 EST
Commit-ID: 860b69f1d533de39fa70784768008d0eaf242e5c
Gitweb: http://git.kernel.org/tip/860b69f1d533de39fa70784768008d0eaf242e5c
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Tue, 5 Apr 2016 17:01:52 +0200
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Wed, 6 Apr 2016 11:00:01 -0300
perf tools: Remove superfluous ARCH Makefile includes
Link: http://lkml.kernel.org/n/tip-yk6brsq3opuotr9by18xlkr8@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
tools/perf/Makefile.perf | 2 --
tools/perf/config/Makefile | 3 ---
2 files changed, 5 deletions(-)
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 000ea21..58aed81 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -297,8 +297,6 @@ endif
# because maintaining the nesting to match is a pain. If
# we had "elif" things would have been much nicer...
--include arch/$(ARCH)/Makefile
-
ifneq ($(OUTPUT),)
CFLAGS += -I$(OUTPUT)
endif
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 6f8f643..d1e2b85 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -295,9 +295,6 @@ ifndef NO_LIBELF
CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT
endif
- # include ARCH specific config
- -include $(src-perf)/arch/$(ARCH)/Makefile
-
ifndef NO_DWARF
ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)
msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);