aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 467106bc5fab..507350566e7f 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -203,7 +203,7 @@ endef
203# the rule that uses them - an example for that is the 'bionic' 203# the rule that uses them - an example for that is the 'bionic'
204# feature check. ] 204# feature check. ]
205# 205#
206CORE_FEATURE_TESTS = \ 206FEATURE_TESTS = \
207 backtrace \ 207 backtrace \
208 dwarf \ 208 dwarf \
209 fortify-source \ 209 fortify-source \
@@ -262,7 +262,7 @@ VF_FEATURE_TESTS = \
262 compile-32 \ 262 compile-32 \
263 compile-x32 263 compile-x32
264 264
265# Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features. 265# Set FEATURE_CHECK_(C|LD)FLAGS-all for all FEATURE_TESTS features.
266# If in the future we need per-feature checks/flags for features not 266# If in the future we need per-feature checks/flags for features not
267# mentioned in this list we need to refactor this ;-). 267# mentioned in this list we need to refactor this ;-).
268set_test_all_flags = $(eval $(set_test_all_flags_code)) 268set_test_all_flags = $(eval $(set_test_all_flags_code))
@@ -271,7 +271,7 @@ define set_test_all_flags_code
271 FEATURE_CHECK_LDFLAGS-all += $(FEATURE_CHECK_LDFLAGS-$(1)) 271 FEATURE_CHECK_LDFLAGS-all += $(FEATURE_CHECK_LDFLAGS-$(1))
272endef 272endef
273 273
274$(foreach feat,$(CORE_FEATURE_TESTS),$(call set_test_all_flags,$(feat))) 274$(foreach feat,$(FEATURE_TESTS),$(call set_test_all_flags,$(feat)))
275 275
276# 276#
277# Special fast-path for the 'all features are available' case: 277# Special fast-path for the 'all features are available' case:
@@ -286,10 +286,10 @@ ifeq ($(feature-all), 1)
286 # 286 #
287 # test-all.c passed - just set all the core feature flags to 1: 287 # test-all.c passed - just set all the core feature flags to 1:
288 # 288 #
289 $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_set,$(feat))) 289 $(foreach feat,$(FEATURE_TESTS),$(call feature_set,$(feat)))
290else 290else
291 $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(addsuffix .bin,$(CORE_FEATURE_TESTS)) >/dev/null 2>&1) 291 $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(addsuffix .bin,$(FEATURE_TESTS)) >/dev/null 2>&1)
292 $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_check,$(feat))) 292 $(foreach feat,$(FEATURE_TESTS),$(call feature_check,$(feat)))
293endif 293endif
294 294
295ifeq ($(feature-stackprotector-all), 1) 295ifeq ($(feature-stackprotector-all), 1)