[Libreoffice-commits] .: 2 commits - bridges/source

[Caolán McNamara]

 bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk  |    6 ++++++
 bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk |    6 ++++++
 bridges/source/cpp_uno/mingw_intel/makefile.mk       |    6 ++++++
 3 files changed, 18 insertions(+)

New commits:
commit fde110d31c19696669415e505385ea8bf1fef738
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Aug 4 17:05:22 2011 +0100

    YES->TRUE

diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
index 609e09a..26690d7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
@@ -54,7 +54,7 @@ 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)" == "YES"
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
     CFLAGSCXX+= -mno-avx
 .ENDIF
 
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 e519105..f8b6d8e 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
@@ -54,7 +54,7 @@ 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)" == "YES"
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
     CFLAGSCXX+= -mno-avx
 .ENDIF
 
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
index d2b0809..6ff0cbe 100644
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
@@ -53,7 +53,7 @@ CFLAGSCXX += -fno-omit-frame-pointer
 
 # In case the compiler supports AVX this code segfaults so specifically turn
 # it off.
-.IF "$(HAVE_GCC_AVX)" == "YES"
+.IF "$(HAVE_GCC_AVX)" == "TRUE"
     CFLAGSCXX+= -mno-avx
 .ENDIF
 
commit bdcaf00e3a215baf036a20394f3c31dfe168e3be
Author: Tomáš Chvátal <tomas.chvatal at gmail.com>
Date:   Mon Aug 1 17:41:29 2011 +0200

    Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.

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)" == "YES"
+    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)" == "YES"
+    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)" == "YES"
+    CFLAGSCXX+= -mno-avx
+.ENDIF
+
 NOOPTFILES= \
     $(SLO)$/uno2cpp.obj