Remove useless x86 fallbacks.
The NDK ABI requires that you support SSE2, and the build system won't let you
build with ARCH_X86_HAVE_SSE2 set to false. So let's stop pretending this
constant is actually a variable, and let's remove the corresponding dead code.
Also, the USE_SSE2 and USE_SSE3 macros are unused, so let's not bother
setting them.
Change-Id: I40b501d998530d22518ce1c4d14575513a8125bb
diff --git a/libc/Android.mk b/libc/Android.mk
index a16a815..7fec14f 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -579,26 +579,7 @@
libc_common_cflags += -DSOFTFLOAT
libc_common_cflags += -fstrict-aliasing
libc_crt_target_cflags := -mthumb-interwork
-endif # !arm
-
-ifeq ($(TARGET_ARCH),x86)
- libc_crt_target_cflags := -m32
- libc_crt_target_ldflags := -melf_i386
-endif
-ifeq ($(TARGET_ARCH),x86_64)
- libc_crt_target_cflags := -m64
- libc_crt_target_ldflags := -melf_x86_64
-endif
-
-ifeq ($(TARGET_ARCH),$(filter $(TARGET_ARCH),x86 x86_64))
- libc_common_cflags += -DSOFTFLOAT
- ifeq ($(ARCH_X86_HAVE_SSE2),true)
- libc_crt_target_cflags += -DUSE_SSE2=1
- endif
- ifeq ($(ARCH_X86_HAVE_SSSE3),true)
- libc_crt_target_cflags += -DUSE_SSSE3=1
- endif
-endif
+endif # arm
ifeq ($(TARGET_ARCH),mips)
ifneq ($(ARCH_MIPS_HAS_FPU),true)
@@ -608,6 +589,18 @@
libc_crt_target_cflags := $(TARGET_GLOBAL_CFLAGS)
endif # mips
+ifeq ($(TARGET_ARCH),x86)
+ libc_common_cflags += -DSOFTFLOAT
+ libc_crt_target_cflags := -m32
+ libc_crt_target_ldflags := -melf_i386
+endif # x86
+
+ifeq ($(TARGET_ARCH),x86_64)
+ libc_common_cflags += -DSOFTFLOAT
+ libc_crt_target_cflags := -m64
+ libc_crt_target_ldflags := -melf_x86_64
+endif # x86_64
+
# Define ANDROID_SMP appropriately.
ifeq ($(TARGET_CPU_SMP),true)
libc_common_cflags += -DANDROID_SMP=1