aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Pfeffer <zach.pfeffer@linaro.org>2011-10-14 22:02:40 +0000
committerGerrit Code Review <gerrit@betelgeuse.canonical.com>2011-10-14 22:02:40 +0000
commit0e3c57ff5d7fda16a3e7fce6e8438772d3a381c0 (patch)
tree6b9a1e427a1ed991663784fe4969d27d1a6257a8
parent79ae21057504a4ffe0a18cf74ffc4d612c2c5fa9 (diff)
downloadbuild-0e3c57ff5d7fda16a3e7fce6e8438772d3a381c0.tar.gz
Revert "Revert "Revert "build: remove -fno-strict-aliasing"""
This reverts commit 79ae21057504a4ffe0a18cf74ffc4d612c2c5fa9
-rw-r--r--core/combo/TARGET_linux-arm.mk1
-rw-r--r--core/combo/select.mk2
2 files changed, 1 insertions, 2 deletions
diff --git a/core/combo/TARGET_linux-arm.mk b/core/combo/TARGET_linux-arm.mk
index 3cff797678..6782b88f3a 100644
--- a/core/combo/TARGET_linux-arm.mk
+++ b/core/combo/TARGET_linux-arm.mk
@@ -58,7 +58,6 @@ TARGET_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined
TARGET_arm_CFLAGS := -O3 \
-fomit-frame-pointer \
-fstrict-aliasing \
- -Werror=strict-aliasing \
-funswitch-loops \
-finline-limit=300
diff --git a/core/combo/select.mk b/core/combo/select.mk
index 52befe4f0c..d685646bb6 100644
--- a/core/combo/select.mk
+++ b/core/combo/select.mk
@@ -46,7 +46,7 @@ $(combo_target)HAVE_STRLCAT := 0
$(combo_target)HAVE_KERNEL_MODULES := 0
$(combo_target)GLOBAL_CFLAGS := -fno-exceptions -Wno-multichar
-$(combo_target)RELEASE_CFLAGS := -O3 -g -Werror=strict-aliasing
+$(combo_target)RELEASE_CFLAGS := -O3 -g -fno-strict-aliasing
$(combo_target)GLOBAL_LDFLAGS :=
$(combo_target)GLOBAL_ARFLAGS := crsP