/[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.1 - (hide annotations) (download)
Mon Aug 1 15:51:36 2011 UTC (6 years, 10 months ago) by scarabeus
Branch: MAIN
Append no-avx to fix segmentation fault.

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

1 scarabeus 1.1 From 7424b4357b24736ddad75e2449839bf0ecc8e09b 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_alpha/makefile.mk | 2 +-
8     bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2 +-
9     bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk | 2 +-
10     bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk | 2 +-
11     .../source/cpp_uno/gcc3_linux_intel/makefile.mk | 2 +-
12     bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 2 +-
13     bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk | 2 +-
14     .../source/cpp_uno/gcc3_linux_powerpc/makefile.mk | 2 +-
15     .../cpp_uno/gcc3_linux_powerpc64/makefile.mk | 2 +-
16     bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk | 2 +-
17     .../source/cpp_uno/gcc3_linux_s390x/makefile.mk | 2 +-
18     .../source/cpp_uno/gcc3_linux_sparc/makefile.mk | 2 +-
19     .../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 2 +-
20     bridges/source/cpp_uno/mingw_intel/makefile.mk | 2 +-
21     14 files changed, 14 insertions(+), 14 deletions(-)
22    
23     diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
24     index 5376b39..dabd2dc 100644
25     --- a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
26     +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk
27     @@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
28    
29     # In case someone enabled the non-standard -fomit-frame-pointer which does not
30     # work with the .cxx sources in this directory:
31     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
32     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
33    
34     CFLAGSNOOPT=-O0
35    
36     diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
37     index 2c42dec..92cad3a 100644
38     --- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
39     +++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk
40     @@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
41     CFLAGS += -DLEAK_STATIC_DATA
42     .ENDIF
43    
44     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
45     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
46    
47     NOOPTFILES= \
48     $(SLO)$/cpp2uno.obj \
49     diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
50     index 6fab7a4..a7c2824 100644
51     --- a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
52     +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk
53     @@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
54     CFLAGS += -DLEAK_STATIC_DATA
55     .ENDIF
56    
57     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
58     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
59    
60     NOOPTFILES= \
61     $(SLO)$/cpp2uno.obj \
62     diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
63     index 1e82cfa..667ffd6 100644
64     --- a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
65     +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk
66     @@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
67    
68     # In case someone enabled the non-standard -fomit-frame-pointer which does not
69     # work with the .cxx sources in this directory:
70     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
71     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
72    
73     NOOPTFILES= \
74     $(SLO)$/uno2cpp.obj \
75     diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
76     index beedf9d..eae6df4 100644
77     --- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
78     +++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk
79     @@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
80    
81     # In case someone enabled the non-standard -fomit-frame-pointer which does not
82     # work with the .cxx sources in this directory:
83     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
84     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
85    
86     CFLAGSNOOPT=-O0
87    
88     diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
89     index 3978bda..bf04770 100644
90     --- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
91     +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk
92     @@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE
93     CFLAGS += -DLEAK_STATIC_DATA
94     .ENDIF
95    
96     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
97     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
98    
99     NOOPTFILES= \
100     $(SLO)$/cpp2uno.obj \
101     diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
102     index f71750e..c7ca5f9 100644
103     --- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
104     +++ b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk
105     @@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
106    
107     # In case someone enabled the non-standard -fomit-frame-pointer which does not
108     # work with the .cxx sources in this directory:
109     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
110     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
111    
112     CFLAGSNOOPT=-O0
113    
114     diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
115     index 9a75200..3b86ee7 100644
116     --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
117     +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk
118     @@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA
119    
120     # In case someone enabled the non-standard -fomit-frame-pointer which does not
121     # work with the .cxx sources in this directory:
122     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
123     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
124    
125     NOOPTFILES= \
126     $(SLO)$/uno2cpp.obj
127     diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
128     index 77763d7..b21194c 100644
129     --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
130     +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk
131     @@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
132    
133     # In case someone enabled the non-standard -fomit-frame-pointer which does not
134     # work with the .cxx sources in this directory:
135     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
136     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
137    
138     NOOPTFILES= \
139     $(SLO)$/uno2cpp.obj \
140     diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
141     index bda85f3..0f40c1c 100644
142     --- a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
143     +++ b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk
144     @@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
145    
146     # In case someone enabled the non-standard -fomit-frame-pointer which does not
147     # work with the .cxx sources in this directory:
148     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
149     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
150    
151     CFLAGSNOOPT=-O0
152    
153     diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
154     index 9539dd6..aa47f6b 100644
155     --- a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
156     +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk
157     @@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA
158    
159     # In case someone enabled the non-standard -fomit-frame-pointer which does not
160     # work with the .cxx sources in this directory:
161     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
162     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
163    
164     CFLAGSNOOPT=-O0
165    
166     diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
167     index 3940038..2ee35bb 100644
168     --- a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
169     +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk
170     @@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA
171    
172     # In case someone enabled the non-standard -fomit-frame-pointer which does not
173     # # work with the .cxx sources in this directory:
174     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
175     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
176    
177     CFLAGSNOOPT=-O0
178    
179     diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
180     index dd35432..ad5de1a 100644
181     --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
182     +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk
183     @@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA
184    
185     # In case someone enabled the non-standard -fomit-frame-pointer which does not
186     # work with the .cxx sources in this directory:
187     -CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing
188     +CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx
189    
190     SLOFILES= \
191     $(SLO)$/abi.obj \
192     diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk
193     index 2c7a8da..a3c2b2a 100644
194     --- a/bridges/source/cpp_uno/mingw_intel/makefile.mk
195     +++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk
196     @@ -49,7 +49,7 @@ CFLAGS += -DBROKEN_ALLOCA
197    
198     # In case someone enabled the non-standard -fomit-frame-pointer which does not
199     # work with the .cxx sources in this directory:
200     -CFLAGSCXX += -fno-omit-frame-pointer
201     +CFLAGSCXX += -fno-omit-frame-pointer -mno-avx
202    
203     NOOPTFILES= \
204     $(SLO)$/uno2cpp.obj
205     --
206     1.7.3.4
207    

  ViewVC Help
Powered by ViewVC 1.1.20