Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6d7cee1 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 906049c8

tools/perf/config/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ CORE_FEATURE_TESTS = \ 
	libslang			\

	libunwind			\

	on-exit				\

	stackprotector			\

	stackprotector-all		\

	timerfd
@@ -209,10 +208,6 @@ ifeq ($(feature-stackprotector-all), 1) 
  CFLAGS += -fstack-protector-all

endif



ifeq ($(feature-stackprotector), 1)

  CFLAGS += -Wstack-protector

endif



ifeq ($(DEBUG),0)

  ifeq ($(feature-fortify-source), 1)

    CFLAGS += -D_FORTIFY_SOURCE=2

tools/perf/config/feature-checks/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ FILES= \ 
	test-libunwind-debug-frame	\

	test-on-exit			\

	test-stackprotector-all		\

	test-stackprotector		\

	test-timerfd



CC := $(CC) -MD
@@ -38,7 +37,7 @@ BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c 
###############################



test-all:

	$(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

	$(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



test-hello:

	$(BUILD)
@@ -46,9 +45,6 @@ test-hello: 
test-stackprotector-all:

	$(BUILD) -Werror -fstack-protector-all



test-stackprotector:

	$(BUILD) -Werror -fstack-protector -Wstack-protector



test-fortify-source:

	$(BUILD) -O2 -Werror -D_FORTIFY_SOURCE=2

tools/perf/config/feature-checks/test-stackprotector.c

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#include <stdio.h>



int main(void)

{

	return puts("hi");

}