summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-03-04 14:51:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-05 15:50:22 +0000
commit4df2d018a14103040d4350f50e3d42192d3f395d (patch)
tree9d686dc43451d0efe75899565f0c39f4446a520e
parentb1a75ba1d828b6f5e5b863937a0bb4683f352817 (diff)
downloadpoky-4df2d018a14103040d4350f50e3d42192d3f395d.tar.gz
security_flags: Update to correctly link X modules
Remove the -z,now flag from linking [YOCTO #5885] (From OE-Core rev: 545986bfbfe20f2b6e8a46e88e2cc3007ca344e6) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/distro/include/security_flags.inc9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/conf/distro/include/security_flags.inc b/meta/conf/distro/include/security_flags.inc
index a871a3fe0f..fa604fd5a4 100644
--- a/meta/conf/distro/include/security_flags.inc
+++ b/meta/conf/distro/include/security_flags.inc
@@ -1,6 +1,7 @@
1SECURITY_CFLAGS ?= "-fstack-protector-all -pie -fpie -D_FORTIFY_SOURCE=2" 1SECURITY_CFLAGS ?= "-fstack-protector-all -pie -fpie -D_FORTIFY_SOURCE=2"
2SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-all -D_FORTIFY_SOURCE=2" 2SECURITY_NO_PIE_CFLAGS ?= "-fstack-protector-all -D_FORTIFY_SOURCE=2"
3SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now" 3SECURITY_LDFLAGS ?= "-Wl,-z,relro,-z,now"
4SECURITY_X_LDFLAGS ?= "-Wl,-z,relro"
4 5
5# powerpc does not get on with pie for reasons not looked into as yet 6# powerpc does not get on with pie for reasons not looked into as yet
6SECURITY_CFLAGS_powerpc = "-fstack-protector-all -D_FORTIFY_SOURCE=2" 7SECURITY_CFLAGS_powerpc = "-fstack-protector-all -D_FORTIFY_SOURCE=2"
@@ -72,3 +73,11 @@ SECURITY_CFLAGS_pn-pulseaudio = "${SECURITY_NO_PIE_CFLAGS}"
72 73
73TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}" 74TARGET_CFLAGS_append = " ${SECURITY_CFLAGS}"
74TARGET_LDFLAGS_append = " ${SECURITY_LDFLAGS}" 75TARGET_LDFLAGS_append = " ${SECURITY_LDFLAGS}"
76
77SECURITY_LDFLAGS_pn-xf86-video-fbdev = "${SECURITY_X_LDFLAGS}"
78SECURITY_LDFLAGS_pn-xf86-video-intel = "${SECURITY_X_LDFLAGS}"
79SECURITY_LDFLAGS_pn-xf86-video-omapfb = "${SECURITY_X_LDFLAGS}"
80SECURITY_LDFLAGS_pn-xf86-video-omap = "${SECURITY_X_LDFLAGS}"
81SECURITY_LDFLAGS_pn-xf86-video-vesa = "${SECURITY_X_LDFLAGS}"
82SECURITY_LDFLAGS_pn-xf86-video-vmware = "${SECURITY_X_LDFLAGS}"
83SECURITY_LDFLAGS_pn-xserver-xorg = "${SECURITY_X_LDFLAGS}"