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