From f0a48555744ce9ae74ae34df8cb061aa0d0cf9d3 Mon Sep 17 00:00:00 2001 From: Pavel Chupin Date: Thu, 10 Oct 2013 20:26:31 +0400 Subject: [PATCH] Cleanup x86 and x86_64 flags -mandroid, -D__ANDROID__ is on by the toolchain; -msse3 moved to llvm_config, it seems it's required only there; __cxa_atexit is provided by libc now; USE_SSE2 should not be used anywhere, it's always true; remove -mstackreallign and -mfpmath=sse as useless for x86_64; Change-Id: Ib7739f6522c375c09de10d22616c48a493841c4c Signed-off-by: Pavel Chupin --- core/combo/TARGET_linux-x86.mk | 21 --------------------- core/combo/TARGET_linux-x86_64.mk | 21 +-------------------- core/llvm_config.mk | 1 + 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 92eeee5c00..b685459d18 100755 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -138,15 +138,7 @@ android_config_h := $(call select-android-config-h,target_linux-x86) TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) -# XXX: Not sure this is still needed. Must check with our toolchains. -TARGET_GLOBAL_CPPFLAGS += \ - -fno-use-cxa-atexit - TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) -TARGET_GLOBAL_CFLAGS += -mmmx -TARGET_GLOBAL_CFLAGS += -msse -TARGET_GLOBAL_CFLAGS += -DUSE_SSE2 -msse2 -TARGET_GLOBAL_CFLAGS += -msse3 ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3! TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3 @@ -167,19 +159,6 @@ ifeq ($(ARCH_X86_HAVE_AES_NI),true) TARGET_GLOBAL_CFLAGS += -maes endif -# XXX: This flag is probably redundant. I believe our toolchain always sets -# it by default. Consider for removal. -# -TARGET_GLOBAL_CFLAGS += -mbionic - -# XXX: This flag is probably redundant. The macro should be defined by our -# toolchain binaries automatically (as a compiler built-in). -# Check with: $BINPREFIX-gcc -dM -E < /dev/null -# -# Consider for removal. -# -TARGET_GLOBAL_CFLAGS += -D__ANDROID__ - TARGET_GLOBAL_LDFLAGS += -m32 TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 86d29f568c..c0eefdd6b6 100755 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -138,13 +138,7 @@ android_config_h := $(call select-android-config-h,target_linux-x86) TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h)) TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS) -# XXX: Not sure this is still needed. Must check with our toolchains. -TARGET_GLOBAL_CPPFLAGS += \ - -fno-use-cxa-atexit - -TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) \ - -mstackrealign \ - -mfpmath=sse +TARGET_GLOBAL_CFLAGS += $(arch_variant_cflags) ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3! TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3 @@ -165,19 +159,6 @@ ifeq ($(ARCH_X86_HAVE_AES_NI),true) TARGET_GLOBAL_CFLAGS += -maes endif -# XXX: This flag is probably redundant. I believe our toolchain always sets -# it by default. Consider for removal. -# -TARGET_GLOBAL_CFLAGS += -mbionic - -# XXX: This flag is probably redundant. The macro should be defined by our -# toolchain binaries automatically (as a compiler built-in). -# Check with: $BINPREFIX-gcc -dM -E < /dev/null -# -# Consider for removal. -# -TARGET_GLOBAL_CFLAGS += -D__ANDROID__ - TARGET_GLOBAL_LDFLAGS += -m64 TARGET_GLOBAL_LDFLAGS += -Wl,-z,noexecstack diff --git a/core/llvm_config.mk b/core/llvm_config.mk index b8705585b1..19fe790b9b 100644 --- a/core/llvm_config.mk +++ b/core/llvm_config.mk @@ -71,6 +71,7 @@ ifeq ($(TARGET_ARCH),x86) RS_TRIPLE := i686-unknown-linux CLANG_CONFIG_EXTRA_ASFLAGS += \ -target i686-linux-android \ + -msse3 \ -nostdlibinc \ -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS)