diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-10 16:46:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-10-10 16:46:50 +0000 |
| commit | be18538d4373364b6c9b1149a24974976169f52f (patch) | |
| tree | b342d83653de9e0de3dc4f7467b54df656bbdd7b /libcutils | |
| parent | 2de8102d422f48eec44fe8782cd2411f04f1dcb2 (diff) | |
| parent | 4aa51cd46842d4e821bd5536fd80ee0a796f3a83 (diff) | |
| download | system_core-be18538d4373364b6c9b1149a24974976169f52f.zip system_core-be18538d4373364b6c9b1149a24974976169f52f.tar.gz system_core-be18538d4373364b6c9b1149a24974976169f52f.tar.bz2 | |
Merge "Cleanup x86 flags and memset versions"
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 8 | ||||
| -rw-r--r-- | libcutils/arch-x86/android_memset16.S | 7 | ||||
| -rw-r--r-- | libcutils/arch-x86/android_memset32.S | 8 |
3 files changed, 2 insertions, 21 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 57fc021..7117103 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -128,12 +128,8 @@ ifeq ($(TARGET_ARCH),arm) LOCAL_SRC_FILES += arch-arm/memset32.S else # !arm 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 + 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 diff --git a/libcutils/arch-x86/android_memset16.S b/libcutils/arch-x86/android_memset16.S index b1f09cb..f8b79bd 100644 --- a/libcutils/arch-x86/android_memset16.S +++ b/libcutils/arch-x86/android_memset16.S @@ -17,16 +17,9 @@ * Contributed by: Intel Corporation */ -#if defined(USE_SSE2) - # include "cache_wrapper.S" # undef __i686 # define USE_AS_ANDROID # define sse2_memset16_atom android_memset16 # include "sse2-memset16-atom.S" -#else - -# include "memset16.S" - -#endif diff --git a/libcutils/arch-x86/android_memset32.S b/libcutils/arch-x86/android_memset32.S index 1fb2ffe..6249fce 100644 --- a/libcutils/arch-x86/android_memset32.S +++ b/libcutils/arch-x86/android_memset32.S @@ -17,17 +17,9 @@ * Contributed by: Intel Corporation */ -#if defined(USE_SSE2) - # include "cache_wrapper.S" # undef __i686 # define USE_AS_ANDROID # define sse2_memset32_atom android_memset32 # include "sse2-memset32-atom.S" -#else - -# include "memset32.S" - -#endif - |