am 31425c9f: am e65055af: Merge "Stop asking GCC to cause trouble."

* commit '31425c9fce2d48699322b6eb3284b06d1f706336':
  Stop asking GCC to cause trouble.
This commit is contained in:
Elliott Hughes 2014-02-21 13:54:02 +00:00 committed by Android Git Automerger
commit a12d556d42
2 changed files with 1 additions and 7 deletions

View File

@ -41,10 +41,7 @@ libc_common_src_files_arm += \
# bionic/__strcpy_chk.cpp \
# bionic/__strcat_chk.cpp \
# cflags
libc_common_cflags_arm := \
-DSOFTFLOAT \
-fstrict-aliasing
libc_common_cflags_arm := -DSOFTFLOAT
##########################################
### CPU specific source files

View File

@ -43,13 +43,10 @@ libc_common_src_files_mips += \
bionic/__strcat_chk.cpp \
# cflags
ifneq ($(ARCH_MIPS_HAS_FPU),true)
libc_common_cflags_mips := \
-DSOFTFLOAT
endif
libc_common_cflags_mips += \
-fstrict-aliasing
##########################################
### CPU specific source files