summaryrefslogtreecommitdiff
path: root/bridges
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-03 12:09:50 +0100
commitce5469751cf513aaf5a1a11c726df8a0127b8da3 (patch)
tree6d99131f1f3d2139aff8bb4ac53e20561b26026d /bridges
parent2dca38540ec89dfeceae130db5cf40b3505f1d97 (diff)
Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.
Diffstat (limited to 'bridges')
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk2
-rw-r--r--bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk2
-rw-r--r--bridges/source/cpp_uno/mingw_intel/makefile.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
index beedf9dafa2a..eae6df44ea15 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
@@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
CFLAGSNOOPT=-O0
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
index dd3543233827..ad5de1a4a9b2 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
SLOFILES= \
$(SLO)$/abi.obj \
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
index 2c7a8da48527..a3c2b2af6768 100644
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
@@ -49,7 +49,7 @@ CFLAGS += -DBROKEN_ALLOCA
# In case someone enabled the non-standard -fomit-frame-pointer which does not
# work with the .cxx sources in this directory:
-CFLAGSCXX += -fno-omit-frame-pointer
+CFLAGSCXX += -fno-omit-frame-pointer -mno-avx
NOOPTFILES= \
$(SLO)$/uno2cpp.obj