am 4d388c6a: am 019d0f33: am d262e17e: Merge "Don\'t define the meaningless SOFTFLOAT for x86."

* commit '4d388c6a32e920b76ec18203e56b38724f800229':
  Don't define the meaningless SOFTFLOAT for x86.
This commit is contained in:
Elliott Hughes 2013-10-07 10:35:38 -07:00 committed by Android Git Automerger
commit a4330dc276

View File

@ -591,13 +591,11 @@ ifeq ($(TARGET_ARCH),mips)
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