am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"

* commit 'aa62be65eddc68b29ab9d7993f0311738d24bfcf':
  Use SSE2 enhanced memset for capable x86 processors
This commit is contained in:
Ying Wang 2013-09-26 10:55:27 -07:00 committed by Android Git Automerger
commit 1690a5a694
1 changed files with 15 additions and 11 deletions

View File

@ -125,18 +125,22 @@ LOCAL_SRC_FILES := $(commonSources) \
uevent.c
ifeq ($(TARGET_ARCH),arm)
LOCAL_SRC_FILES += arch-arm/memset32.S
LOCAL_SRC_FILES += arch-arm/memset32.S
else # !arm
ifeq ($(TARGET_ARCH_VARIANT),x86-atom)
LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
else # !x86-atom
ifeq ($(TARGET_ARCH),mips)
LOCAL_SRC_FILES += arch-mips/android_memset.c
else # !mips
LOCAL_SRC_FILES += memory.c
endif # !mips
endif # !x86-atom
ifeq ($(TARGET_ARCH),x86)
ifeq ($(ARCH_X86_HAVE_SSE2),true)
LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -DUSE_SSE2
LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
else # !ARCH_X86_HAVE_SSE2
LOCAL_SRC_FILES += memory.c
endif # !ARCH_X86_HAVE_SSE2
else # !x86
ifeq ($(TARGET_ARCH),mips)
LOCAL_SRC_FILES += arch-mips/android_memset.c
else # !mips
LOCAL_SRC_FILES += memory.c
endif # !mips
endif # !x86
endif # !arm
LOCAL_C_INCLUDES := $(libcutils_c_includes) $(KERNEL_HEADERS)