diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-10 10:40:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 10:40:10 -0700 |
| commit | 7f7b12b8ebba299868505984d6cf15b11f75aadf (patch) | |
| tree | f59dddd4ed54555a55a6ab075f80912af5aef893 /libcutils | |
| parent | f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5 (diff) | |
| parent | 5baecee3c6bf348b77b8785bcd8e35362a3507fb (diff) | |
| download | system_core-7f7b12b8ebba299868505984d6cf15b11f75aadf.tar.gz system_core-7f7b12b8ebba299868505984d6cf15b11f75aadf.tar.bz2 system_core-7f7b12b8ebba299868505984d6cf15b11f75aadf.zip | |
am 5baecee3: am be18538d: Merge "Cleanup x86 flags and memset versions"
* commit '5baecee3c6bf348b77b8785bcd8e35362a3507fb':
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 62f4290c2..9111674f2 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -118,12 +118,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 b1f09cba3..f8b79bd23 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 1fb2ffefe..6249fcece 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 - |