Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19e85a25 authored Dec 14, 2015 by Elliott Hughes Committed by Gerrit Code Review Dec 14, 2015

Merge "Be smarter about stack-protector on the host."

parents 7abad39b 505e4ec6

core/clang/HOST_x86_common.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@ CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_ASFLAGS := \

		CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS := \
		-integrated-as

		CLANG_CONFIG_x86_DARWIN_HOST_EXTRA_CFLAGS += -fstack-protector-strong
		endif

		ifeq ($(HOST_OS),linux)
		@@ -16,6 +18,8 @@ CLANG_CONFIG_x86_LINUX_HOST_EXTRA_ASFLAGS := \
		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG)

		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CFLAGS += -fstack-protector-strong

		ifneq ($(strip $($(clang_2nd_arch_prefix)HOST_IS_64_BIT)),)
		CLANG_CONFIG_x86_LINUX_HOST_EXTRA_CPPFLAGS := \
		--gcc-toolchain=$($(clang_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG) \

core/combo/HOST_linux-x86.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ endif # BUILD_HOST_static
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -fPIC \
		-no-canonical-prefixes \

		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong
		$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector

		# Workaround differences in inttypes.h between host and target.
		# See bug 12708004.

core/combo/HOST_linux-x86_64.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,7 @@ endif # BUILD_HOST_static
		HOST_GLOBAL_CFLAGS += -fPIC \
		-no-canonical-prefixes \

		HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-strong
		HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector

		# Workaround differences in inttypes.h between host and target.
		# See bug 12708004.