1From 9bf9155804652c0b3a94af9723c79b6de430187b Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Mon, 24 Feb 2020 00:04:06 +0100
4Subject: [PATCH] Makefile: fix stack-protector tests
5
6Rename fnostack_protector into fno_stack_protector and
7fnostack_protector_all into fnostack_protector_all otherwise build will
8fail if -fstack-protector is passed by the toolchain
9
10Fixes:
11 - http://autobuild.buildroot.org/results/ad689b08173548af21dd1fb0e827fd561de6dfef
12
13Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
14[Upstream status: sent to kvm@vger.kernel.org]
15---
16 Makefile | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/Makefile b/Makefile
20index 767b6c6..754ed65 100644
21--- a/Makefile
22+++ b/Makefile
23@@ -55,8 +55,8 @@ COMMON_CFLAGS += -Wignored-qualifiers -Werror
24
25 frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer
26 fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "")
27-fnostack_protector := $(call cc-option, -fno-stack-protector, "")
28-fnostack_protector_all := $(call cc-option, -fno-stack-protector-all, "")
29+fno_stack_protector := $(call cc-option, -fno-stack-protector, "")
30+fno_stack_protector_all := $(call cc-option, -fno-stack-protector-all, "")
31 wno_frame_address := $(call cc-option, -Wno-frame-address, "")
32 fno_pic := $(call cc-option, -fno-pic, "")
33 no_pie := $(call cc-option, -no-pie, "")
34--
352.25.0
36
37