commit 85001dfadcaa3f4598f33ddb337283537c298f9a
author David96 <xd_e-mail@gmx.de> Sat Nov 23 13:31:11 2013 +0100
committer TheMrcool212 <themrcool212.android@gmail.com> Sat Apr 12 08:57:56 2014 +0800
tree b3bf42c0c31c1a3aad4bce8bb47a0fc1be871e96
parent 9fccb5e3f785bd3884188872522d8ea4f2bc182a

Enable strict aliasing again

Conflicts:
	libc/Android.mk

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index 5f11076..0f634be 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -494,7 +494,6 @@
     -D_LIBC=1 \
     -DFLOATING_POINT \
     -DINET6 \
-	-Wno-error=strict-aliasing \
     -I$(LOCAL_PATH)/private \
     -DPOSIX_MISTAKE \
     -DLOG_ON_HEAP_ERROR \
@@ -508,12 +507,12 @@
 # the appropriate BoardConfig.mk file.
 #
 ifneq ($(BOARD_MALLOC_ALIGNMENT),)
-  libc_common_cflags += -DMALLOC_ALIGNMENT=$(BOARD_MALLOC_ALIGNMENT) -Wno-error=strict-aliasing
+  libc_common_cflags += -DMALLOC_ALIGNMENT=$(BOARD_MALLOC_ALIGNMENT)
 endif
 
 ifeq ($(TARGET_ARCH),arm)
   libc_common_cflags += -DSOFTFLOAT
-  libc_common_cflags += -fstrict-aliasing -Wno-error=strict-aliasing
+  libc_common_cflags += -fstrict-aliasing
   libc_crt_target_cflags := -mthumb-interwork
 endif # !arm
 
@@ -532,7 +531,6 @@
   ifneq ($(ARCH_MIPS_HAS_FPU),true)
     libc_common_cflags += -DSOFTFLOAT
   endif
-  libc_common_cflags += -fstrict-aliasing
   libc_crt_target_cflags := $(TARGET_GLOBAL_CFLAGS)
 endif # mips
 
@@ -712,7 +710,6 @@
 LOCAL_SRC_FILES := $(libc_tzcode_src_files)
 LOCAL_CFLAGS := \
     $(libc_common_cflags) \
-	-Wno-error=strict-aliasing \
     -std=gnu99 \
     -DSTD_INSPIRED=1 \
     -DTZDIR=\"/system/usr/share/zoneinfo\" \
@@ -738,7 +735,6 @@
 LOCAL_SRC_FILES := $(libc_upstream_freebsd_src_files)
 LOCAL_CFLAGS := \
     $(libc_common_cflags) \
-	-Wno-error=strict-aliasing \
     -I$(LOCAL_PATH)/upstream-freebsd \
     -I$(LOCAL_PATH)/upstream-freebsd/libc/include \
     -include upstream-freebsd/freebsd-compat.h