diff options
| author | Ying Wang <wangying@android.com> | 2013-09-26 10:56:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-26 10:56:52 -0700 |
| commit | f47c01da1834e7046bc7120642f672ccaabd5d1a (patch) | |
| tree | 392645cebaf2dd4d3864d2e6eb2ef09a389c725a /libcutils | |
| parent | 71ddce59275e70c34015b0fa87c10384ab1876cd (diff) | |
| parent | 1690a5a6943d4e4b65d5e4dcd077702c2c8f40a0 (diff) | |
| download | system_core-f47c01da1834e7046bc7120642f672ccaabd5d1a.tar.gz system_core-f47c01da1834e7046bc7120642f672ccaabd5d1a.tar.bz2 system_core-f47c01da1834e7046bc7120642f672ccaabd5d1a.zip | |
am 1690a5a6: am aa62be65: Merge "Use SSE2 enhanced memset for capable x86 processors"
* commit '1690a5a6943d4e4b65d5e4dcd077702c2c8f40a0':
Use SSE2 enhanced memset for capable x86 processors
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 0fd5a57e0..62f4290c2 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -115,18 +115,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) |