summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorJunling Zheng <zhengjunling@huawei.com>2020-06-03 22:08:41 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-04 13:27:32 +0100
commit171a8360f5e5d89a3396bb7295fc19ce9d4eff20 (patch)
tree8082a25fb6bb4899617a8b44afec1f3184b8b644 /meta/conf
parent07223656d2060464b6830562b1bb8c7cbd230896 (diff)
downloadpoky-171a8360f5e5d89a3396bb7295fc19ce9d4eff20.tar.gz
security_flags: Remove stack protector flag from LDFLAGS
SECURITY_LDFLAGS contains stack protector flag inappropriately, which has already be contained in SECURITY_CFLAGS. Let's remove it from SECURITY_LDFLAGS. (From OE-Core rev: 549cce578b859986e37900bf15c1bf904d33e47b) Signed-off-by: Junling Zheng <zhengjunling@huawei.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/distro/include/security_flags.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index 568d03693c..a9e5b311af 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -26,8 +26,8 @@ SECURITY_STACK_PROTECTOR ?= "-fstack-protector-strong"
26SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" 26SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
27SECURITY_NO_PIE_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}" 27SECURITY_NO_PIE_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
28 28
29SECURITY_LDFLAGS ?= "${SECURITY_STACK_PROTECTOR} -Wl,-z,relro,-z,now" 29SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now"
30SECURITY_X_LDFLAGS ?= "${SECURITY_STACK_PROTECTOR} -Wl,-z,relro" 30SECURITY_X_LDFLAGS ?= "-Wl,-z,relro"
31 31
32# powerpc does not get on with pie for reasons not looked into as yet 32# powerpc does not get on with pie for reasons not looked into as yet
33GCCPIE_powerpc = "" 33GCCPIE_powerpc = ""