Merge "Use SSE2 enhanced memset for capable x86 processors"
This commit is contained in:
commit
aa62be65ed
1 changed files with 15 additions and 11 deletions
|
|
@ -125,18 +125,22 @@ LOCAL_SRC_FILES := $(commonSources) \
|
||||||
uevent.c
|
uevent.c
|
||||||
|
|
||||||
ifeq ($(TARGET_ARCH),arm)
|
ifeq ($(TARGET_ARCH),arm)
|
||||||
LOCAL_SRC_FILES += arch-arm/memset32.S
|
LOCAL_SRC_FILES += arch-arm/memset32.S
|
||||||
else # !arm
|
else # !arm
|
||||||
ifeq ($(TARGET_ARCH_VARIANT),x86-atom)
|
ifeq ($(TARGET_ARCH),x86)
|
||||||
LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
|
ifeq ($(ARCH_X86_HAVE_SSE2),true)
|
||||||
LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
|
LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -DUSE_SSE2
|
||||||
else # !x86-atom
|
LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
|
||||||
ifeq ($(TARGET_ARCH),mips)
|
else # !ARCH_X86_HAVE_SSE2
|
||||||
LOCAL_SRC_FILES += arch-mips/android_memset.c
|
LOCAL_SRC_FILES += memory.c
|
||||||
else # !mips
|
endif # !ARCH_X86_HAVE_SSE2
|
||||||
LOCAL_SRC_FILES += memory.c
|
else # !x86
|
||||||
endif # !mips
|
ifeq ($(TARGET_ARCH),mips)
|
||||||
endif # !x86-atom
|
LOCAL_SRC_FILES += arch-mips/android_memset.c
|
||||||
|
else # !mips
|
||||||
|
LOCAL_SRC_FILES += memory.c
|
||||||
|
endif # !mips
|
||||||
|
endif # !x86
|
||||||
endif # !arm
|
endif # !arm
|
||||||
|
|
||||||
LOCAL_C_INCLUDES := $(libcutils_c_includes) $(KERNEL_HEADERS)
|
LOCAL_C_INCLUDES := $(libcutils_c_includes) $(KERNEL_HEADERS)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue