aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-03-01 14:50:47 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-03-18 14:10:44 -0400
commit4ae61202b31c91259ff45cc9744b8a95add6b52a (patch)
treee1df5623d61c570883132f3eb5ecda133735c0b1 /tools
parenta15599ac6bd2e6196f3aeb2fb08af73129621fe1 (diff)
perf build: Rename PERF-FEATURES into FEATURE-DUMP
Preparing for feature checks separation, moving related stuff under 'FEATURE*' namespace. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <david.ahern@oracle.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/n/tip-v9oo22ra70rrk1dy495a7bjc@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/Makefile.perf2
-rw-r--r--tools/perf/config/Makefile12
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index ec4c063ed9f3..e323eab10694 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -528,7 +528,7 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean
528 $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete 528 $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
529 $(Q)$(RM) .config-detected 529 $(Q)$(RM) .config-detected
530 $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 530 $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
531 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* 531 $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
532 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean 532 $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
533 $(python-clean) 533 $(python-clean)
534 534
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 370ad509422b..b98ab77ca179 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -786,22 +786,22 @@ define feature_print_text_code
786 MSG = $(shell printf '...%30s: %s' $(1) $(2)) 786 MSG = $(shell printf '...%30s: %s' $(1) $(2))
787endef 787endef
788 788
789PERF_FEATURES := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat)))) 789FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat))))
790PERF_FEATURES_FILE := $(shell touch $(OUTPUT)PERF-FEATURES; cat $(OUTPUT)PERF-FEATURES) 790FEATURE_DUMP_FILE := $(shell touch $(OUTPUT)FEATURE-DUMP; cat $(OUTPUT)FEATURE-DUMP)
791 791
792ifeq ($(dwarf-post-unwind),1) 792ifeq ($(dwarf-post-unwind),1)
793 PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text)) 793 FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text))
794endif 794endif
795 795
796# The $(feature_display) controls the default detection message 796# The $(feature_display) controls the default detection message
797# output. It's set if: 797# output. It's set if:
798# - detected features differes from stored features from 798# - detected features differes from stored features from
799# last build (in PERF-FEATURES file) 799# last build (in FEATURE-DUMP file)
800# - one of the $(FEATURE_DISPLAY) is not detected 800# - one of the $(FEATURE_DISPLAY) is not detected
801# - VF is enabled 801# - VF is enabled
802 802
803ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)") 803ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)")
804 $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES) 804 $(shell echo "$(FEATURE_DUMP)" > $(OUTPUT)FEATURE-DUMP)
805 feature_display := 1 805 feature_display := 1
806endif 806endif
807 807