/[gentoo-x86]/app-office/libreoffice/files/libreoffice-append-no-avx.patch
Gentoo

Contents of /app-office/libreoffice/files/libreoffice-append-no-avx.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.4 - (show annotations) (download)
Thu Apr 26 11:53:14 2012 UTC (2 years, 3 months ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.3: +0 -0 lines
FILE REMOVED
Stable on ppc wrt bug#411449. Cleanup.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

1 From 16d4258863c936538ef3b7ff13a95f7567a62044 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
3 Date: Mon, 1 Aug 2011 17:41:29 +0200
4 Subject: [PATCH] Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS.
5
6 ---
7 .../source/cpp_uno/gcc3_linux_intel/makefile.mk | 6 ++++++
8 .../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 6 ++++++
9 bridges/source/cpp_uno/mingw_intel/makefile.mk | 6 ++++++
10 3 files changed, 18 insertions(+), 0 deletions(-)
11
12 diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
13 index beedf9d..609e09a 100644
14 --- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
15 +++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
16 @@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA
17 # work with the .cxx sources in this directory:
18 CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
19
20 +# In case the compiler supports AVX this code segfaults so specifically turn
21 +# it off.
22 +.IF "$(HAVE_GCC_AVX)" == "TRUE"
23 + CFLAGSCXX+= -mno-avx
24 +.ENDIF
25 +
26 CFLAGSNOOPT=-O0
27
28 SLOFILES= \
29 diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
30 index dd35432..e519105 100644
31 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
32 +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
33 @@ -52,6 +52,12 @@ CFLAGS += -DLEAK_STATIC_DATA
34 # work with the .cxx sources in this directory:
35 CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
36
37 +# In case the compiler supports AVX this code segfaults so specifically turn
38 +# it off.
39 +.IF "$(HAVE_GCC_AVX)" == "TRUE"
40 + CFLAGSCXX+= -mno-avx
41 +.ENDIF
42 +
43 SLOFILES= \
44 $(SLO)$/abi.obj \
45 $(SLO)$/except.obj \
46 diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
47 index 2c7a8da..d2b0809 100644
48 --- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
49 +++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
50 @@ -51,6 +51,12 @@ CFLAGS += -DBROKEN_ALLOCA
51 # work with the .cxx sources in this directory:
52 CFLAGSCXX += -fno-omit-frame-pointer
53
54 +# In case the compiler supports AVX this code segfaults so specifically turn
55 +# it off.
56 +.IF "$(HAVE_GCC_AVX)" == "TRUE"
57 + CFLAGSCXX+= -mno-avx
58 +.ENDIF
59 +
60 NOOPTFILES= \
61 $(SLO)$/uno2cpp.obj
62
63 --
64 1.7.3.4

  ViewVC Help
Powered by ViewVC 1.1.20