From ae2d47a47f764b51c933a48774f94fda2ed80153 Mon Sep 17 00:00:00 2001 From: Alexander Ivchenko Date: Tue, 16 Sep 2014 16:30:41 +0400 Subject: [PATCH] Remove "-mstackrealign" option from all x86 builds. For ndk docs change, please refer to: https://android-review.googlesource.com/#/c/110100/ Change-Id: I8428e7a979eb02441066aeeee43ce693d4d0dc8d Signed-off-by: Alexander Ivchenko --- core/combo/HOST_linux-x86.mk | 2 +- core/combo/arch/x86/haswell.mk | 1 - core/combo/arch/x86/ivybridge.mk | 1 - core/combo/arch/x86/sandybridge.mk | 1 - core/combo/arch/x86/silvermont.mk | 1 - core/combo/arch/x86/x86-atom.mk | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk index 78a9f8ec4f..09cf27135e 100644 --- a/core/combo/HOST_linux-x86.mk +++ b/core/combo/HOST_linux-x86.mk @@ -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)),) diff --git a/core/combo/arch/x86/haswell.mk b/core/combo/arch/x86/haswell.mk index 0b16b80e1e..b3922c0451 100644 --- a/core/combo/arch/x86/haswell.mk +++ b/core/combo/arch/x86/haswell.mk @@ -13,6 +13,5 @@ ARCH_X86_HAVE_MOVBE := true # CFLAGS for this arch arch_variant_cflags := \ -march=core-avx2 \ - -mstackrealign \ -mfpmath=sse \ diff --git a/core/combo/arch/x86/ivybridge.mk b/core/combo/arch/x86/ivybridge.mk index a8e66f37c6..c9fc33b013 100644 --- a/core/combo/arch/x86/ivybridge.mk +++ b/core/combo/arch/x86/ivybridge.mk @@ -13,6 +13,5 @@ ARCH_X86_HAVE_MOVBE := false # CFLAGS for this arch arch_variant_cflags := \ -march=core-avx-i \ - -mstackrealign \ -mfpmath=sse \ diff --git a/core/combo/arch/x86/sandybridge.mk b/core/combo/arch/x86/sandybridge.mk index 8e474a5b7d..bca595373d 100644 --- a/core/combo/arch/x86/sandybridge.mk +++ b/core/combo/arch/x86/sandybridge.mk @@ -13,6 +13,5 @@ ARCH_X86_HAVE_MOVBE := false # CFLAGS for this arch arch_variant_cflags := \ -march=corei7-avx \ - -mstackrealign \ -mfpmath=sse \ diff --git a/core/combo/arch/x86/silvermont.mk b/core/combo/arch/x86/silvermont.mk index 3a8718d1a9..d064b1df27 100644 --- a/core/combo/arch/x86/silvermont.mk +++ b/core/combo/arch/x86/silvermont.mk @@ -15,6 +15,5 @@ ARCH_X86_HAVE_MOVBE := true # CFLAGS for this arch arch_variant_cflags := \ -march=slm \ - -mstackrealign \ -mfpmath=sse \ diff --git a/core/combo/arch/x86/x86-atom.mk b/core/combo/arch/x86/x86-atom.mk index 508a0afb5d..3800350a39 100644 --- a/core/combo/arch/x86/x86-atom.mk +++ b/core/combo/arch/x86/x86-atom.mk @@ -11,6 +11,5 @@ ARCH_X86_HAVE_POPCNT := false # popcnt is not supported by current Atom CPUs # CFLAGS for this arch arch_variant_cflags := \ -march=atom \ - -mstackrealign \ -mfpmath=sse \