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

Commit 847fd031 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Leave 'linux' defined on x86/x86-64, like arm."

parents 1076c568 2c8e9552

core/combo/TARGET_linux-x86.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,6 @@ android_config_h := $(call select-android-config-h,target_linux-x86) 




$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \

$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \

			-O2 \

			-O2 \

			-Ulinux \

			-Wa,--noexecstack \

			-Wa,--noexecstack \

			-Werror=format-security \

			-Werror=format-security \

			-D_FORTIFY_SOURCE=2 \

			-D_FORTIFY_SOURCE=2 \

core/combo/TARGET_linux-x86_64.mk

+0 −1
Original line number Original line Diff line number Diff line
@@ -106,7 +106,6 @@ KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) 




TARGET_GLOBAL_CFLAGS += \

TARGET_GLOBAL_CFLAGS += \

			-O2 \

			-O2 \

			-Ulinux \

			-Wa,--noexecstack \

			-Wa,--noexecstack \

			-Werror=format-security \

			-Werror=format-security \

			-D_FORTIFY_SOURCE=2 \

			-D_FORTIFY_SOURCE=2 \