commit 6bf08d131f4109088b7fa1e53196513636c49e9b
author Jean-Baptiste Queru <jbq@google.com> Fri Sep 10 13:03:15 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 10 13:03:15 2010 -0700
tree dff44252717e57e2fd109df76335b76d9f66bce6
parent d7b156d2a38e58ab1e5f9e6a4b420588aeb78b46
parent 3558834c565bbfe96dfcf233373c3814b4655347

am 3558834c: Merge "Move the atom optimization flags into TARGET_linux-x86.mk."

Merge commit '3558834c565bbfe96dfcf233373c3814b4655347' into gingerbread-plus-aosp

* commit '3558834c565bbfe96dfcf233373c3814b4655347':
  Move the atom optimization flags into TARGET_linux-x86.mk.

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 8b54f3e..32f39ca 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -498,13 +498,7 @@
     libc_common_cflags += -DHAVE_ARM_TLS_REGISTER
   endif
 else # !arm
-  ifeq ($(TARGET_ARCH),x86)
-    libc_crt_target_cflags := -m32
-
-    # Enable recent IA friendly memory routines (such as for Atom)
-    # These will not work on the earlier x86 machines
-    libc_common_cflags += -mtune=i686 -DUSE_SSSE3 -DUSE_SSE2
-  endif # x86
+  libc_crt_target_cflags :=
 endif # !arm
 
 # Define ANDROID_SMP appropriately.