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

Commit 9b5e64a8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am 33f33371: am 165fdf42: Merge "Remove "-mstackrealign" option from all x86 builds." 

* commit '33f33371':
  Remove "-mstackrealign" option from all x86 builds.
parents 63cea7b2 33f33371

core/combo/HOST_linux-x86.mk

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ $(combo_2nd_arch_prefix)HOST_AR := $($(combo_2nd_arch_prefix)HOST_TOOLCHAIN_PRE 
$(combo_2nd_arch_prefix)HOST_TOOLCHAIN_FOR_CLANG := prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.8/



# We expect SSE3 floating point math.

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -mstackrealign -msse3 -mfpmath=sse -m32 -Wa,--noexecstack -march=prescott

$(combo_2nd_arch_prefix)HOST_GLOBAL_CFLAGS += -msse3 -mfpmath=sse -m32 -Wa,--noexecstack -march=prescott

$(combo_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS += -m32 -Wl,-z,noexecstack



ifneq ($(strip $(BUILD_HOST_static)),)

core/combo/arch/x86/haswell.mk

+0 −1
Original line number Diff line number Diff line
@@ -13,6 +13,5 @@ ARCH_X86_HAVE_MOVBE := true 
# CFLAGS for this arch

arch_variant_cflags := \

	-march=core-avx2 \

	-mstackrealign \

	-mfpmath=sse \

core/combo/arch/x86/ivybridge.mk

+0 −1
Original line number Diff line number Diff line
@@ -13,6 +13,5 @@ ARCH_X86_HAVE_MOVBE := false 
# CFLAGS for this arch

arch_variant_cflags := \

	-march=core-avx-i \

	-mstackrealign \

	-mfpmath=sse \

core/combo/arch/x86/sandybridge.mk

+0 −1
Original line number Diff line number Diff line
@@ -13,6 +13,5 @@ ARCH_X86_HAVE_MOVBE := false 
# CFLAGS for this arch

arch_variant_cflags := \

	-march=corei7-avx \

	-mstackrealign \

	-mfpmath=sse \

core/combo/arch/x86/silvermont.mk

+0 −1
Original line number Diff line number Diff line
@@ -15,6 +15,5 @@ ARCH_X86_HAVE_MOVBE := true 
# CFLAGS for this arch

arch_variant_cflags := \

	-march=slm \

	-mstackrealign \

	-mfpmath=sse \