aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-03-01 14:46:28 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-03-18 14:09:25 -0400
commit48e383eca276c02d4bd5c5b468b07b73ca52dd08 (patch)
tree2b197729b4849fd3169eba7217dc036a26522bf1 /tools
parent07efbf528c9f72bad67cc5a8c3afaa9c937fde43 (diff)
perf build: Rename display_lib into feature_display
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-t72o4nwx81owjv14y43b2wpf@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/config/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 198609e1d696..f80fc7ec8036 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -793,7 +793,7 @@ ifeq ($(dwarf-post-unwind),1)
793 PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text)) 793 PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text))
794endif 794endif
795 795
796# The $(display_lib) 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 PERF-FEATURES file)
@@ -802,24 +802,24 @@ endif
802 802
803ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)") 803ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)")
804 $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES) 804 $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES)
805 display_lib := 1 805 feature_display := 1
806endif 806endif
807 807
808feature_check = $(eval $(feature_check_code)) 808feature_check = $(eval $(feature_check_code))
809define feature_check_code 809define feature_check_code
810 ifneq ($(feature-$(1)), 1) 810 ifneq ($(feature-$(1)), 1)
811 display_lib := 1 811 feature_display := 1
812 endif 812 endif
813endef 813endef
814 814
815$(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat))) 815$(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat)))
816 816
817ifeq ($(VF),1) 817ifeq ($(VF),1)
818 display_lib := 1 818 feature_display := 1
819 display_vf := 1 819 display_vf := 1
820endif 820endif
821 821
822ifeq ($(display_lib),1) 822ifeq ($(feature_display),1)
823 $(info ) 823 $(info )
824 $(info Auto-detecting system features:) 824 $(info Auto-detecting system features:)
825 $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),)) 825 $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),))
@@ -841,7 +841,7 @@ ifeq ($(display_vf),1)
841 $(call feature_print_var,LIBDW_DIR) 841 $(call feature_print_var,LIBDW_DIR)
842endif 842endif
843 843
844ifeq ($(display_lib),1) 844ifeq ($(feature_display),1)
845 $(info ) 845 $(info )
846endif 846endif
847 847