summaryrefslogtreecommitdiff
path: root/bridges/source/cpp_uno/mingw_intel/makefile.mk
diff options
context:
space:
mode:
authorTomáš Chvátal <tomas.chvatal@gmail.com>2011-08-01 17:41:29 +0200
committerCaolán McNamara <caolanm@redhat.com>2011-08-04 16:56:38 +0100
commitf8069fc858058959a7a1d59684c15bd4a41fcc3a (patch)
tree401ba224d1b7ac91efd981cd1a7767afa7be9843 /bridges/source/cpp_uno/mingw_intel/makefile.mk
parente6c3cc8adebf147d9885efebb4dc09eb431b5577 (diff)
Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.
Diffstat (limited to 'bridges/source/cpp_uno/mingw_intel/makefile.mk')
-rw-r--r--bridges/source/cpp_uno/mingw_intel/makefile.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
index 2c7a8da48527..d2b08096a3cd 100644
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
@@ -51,6 +51,12 @@ CFLAGS += -DBROKEN_ALLOCA
# work with the .cxx sources in this directory:
CFLAGSCXX += -fno-omit-frame-pointer
+# In case the compiler supports AVX this code segfaults so specifically turn
+# it off.
+.IF "$(HAVE_GCC_AVX)" == "YES"
+ CFLAGSCXX+= -mno-avx
+.ENDIF
+
NOOPTFILES= \
$(SLO)$/uno2cpp.obj