Revert "[Feature][T8TSK-58][TCAM_T800_SW_0263] support ASLR"
This reverts commit 3f2e7d93a1543817223469fd30a751af58bf89ce.
Reason for revert: <INSERT REASONING HERE>
Change-Id: I259c94febb25e8bcb2908fb92f9ab0e618563db2
diff --git a/meta/meta-mediatek-mt2735/conf/base/auto2735evb-ivt-main/local.conf.sample b/meta/meta-mediatek-mt2735/conf/base/auto2735evb-ivt-main/local.conf.sample
index 2747987..1273859 100644
--- a/meta/meta-mediatek-mt2735/conf/base/auto2735evb-ivt-main/local.conf.sample
+++ b/meta/meta-mediatek-mt2735/conf/base/auto2735evb-ivt-main/local.conf.sample
@@ -1,5 +1,3 @@
require conf/base/local-common.conf
-require ${PWD}/../meta/poky/meta/conf/distro/include/security_flags.inc
-
MACHINE ??= "auto2735evb-ivt-main"
diff --git a/meta/poky/meta/conf/distro/include/security_flags.inc b/meta/poky/meta/conf/distro/include/security_flags.inc
index af5d22c..620978a 100644
--- a/meta/poky/meta/conf/distro/include/security_flags.inc
+++ b/meta/poky/meta/conf/distro/include/security_flags.inc
@@ -13,7 +13,7 @@
lcl_maybe_fortify ?= "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=2',d)}"
# Error on use of format strings that represent possible security problems
-SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security"
+SECURITY_STRINGFORMAT ?= "-Wformat -Wformat-security -Werror=format-security"
# Inject pie flags into compiler flags if not configured with gcc itself
# especially useful with external toolchains
@@ -23,9 +23,8 @@
SECURITY_STACK_PROTECTOR ?= "-fstack-protector-strong"
-SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${SECURITY_STRINGFORMAT}"
-
-SECURITY_NO_PIE_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_STRINGFORMAT}"
+SECURITY_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${SECURITY_PIE_CFLAGS} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
+SECURITY_NO_PIE_CFLAGS ?= "${SECURITY_STACK_PROTECTOR} ${lcl_maybe_fortify} ${SECURITY_STRINGFORMAT}"
SECURITY_LDFLAGS ?= "${SECURITY_STACK_PROTECTOR} -Wl,-z,relro,-z,now"
SECURITY_X_LDFLAGS ?= "${SECURITY_STACK_PROTECTOR} -Wl,-z,relro"