Messages in this thread Patch in this message | | | Date | Fri, 19 Nov 2010 10:51:03 +0100 | From | Andi Kleen <> | Subject | [PATCH 1/2] perf: Fix compilation on gcc 4.0.2 v2 |
| |
[Updated version, this time using the try-cc command. I remove the useless -Wvolatile-register-var warning. I don't think any kernel coder will really do such a thing in the first place.]
- Fix includes - Remove useless -Wvolatile-register-var - Move -Wstack-protector into stack protector test
Signed-off-by: Andi Kleen <ak@linux.intel.com>
diff --git a/tools/perf/Makefile b/tools/perf/Makefile index d1db0f6..993ecdb 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -201,13 +201,11 @@ EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wshadow EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Winit-self EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wpacked EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wredundant-decls -EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstack-protector EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wstrict-aliasing=3 EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-default EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wswitch-enum EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wno-system-headers EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wundef -EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wvolatile-register-var EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wwrite-strings EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wbad-function-cast EXTRA_WARNINGS := $(EXTRA_WARNINGS) -Wmissing-declarations @@ -287,8 +285,8 @@ endif -include feature-tests.mak -ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -fstack-protector-all),y) - CFLAGS := $(CFLAGS) -fstack-protector-all +ifeq ($(call try-cc,$(SOURCE_HELLO),-Werror -fstack-protector-all -Wstack-protector),y) + CFLAGS := $(CFLAGS) -fstack-protector-all -Wstack-protector endif diff --git a/tools/perf/util/include/linux/bitops.h b/tools/perf/util/include/linux/bitops.h index bb4ac2e..50ce182 100644 --- a/tools/perf/util/include/linux/bitops.h +++ b/tools/perf/util/include/linux/bitops.h @@ -1,6 +1,7 @@ #ifndef _PERF_LINUX_BITOPS_H_ #define _PERF_LINUX_BITOPS_H_ +#include <linux/compiler.h> #include <linux/kernel.h> #include <asm/hweight.h> -- ak@linux.intel.com -- Speaking for myself only.
| |