diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-04 14:42:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 14:42:11 -0700 |
| commit | 2e840a500ee698d9d039035c5ab04f30b677c7dc (patch) | |
| tree | 901370e0ace334864b14b7b93d2db4957e3ac98b /core/combo/TARGET_linux-x86.mk | |
| parent | 8c6a66e959ab3c333214d35927b719498086bf6c (diff) | |
| parent | a035abc55455a50da7b242dad1bca55fa28617a9 (diff) | |
| download | build-2e840a500ee698d9d039035c5ab04f30b677c7dc.zip build-2e840a500ee698d9d039035c5ab04f30b677c7dc.tar.gz build-2e840a500ee698d9d039035c5ab04f30b677c7dc.tar.bz2 | |
am a035abc5: am 1303aa28: Merge "Remove useless x86 options that were always hardcoded on."
* commit 'a035abc55455a50da7b242dad1bca55fa28617a9':
Remove useless x86 options that were always hardcoded on.
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rwxr-xr-x | core/combo/TARGET_linux-x86.mk | 34 |
1 files changed, 4 insertions, 30 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 6a868d5..b4e4b7d 100755 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -143,19 +143,11 @@ 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_MMX),true) - TARGET_GLOBAL_CFLAGS += -DUSE_MMX -mmmx -endif -ifeq ($(ARCH_X86_HAVE_SSE),true) - TARGET_GLOBAL_CFLAGS += -DUSE_SSE -msse -endif -ifeq ($(ARCH_X86_HAVE_SSE2),true) - TARGET_GLOBAL_CFLAGS += -DUSE_SSE2 -msse2 -endif -ifeq ($(ARCH_X86_HAVE_SSE3),true) - TARGET_GLOBAL_CFLAGS += -DUSE_SSE3 -msse3 -endif ifeq ($(ARCH_X86_HAVE_SSSE3),true) # yes, really SSSE3, not SSE3! TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3 -mssse3 endif @@ -285,21 +277,3 @@ $(hide) $(PRIVATE_CXX) \ -Wl,--end-group \ $(if $(filter true,$(PRIVATE_NO_CRT)),,$(PRIVATE_TARGET_CRTEND_O)) endef - -# Special check for x86 NDK ABI compatibility. -# The TARGET_CPU_ABI variable should be defined in BoardConfig.mk to 'x86' -# *only* if the platform image is compatible with the NDK x86 ABI. -# -# We perform a small check here to ensure that nothing bad can happen. -# -ifeq ($(TARGET_CPU_ABI),x86) - ifneq (true-true-true-true,$(ARCH_X86_HAVE_MMX)-$(ARCH_X86_HAVE_SSE)-$(ARCH_X86_HAVE_SSE2)-$(ARCH_X86_HAVE_SSE3)) - $(info ERROR: Your x86 platform image is not compatible with the NDK x86 ABI) - $(info As such, you should *not* define TARGET_CPU_ABI to 'x86' in your BoardConfig.mk) - $(info to ensure that your device will not be mistakenly listed as compatible by - $(info the Android Market. Also, it is likely that the image will fail the CTS tests) - $(info Please undefine TARGET_CPU_ABI in your BoardConfig.mk, or select the value 'none') - $(info The corresponding image will still be able to run Dalvik-based Android applications) - $(error Aborting build! Please fix your BoardConfig.mk) - endif -endif |