ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am be18538d: Merge "Cleanup x86 flags and memset versions"

Browse source 
* commit 'be18538d4373364b6c9b1149a24974976169f52f':
  Cleanup x86 flags and memset versions
This commit is contained in:
Elliott Hughes 2013-10-10 10:33:43 -07:00 • committed by Android Git Automerger
commit 5baecee3c6
3 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libcutils/Android.mk
View file

@ -128,12 +128,8 @@ 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),x86) ifeq ($(TARGET_ARCH),x86)
ifeq ($(ARCH_X86_HAVE_SSE2),true) LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32
LOCAL_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32 -DUSE_SSE2 LOCAL_SRC_FILES += arch-x86/android_memset16.S arch-x86/android_memset32.S memory.c
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 else # !x86
ifeq ($(TARGET_ARCH),mips) ifeq ($(TARGET_ARCH),mips)
LOCAL_SRC_FILES += arch-mips/android_memset.c LOCAL_SRC_FILES += arch-mips/android_memset.c

7
libcutils/arch-x86/android_memset16.S
View file

@ -17,16 +17,9 @@
* Contributed by: Intel Corporation * Contributed by: Intel Corporation
*/ */
#if defined(USE_SSE2)
# include "cache_wrapper.S" # include "cache_wrapper.S"
# undef __i686 # undef __i686
# define USE_AS_ANDROID # define USE_AS_ANDROID
# define sse2_memset16_atom android_memset16 # define sse2_memset16_atom android_memset16
# include "sse2-memset16-atom.S" # include "sse2-memset16-atom.S"
#else
# include "memset16.S"
#endif

8
libcutils/arch-x86/android_memset32.S
View file

@ -17,17 +17,9 @@
* Contributed by: Intel Corporation * Contributed by: Intel Corporation
*/ */
#if defined(USE_SSE2)
# include "cache_wrapper.S" # include "cache_wrapper.S"
# undef __i686 # undef __i686
# define USE_AS_ANDROID # define USE_AS_ANDROID
# define sse2_memset32_atom android_memset32 # define sse2_memset32_atom android_memset32
# include "sse2-memset32-atom.S" # include "sse2-memset32-atom.S"
#else
# include "memset32.S"
#endif