From 2582fbac59ef48dd4412813f496865d12c3d60e8 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Sat, 3 Jan 2015 01:55:51 +0100
Subject: [PATCH] Update src/Makefile to use more conservative gcc optimization
 settings.

---
 src/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Makefile b/src/Makefile
index 56f6314a..fb0c3ffe 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -37,9 +37,15 @@ ifeq ($(DEBUG),1)
 CXXFLAGS += -O0 -g
 else
 CXXFLAGS += -O2
+LDFLAGS += -s
 endif
-CXXFLAGS_WERROR = -Werror
+# some gcc versions suffer over-agressive aliasing and wrapv optimization features/bugs
+CXXFLAGS_OPTIMIZE_STRICT_ALIASING ?= -fno-strict-aliasing
+CXXFLAGS_OPTIMIZE_WRAPV ?= -fwrapv
+CXXFLAGS += $(CXXFLAGS_OPTIMIZE_STRICT_ALIASING)
+CXXFLAGS += $(CXXFLAGS_OPTIMIZE_WRAPV)
 CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wshadow -Wwrite-strings
+CXXFLAGS_WERROR ?= -Werror
 CXXFLAGS += $(CXXFLAGS_WERROR)
 endif
 CPPFLAGS += $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)