summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBruce Beare <bruce.j.beare@intel.com>2011-12-09 16:21:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-09 16:21:00 -0800
commit381581613aab988acc6f9d5b459fd4f533d8c2a5 (patch)
tree758656cae91cbd61f0ab7f7dc48255382ca20d14 /core
parente7a33465ac64218e146d72b2af0fd3a862128be1 (diff)
parent3343b27c534fb4ea238f2feaa0d9346840ee2f92 (diff)
downloadbuild-381581613aab988acc6f9d5b459fd4f533d8c2a5.zip
build-381581613aab988acc6f9d5b459fd4f533d8c2a5.tar.gz
build-381581613aab988acc6f9d5b459fd4f533d8c2a5.tar.bz2
am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
* commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92': x86: The default ATOM BSP flags need to be in sync with the NDK ABI
Diffstat (limited to 'core')
-rw-r--r--core/combo/TARGET_linux-x86.mk19
1 files changed, 18 insertions, 1 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 0fb6edc..3d09276 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -96,8 +96,25 @@ TARGET_GLOBAL_CPPFLAGS += \
-fno-use-cxa-atexit
ifeq ($(TARGET_ARCH_VARIANT),x86-atom)
- TARGET_GLOBAL_CFLAGS += -march=atom -mstackrealign -DUSE_SSSE3 -DUSE_SSE2 -mfpmath=sse
+ # Basic ATOM flags.
+ TARGET_GLOBAL_CFLAGS += -march=atom -mstackrealign -mfpmath=sse
+
+ # There are various levels of ATOM processors out there. Different ones have different
+ # capabilities. This first define matches the NDK's minimum ABI requirements.
+ # Note: Not all of the flags set here are actually used in Android. They are provided
+ # to allow for the addition of corresponding optimizations.
+ TARGET_GLOBAL_CFLAGS += -DUSE_MMX -DUSE_SSE -DUSE_SSE2 -DUSE_SSE3
+
+ # If you wish to build a BSP that will only be used on hardware that has additional
+ # available instructions, enable them here. By default, this is commented off so that
+ # the default images can run on all processors that are NDK ABI compliant.
+ # TARGET_GLOBAL_CFLAGS += -DUSE_SSSE3
else
+ # Plain 'x86' - lowest common denominator. This should run pretty much on any hardware.
+ #
+ # Note: The NDK's ABI (see the NDK ABI documentation) requires many of the more recent
+ # instruction set additions. You can build an "x86" BSP that will run on very old hardware,
+ # but it won't be able to run much of the x86 NDK compliant code.
TARGET_GLOBAL_CFLAGS += -march=i686
endif