diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-19 11:15:56 -0800 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-11-19 11:15:56 -0800 |
| commit | b20288680e3708b02197b3dde107ef2c5728e60a (patch) | |
| tree | 6a43c289408c28324312b7f3b4d2b32aa8af722c | |
| parent | 493306f7c318d632186bebd732708d4299e66a62 (diff) | |
| parent | ccec9c45d946d4a6fb3275469e39c4d7d203d9ab (diff) | |
| download | build-b20288680e3708b02197b3dde107ef2c5728e60a.zip build-b20288680e3708b02197b3dde107ef2c5728e60a.tar.gz build-b20288680e3708b02197b3dde107ef2c5728e60a.tar.bz2 | |
Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index b3dd1d6..ed05bd2 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -76,7 +76,7 @@ endif KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) TARGET_GLOBAL_CFLAGS += \ - -march=i686 \ + -Ulinux \ -m32 \ -fPIC \ -include $(call select-android-config-h,target_linux-x86) @@ -84,6 +84,16 @@ TARGET_GLOBAL_CFLAGS += \ TARGET_GLOBAL_CPPFLAGS += \ -fno-use-cxa-atexit +ifeq ($(TARGET_ARCH_VARIANT),x86-atom) + TARGET_GLOBAL_CFLAGS += -mtune=i686 -DUSE_SSSE3 -DUSE_SSE2 -mfpmath=sse -msse2 +else + TARGET_GLOBAL_CFLAGS += -march=i686 +endif + +TARGET_GLOBAL_CFLAGS += -D__ANDROID__ +TARGET_GLOBAL_LDFLAGS += -m32 + + TARGET_C_INCLUDES := \ $(libc_root)/arch-x86/include \ $(libc_root)/include \ @@ -111,7 +121,7 @@ $(TARGET_CXX) \ $(TARGET_GLOBAL_LDFLAGS) \ -nostdlib -Wl,-soname,$(notdir $@) \ -shared -Bsymbolic \ - -fPIC -march=i686 \ + $(TARGET_GLOBAL_CFLAGS) \ $(TARGET_GLOBAL_LD_DIRS) \ $(TARGET_CRTBEGIN_SO_O) \ $(PRIVATE_ALL_OBJECTS) \ @@ -161,13 +171,4 @@ $(TARGET_CXX) \ $(TARGET_CRTEND_O) endef -ifeq ($(TARGET_ARCH_VARIANT),x86-atom) - # Enable recent IA friendly memory routines (such as for Atom) - # These will not work on the earlier x86 machines - TARGET_GLOBAL_CFLAGS += -mtune=i686 -DUSE_SSSE3 -DUSE_SSE2 -endif - -TARGET_GLOBAL_CFLAGS += -D__ANDROID__ -TARGET_GLOBAL_LDFLAGS += -m32 - endif #simulator |