summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2013-10-07 07:47:00 (GMT)
committerIngo Molnar <mingo@kernel.org>2013-10-09 06:48:31 (GMT)
commit430be5ab0a50a9116c689b2b2ea7acd7a635aabe (patch)
tree52f43ebb3597e897e7e661d5a79d9c3d0e7887f9
parent90ac5422b617fcab0c6f02249502ffc17dfbf6e3 (diff)
downloadlinux-430be5ab0a50a9116c689b2b2ea7acd7a635aabe.tar.xz
tools/perf/build: Split out feature check: 'stackprotector'
Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Jiri Olsa <jolsa@redhat.com> Link: http://lkml.kernel.org/n/tip-eyLYjhskzn6qxkoyjtjic4ap@git.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--tools/perf/config/Makefile3
-rw-r--r--tools/perf/config/feature-checks/Makefile4
-rw-r--r--tools/perf/config/feature-checks/test-stackprotector.c6
3 files changed, 12 insertions, 1 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 1a67371..9f94912 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -104,6 +104,7 @@ $(info done)
FEATURE_TESTS = \
hello \
stackprotector-all \
+ stackprotector \
libnuma
$(foreach test,$(FEATURE_TESTS),$(call feature_check,$(test),$(test)))
@@ -112,7 +113,7 @@ ifeq ($(feature-stackprotector-all), 1)
CFLAGS += -fstack-protector-all
endif
-ifeq ($(call try-cc,$(SOURCE_HELLO),$(CFLAGS) -Werror -Wstack-protector,-Wstack-protector),y)
+ifeq ($(feature-stackprotector), 1)
CFLAGS += -Wstack-protector
endif
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 7538c14..46b7650 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -2,6 +2,7 @@
FILES= \
test-hello \
test-stackprotector-all \
+ test-stackprotector \
test-libnuma
CC := $(CC) -MD
@@ -18,6 +19,9 @@ test-hello:
test-stackprotector-all:
$(BUILD) -Werror -fstack-protector-all
+test-stackprotector:
+ $(BUILD) -Werror -fstack-protector
+
test-libnuma:
$(BUILD) -lnuma
diff --git a/tools/perf/config/feature-checks/test-stackprotector.c b/tools/perf/config/feature-checks/test-stackprotector.c
new file mode 100644
index 0000000..c9f398d
--- /dev/null
+++ b/tools/perf/config/feature-checks/test-stackprotector.c
@@ -0,0 +1,6 @@
+#include <stdio.h>
+
+int main(void)
+{
+ return puts("hi");
+}