From 4aa51cd46842d4e821bd5536fd80ee0a796f3a83 Mon Sep 17 00:00:00 2001
From: Pavel Chupin <pavel.v.chupin@intel.com>
Date: Thu, 10 Oct 2013 20:19:15 +0400
Subject: [PATCH] Cleanup x86 flags and memset versions

ARCH_X86_HAVE_SSE2 is always true

Change-Id: I680493d14280aafad5448aec727e8d9a84a6db00
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
---
 libcutils/Android.mk                  | 8 ++------
 libcutils/arch-x86/android_memset16.S | 7 -------
 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 57fc02191..711710374 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 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
-