summaryrefslogtreecommitdiffstats
path: root/libcutils/arch-x86
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-10-10 16:46:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-10 16:46:50 +0000
commitbe18538d4373364b6c9b1149a24974976169f52f (patch)
treeb342d83653de9e0de3dc4f7467b54df656bbdd7b /libcutils/arch-x86
parent2de8102d422f48eec44fe8782cd2411f04f1dcb2 (diff)
parent4aa51cd46842d4e821bd5536fd80ee0a796f3a83 (diff)
downloadsystem_core-be18538d4373364b6c9b1149a24974976169f52f.zip
system_core-be18538d4373364b6c9b1149a24974976169f52f.tar.gz
system_core-be18538d4373364b6c9b1149a24974976169f52f.tar.bz2
Merge "Cleanup x86 flags and memset versions"
Diffstat (limited to 'libcutils/arch-x86')
-rw-r--r--libcutils/arch-x86/android_memset16.S7
-rw-r--r--libcutils/arch-x86/android_memset32.S8
2 files changed, 0 insertions, 15 deletions
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
-