diff options
| author | Kees Cook <keescook@chromium.org> | 2013-12-19 11:35:58 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-11-11 02:14:18 +0100 |
| commit | 7c30d93b2370f1a1218eaa0a6b8a204ac9b4c551 (patch) | |
| tree | 85ef42725ffa3c6b099069be33b3e87723209c0e /arch/arm/Makefile | |
| parent | 91b3f7fd82031174e95468db97a5c4f6353dc56f (diff) | |
stackprotector: Unify the HAVE_CC_STACKPROTECTOR logic between architectures
Instead of duplicating the CC_STACKPROTECTOR Kconfig and
Makefile logic in each architecture, switch to using
HAVE_CC_STACKPROTECTOR and keep everything in one place. This
retains the x86-specific bug verification scripts.
Signed-off-by: Kees Cook <keescook@chromium.org>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-mips@linux-mips.org
Cc: linux-arch@vger.kernel.org
Link: http://lkml.kernel.org/r/1387481759-14535-2-git-send-email-keescook@chromium.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
[davidb@codeaurora.org: Simple Kconfig merge resolution]
Git-commit: 19952a92037e752f9d3bbbad552d596f9a56e146
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Change-Id: I6e430de3c79306724e90ea1178f242145c39f059
Signed-off-by: David Brown <davidb@codeaurora.org>
Conflicts:
arch/x86/Kconfig
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index cde9a59a2..e65051882 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -39,10 +39,6 @@ ifeq ($(CONFIG_FRAME_POINTER),y) KBUILD_CFLAGS +=-fno-omit-frame-pointer -mapcs -mno-sched-prolog endif -ifeq ($(CONFIG_CC_STACKPROTECTOR),y) -KBUILD_CFLAGS +=-fstack-protector -endif - ifeq ($(CONFIG_CPU_BIG_ENDIAN),y) KBUILD_CPPFLAGS += -mbig-endian AS += -EB |