aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@redhat.com>2013-12-03 08:09:15 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-12-04 11:46:36 -0500
commite6d7cee1ecac099786d3ba7a71b1e69cf0ae9a7b (patch)
tree2a2cc69ab376e0393adab1ab9784e21cc888bae5 /tools/perf
parent906049c8276eb99af997f73d602649a98e360035 (diff)
perf tools: Remove stackprotector feature check
We use -fstack-protector-all option to enable stack protecting for all available functions. There's no reason for enabling -Wstack-protector to get warning for unprotected functions. Removing stackprotector feature check which was used to enable the -Wstack-protector option. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1386076182-14484-2-git-send-email-jolsa@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/config/Makefile5
-rw-r--r--tools/perf/config/feature-checks/Makefile6
-rw-r--r--tools/perf/config/feature-checks/test-stackprotector.c6
3 files changed, 1 insertions, 16 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 36e66ac40abc..0761d57e5fb6 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -141,7 +141,6 @@ CORE_FEATURE_TESTS = \
141 libslang \ 141 libslang \
142 libunwind \ 142 libunwind \
143 on-exit \ 143 on-exit \
144 stackprotector \
145 stackprotector-all \ 144 stackprotector-all \
146 timerfd 145 timerfd
147 146
@@ -209,10 +208,6 @@ ifeq ($(feature-stackprotector-all), 1)
209 CFLAGS += -fstack-protector-all 208 CFLAGS += -fstack-protector-all
210endif 209endif
211 210
212ifeq ($(feature-stackprotector), 1)
213 CFLAGS += -Wstack-protector
214endif
215
216ifeq ($(DEBUG),0) 211ifeq ($(DEBUG),0)
217 ifeq ($(feature-fortify-source), 1) 212 ifeq ($(feature-fortify-source), 1)
218 CFLAGS += -D_FORTIFY_SOURCE=2 213 CFLAGS += -D_FORTIFY_SOURCE=2
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
index 87e790017c69..b8bb749c3392 100644
--- a/tools/perf/config/feature-checks/Makefile
+++ b/tools/perf/config/feature-checks/Makefile
@@ -26,7 +26,6 @@ FILES= \
26 test-libunwind-debug-frame \ 26 test-libunwind-debug-frame \
27 test-on-exit \ 27 test-on-exit \
28 test-stackprotector-all \ 28 test-stackprotector-all \
29 test-stackprotector \
30 test-timerfd 29 test-timerfd
31 30
32CC := $(CC) -MD 31CC := $(CC) -MD
@@ -38,7 +37,7 @@ BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
38############################### 37###############################
39 38
40test-all: 39test-all:
41 $(BUILD) -Werror -fstack-protector -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma $(LIBUNWIND_LIBS) -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl 40 $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma $(LIBUNWIND_LIBS) -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl
42 41
43test-hello: 42test-hello:
44 $(BUILD) 43 $(BUILD)
@@ -46,9 +45,6 @@ test-hello:
46test-stackprotector-all: 45test-stackprotector-all:
47 $(BUILD) -Werror -fstack-protector-all 46 $(BUILD) -Werror -fstack-protector-all
48 47
49test-stackprotector:
50 $(BUILD) -Werror -fstack-protector -Wstack-protector
51
52test-fortify-source: 48test-fortify-source:
53 $(BUILD) -O2 -Werror -D_FORTIFY_SOURCE=2 49 $(BUILD) -O2 -Werror -D_FORTIFY_SOURCE=2
54 50
diff --git a/tools/perf/config/feature-checks/test-stackprotector.c b/tools/perf/config/feature-checks/test-stackprotector.c
deleted file mode 100644
index c9f398d87868..000000000000
--- a/tools/perf/config/feature-checks/test-stackprotector.c
+++ /dev/null
@@ -1,6 +0,0 @@
1#include <stdio.h>
2
3int main(void)
4{
5 return puts("hi");
6}