From 5a0450e33ce1906decac4bf08438801709642f9b Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sat, 8 Oct 2011 21:51:58 +0000
Subject: -ftree-vectorize forces -fstrict-aliasing so disable tree-vectorize
 before strict-aliasing

svn path=/trunk/; revision=15547
---
 externals/Makefile           | 16 ++++++++--------
 packages/win32_inno/Makefile |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/externals/Makefile b/externals/Makefile
index 0ddde521..b86291b3 100644
--- a/externals/Makefile
+++ b/externals/Makefile
@@ -306,7 +306,7 @@ boids_clean:
 #------------------------------------------------------------------------------#
 # BSAYLOR
 bsaylor:
-	make -C $(externals_src)/bsaylor CFLAGS="$(CFLAGS) -fno-strict-aliasing" \
+	make -C $(externals_src)/bsaylor CFLAGS="$(CFLAGS) -fno-tree-vectorize -fno-strict-aliasing" \
 		PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
 
 bsaylor_install:
@@ -439,7 +439,7 @@ ext13_clean:
 #------------------------------------------------------------------------------#
 # EXTRA
 extra:
-	make -C $(externals_src)/extra CFLAGS="$(CFLAGS) -fno-strict-aliasing" \
+	make -C $(externals_src)/extra CFLAGS="$(CFLAGS) -fno-tree-vectorize -fno-strict-aliasing" \
 		PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
 
 extra_install:
@@ -858,7 +858,7 @@ IEMLIB_SRC := $(wildcard $(externals_src)/iemlib/iemlib1/src/*[^1].c) $(wildcard
 
 IEMLIB_OBJECTS := $(IEMLIB_SRC:.c=.o)
 $(IEMLIB_OBJECTS) : %.o : %.c
-	$(CC) $(CFLAGS) -O2 -funroll-loops -fomit-frame-pointer -fno-strict-aliasing -o "$*.o" -c "$*.c"
+	$(CC) $(CFLAGS) -O2 -funroll-loops -fomit-frame-pointer -fno-tree-vectorize -fno-strict-aliasing -o "$*.o" -c "$*.c"
 
 iemlib: $(IEMLIB_SRC:.c=.$(EXTENSION))
 
@@ -1018,7 +1018,7 @@ loaders-libdir_clean:
 # LOADERS-TCLPD
 
 loaders-tclpd:
-	make -C $(externals_src)/loaders/tclpd CFLAGS="$(CFLAGS) -fno-strict-aliasing" \
+	make -C $(externals_src)/loaders/tclpd CFLAGS="$(CFLAGS) -fno-tree-vectorize -fno-strict-aliasing" \
 				PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
 
 loaders-tclpd_install: loaders-tclpd
@@ -1169,7 +1169,7 @@ moocow_clean:
 #------------------------------------------------------------------------------#
 # MOONLIB
 moonlib:
-	make -C $(externals_src)/moonlib CFLAGS="$(CFLAGS) -fno-strict-aliasing" \
+	make -C $(externals_src)/moonlib CFLAGS="$(CFLAGS) -fno-tree-vectorize -fno-strict-aliasing" \
 		PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
 
 moonlib_install:
@@ -1592,7 +1592,7 @@ postlude_clean:
 #------------------------------------------------------------------------------#
 # SIGPACK
 sigpack:
-	make -C $(externals_src)/sigpack CFLAGS="$(CFLAGS) -fno-strict-aliasing" \
+	make -C $(externals_src)/sigpack CFLAGS="$(CFLAGS) -fno-tree-vectorize -fno-strict-aliasing" \
 		PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
 
 sigpack_install:
@@ -1662,7 +1662,7 @@ TOXY_NAME=toxy
 # toxy is compiled straight into $(OUT_DIR)
 TOXY_OUT_DIR=$(DESTDIR)$(objectsdir)/$(TOXY_NAME)
 toxy: $(bindir)
-	$(MAKE) OPT_CFLAGS="-O2 -fno-strict-aliasing -fPIC" \
+	$(MAKE) OPT_CFLAGS="-O2 -fno-tree-vectorize -fno-strict-aliasing -fPIC" \
 		-C $(externals_src)/miXed/toxy
 
 
@@ -1716,7 +1716,7 @@ vbap_clean:
 #------------------------------------------------------------------------------#
 # VANILLA
 vanilla:
-	make -C $(externals_src)/vanilla CFLAGS="$(CFLAGS) -fno-strict-aliasing" \
+	make -C $(externals_src)/vanilla CFLAGS="$(CFLAGS) -fno-tree-vectorize -fno-strict-aliasing" \
 		PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
 
 vanilla_install:
diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile
index 0dc5a302..aafb60c3 100755
--- a/packages/win32_inno/Makefile
+++ b/packages/win32_inno/Makefile
@@ -64,7 +64,7 @@ zip:
 	@echo "win32_inno install succeeded!"
 
 build_pd:
-	cd $(pd_src)/src && $(MAKE) -f makefile.mingw MORECFLAGS="-O2 -g"
+	$(MAKE) -C $(pd_src)/src -f makefile.mingw MORECFLAGS="-O2 -g -fno-tree-vectorize -fno-strict-aliasing"
 
 PD_NAME=Pd
 pd_install: build_pd
-- 
cgit v1.2.1