diff options
| author | Henrik Smiding <henrik.smiding@intel.com> | 2014-05-16 13:26:08 +0200 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-06-05 18:51:44 -0700 |
| commit | 86a1600fb6291e3ba31d1366aa3ab8bff7d87dd7 (patch) | |
| tree | 96a93256ac8baf888acc8aeae5e15ddccb4d5c92 /libcutils/Android.mk | |
| parent | 4ca26ce8ec3436727a92eb35d1698d2ae540faef (diff) | |
| download | system_core-86a1600fb6291e3ba31d1366aa3ab8bff7d87dd7.zip system_core-86a1600fb6291e3ba31d1366aa3ab8bff7d87dd7.tar.gz system_core-86a1600fb6291e3ba31d1366aa3ab8bff7d87dd7.tar.bz2 | |
Port libcutils memset16/32 to x86_64.
Port libcutils memset16/32 assembly SSE2 optimizations to x86_64
architecture. Ensures the same performance on 64-bit arch.
Change-Id: I874a71a884c0d28a152933ddff9cb886c9a6e99e
Signed-off-by: Henrik Smiding <henrik.smiding@intel.com>
Diffstat (limited to 'libcutils/Android.mk')
| -rw-r--r-- | libcutils/Android.mk | 43 |
1 files changed, 27 insertions, 16 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index ca1fd15..c0faed4 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -82,6 +82,7 @@ ifneq ($(HOST_OS),windows) LOCAL_CFLAGS += -Werror endif LOCAL_MULTILIB := both +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_STATIC_LIBRARY) @@ -95,6 +96,7 @@ LOCAL_CFLAGS += $(hostSmpFlag) -m64 ifneq ($(HOST_OS),windows) LOCAL_CFLAGS += -Werror endif +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_STATIC_LIBRARY) # Tests for host @@ -108,6 +110,7 @@ endif LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c LOCAL_STATIC_LIBRARIES := liblog LOCAL_MODULE_TAGS := optional +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_HOST_EXECUTABLE) @@ -121,30 +124,36 @@ LOCAL_SRC_FILES := $(commonSources) \ ashmem-dev.c \ debugger.c \ klog.c \ + memory.c \ partition_utils.c \ properties.c \ qtaguid.c \ trace.c \ - uevent.c - -ifeq ($(TARGET_ARCH),arm) - LOCAL_SRC_FILES += arch-arm/memset32.S -else # !arm - ifeq ($(TARGET_ARCH),x86) - LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32 - LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c - 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 + uevent.c \ + +LOCAL_SRC_FILES_arm += \ + arch-arm/memset32.S \ + +LOCAL_SRC_FILES_mips += \ + arch-mips/android_memset.c \ + +LOCAL_SRC_FILES_x86 += \ + arch-x86/android_memset16.S \ + arch-x86/android_memset32.S \ + +LOCAL_SRC_FILES_x86_64 += \ + arch-x86_64/android_memset16_SSE2-atom.S \ + arch-x86_64/android_memset32_SSE2-atom.S \ + +LOCAL_CFLAGS_arm += -DHAVE_MEMSET16 -DHAVE_MEMSET32 +LOCAL_CFLAGS_mips += -DHAVE_MEMSET16 -DHAVE_MEMSET32 +LOCAL_CFLAGS_x86 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 +LOCAL_CFLAGS_x86_64 += -DHAVE_MEMSET16 -DHAVE_MEMSET32 LOCAL_C_INCLUDES := $(libcutils_c_includes) LOCAL_STATIC_LIBRARIES := liblog LOCAL_CFLAGS += $(targetSmpFlag) -Werror +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -155,6 +164,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libcutils liblog LOCAL_SHARED_LIBRARIES := liblog LOCAL_CFLAGS += $(targetSmpFlag) -Werror LOCAL_C_INCLUDES := $(libcutils_c_includes) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_SHARED_LIBRARY) include $(CLEAR_VARS) @@ -163,6 +173,7 @@ LOCAL_CFLAGS += -DTEST_STR_PARMS -Werror LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE_TAGS := optional +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk include $(BUILD_EXECUTABLE) include $(call all-makefiles-under,$(LOCAL_PATH)) |