You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.4 KiB
66 lines
2.4 KiB
13 years ago
|
From 16d4258863c936538ef3b7ff13a95f7567a62044 Mon Sep 17 00:00:00 2001
|
||
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
|
||
|
Date: Mon, 1 Aug 2011 17:41:29 +0200
|
||
|
Subject: [PATCH] Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.
|
||
|
|
||
|
---
|
||
|
.../source/cpp_uno/gcc3_linux_intel/makefile.mk | 6 ++++++
|
||
|
.../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 6 ++++++
|
||
|
bridges/source/cpp_uno/mingw_intel/makefile.mk | 6 ++++++
|
||
|
3 files changed, 18 insertions(+), 0 deletions(-)
|
||
|
|
||
|
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
|
||
|
index beedf9d..609e09a 100644
|
||
|
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
|
||
|
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
|
||
|
@@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA
|
||
|
# work with the .cxx sources in this directory:
|
||
|
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
|
||
|
|
||
|
+# In case the compiler supports AVX this code segfaults so specifically turn
|
||
|
+# it off.
|
||
|
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
|
||
|
+ CFLAGSCXX+= -mno-avx
|
||
|
+.ENDIF
|
||
|
+
|
||
|
CFLAGSNOOPT=-O0
|
||
|
|
||
|
SLOFILES= \
|
||
|
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 dd35432..e519105 100644
|
||
|
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
|
||
|
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
|
||
|
@@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA
|
||
|
# work with the .cxx sources in this directory:
|
||
|
CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
|
||
|
|
||
|
+# In case the compiler supports AVX this code segfaults so specifically turn
|
||
|
+# it off.
|
||
|
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
|
||
|
+ CFLAGSCXX+= -mno-avx
|
||
|
+.ENDIF
|
||
|
+
|
||
|
SLOFILES= \
|
||
|
$(SLO)$/abi.obj \
|
||
|
$(SLO)$/except.obj \
|
||
|
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
|
||
|
index 2c7a8da..d2b0809 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)" == "TRUE"
|
||
|
+ CFLAGSCXX+= -mno-avx
|
||
|
+.ENDIF
|
||
|
+
|
||
|
NOOPTFILES= \
|
||
|
$(SLO)$/uno2cpp.obj
|
||
|
|
||
|
--
|
||
|
1.7.3.4
|
||
|
|