Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5baecee3 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'be18538d':
  Cleanup x86 flags and memset versions
parents 9492b6e7 be18538d

libcutils/Android.mk

+2 −6
Original line number Diff line number Diff line
@@ -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_CFLAGS += -DHAVE_MEMSET16 -DHAVE_MEMSET32

        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

libcutils/arch-x86/android_memset16.S

+0 −7
Original line number Diff line number Diff line
@@ -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

libcutils/arch-x86/android_memset32.S

+0 −8
Original line number Diff line number Diff line
@@ -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