diff options
Diffstat (limited to 'meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch')
| -rw-r--r-- | meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch b/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch new file mode 100644 index 0000000000..74a838704c --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools/0001-purgatory-Disabling-GCC-s-stack-protection.patch @@ -0,0 +1,64 @@ +From 8227f5a583ad4523059ba2531263e625ac01cd40 Mon Sep 17 00:00:00 2001 +From: Kevin Hao <kexin.hao@windriver.com> +Date: Tue, 28 Apr 2015 20:25:12 +0800 +Subject: [PATCH] purgatory: Disabling GCC's stack protection + +If the GCC's stack protection is enabled by default, the purgatory will +also be built with this option. But it makes no sense to enable this +for the purgatory code, and would cause error when we are trying to +relocate the purgatory codes because symbol like __stack_chk_fail is +unresolved. Instead of disabling this for some archs specifically, +disable it for all the archs. + +Upstream-Status: Pending + +Signed-off-by: Kevin Hao <kexin.hao@windriver.com> +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + purgatory/Makefile | 3 ++- + purgatory/arch/ppc64/Makefile | 2 +- + purgatory/arch/s390/Makefile | 1 - + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/purgatory/Makefile b/purgatory/Makefile +index 1945702..a25b262 100644 +--- a/purgatory/Makefile ++++ b/purgatory/Makefile +@@ -47,7 +47,8 @@ purgatory/sha256.o: $(srcdir)/util_lib/sha256.c + $(PURGATORY): CC=$(TARGET_CC) + $(PURGATORY): CFLAGS+=$(PURGATORY_EXTRA_CFLAGS) \ + $($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ +- -Os -fno-builtin -ffreestanding ++ -Os -fno-builtin -ffreestanding \ ++ -fno-stack-protector + + $(PURGATORY): CPPFLAGS=$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \ + -I$(srcdir)/purgatory/include \ +diff --git a/purgatory/arch/ppc64/Makefile b/purgatory/arch/ppc64/Makefile +index 6c58fa2..8ca2719 100644 +--- a/purgatory/arch/ppc64/Makefile ++++ b/purgatory/arch/ppc64/Makefile +@@ -9,7 +9,7 @@ ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/console-ppc64.c + ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/crashdump_backup.c + ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/misc.S + +-ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float -fno-stack-protector \ ++ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -msoft-float \ + -fno-exceptions + ppc64_PURGATORY_EXTRA_ASFLAGS += -m64 + ifeq ($(SUBARCH),BE) +diff --git a/purgatory/arch/s390/Makefile b/purgatory/arch/s390/Makefile +index 09749bd..c94cc3c 100644 +--- a/purgatory/arch/s390/Makefile ++++ b/purgatory/arch/s390/Makefile +@@ -2,7 +2,6 @@ + # Purgatory s390 + # + +-s390_PURGATORY_EXTRA_CFLAGS += -fno-stack-protector + s390_PURGATORY_SRCS += purgatory/arch/s390/console-s390.c + s390_PURGATORY_SRCS += purgatory/arch/s390/setup-s390.S + s390_PURGATORY_SRCS += purgatory/arch/s390/purgatory-s390.c +-- +1.9.1 + |