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

* commit '019d0f33478f10ebd2c885e6a920d3bbed7a8de3':
  Don't define the meaningless SOFTFLOAT for x86.
This commit is contained in:
Elliott Hughes 2013-10-07 10:32:25 -07:00 committed by Android Git Automerger
commit 4d388c6a32

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