| 1 |
scarabeus 11/08/01 15:51:36 |
| 2 |
|
| 3 |
Added: libreoffice-append-no-avx.patch |
| 4 |
Log: |
| 5 |
Append no-avx to fix segmentation fault. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-office/libreoffice/files/libreoffice-append-no-avx.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-append-no-avx.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/libreoffice/files/libreoffice-append-no-avx.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libreoffice-append-no-avx.patch |
| 16 |
=================================================================== |
| 17 |
From 7424b4357b24736ddad75e2449839bf0ecc8e09b Mon Sep 17 00:00:00 2001 |
| 18 |
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@×××××.com> |
| 19 |
Date: Mon, 1 Aug 2011 17:41:29 +0200 |
| 20 |
Subject: [PATCH] Fix segmentation fault when linking -mavx on new CPUs is enabled by explicitly adding -mno-avx to CXXFLAGS. |
| 21 |
|
| 22 |
--- |
| 23 |
.../source/cpp_uno/gcc3_linux_alpha/makefile.mk | 2 +- |
| 24 |
bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2 +- |
| 25 |
bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk | 2 +- |
| 26 |
bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk | 2 +- |
| 27 |
.../source/cpp_uno/gcc3_linux_intel/makefile.mk | 2 +- |
| 28 |
bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk | 2 +- |
| 29 |
bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk | 2 +- |
| 30 |
.../source/cpp_uno/gcc3_linux_powerpc/makefile.mk | 2 +- |
| 31 |
.../cpp_uno/gcc3_linux_powerpc64/makefile.mk | 2 +- |
| 32 |
bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk | 2 +- |
| 33 |
.../source/cpp_uno/gcc3_linux_s390x/makefile.mk | 2 +- |
| 34 |
.../source/cpp_uno/gcc3_linux_sparc/makefile.mk | 2 +- |
| 35 |
.../source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 2 +- |
| 36 |
bridges/source/cpp_uno/mingw_intel/makefile.mk | 2 +- |
| 37 |
14 files changed, 14 insertions(+), 14 deletions(-) |
| 38 |
|
| 39 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk |
| 40 |
index 5376b39..dabd2dc 100644 |
| 41 |
--- a/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk |
| 42 |
+++ b/bridges/source/cpp_uno/gcc3_linux_alpha/makefile.mk |
| 43 |
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 44 |
|
| 45 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 46 |
# work with the .cxx sources in this directory: |
| 47 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 48 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 49 |
|
| 50 |
CFLAGSNOOPT=-O0 |
| 51 |
|
| 52 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk |
| 53 |
index 2c42dec..92cad3a 100644 |
| 54 |
--- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk |
| 55 |
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk |
| 56 |
@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE |
| 57 |
CFLAGS += -DLEAK_STATIC_DATA |
| 58 |
.ENDIF |
| 59 |
|
| 60 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 61 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 62 |
|
| 63 |
NOOPTFILES= \ |
| 64 |
$(SLO)$/cpp2uno.obj \ |
| 65 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk |
| 66 |
index 6fab7a4..a7c2824 100644 |
| 67 |
--- a/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk |
| 68 |
+++ b/bridges/source/cpp_uno/gcc3_linux_hppa/makefile.mk |
| 69 |
@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE |
| 70 |
CFLAGS += -DLEAK_STATIC_DATA |
| 71 |
.ENDIF |
| 72 |
|
| 73 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 74 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 75 |
|
| 76 |
NOOPTFILES= \ |
| 77 |
$(SLO)$/cpp2uno.obj \ |
| 78 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk |
| 79 |
index 1e82cfa..667ffd6 100644 |
| 80 |
--- a/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk |
| 81 |
+++ b/bridges/source/cpp_uno/gcc3_linux_ia64/makefile.mk |
| 82 |
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 83 |
|
| 84 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 85 |
# work with the .cxx sources in this directory: |
| 86 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 87 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 88 |
|
| 89 |
NOOPTFILES= \ |
| 90 |
$(SLO)$/uno2cpp.obj \ |
| 91 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk |
| 92 |
index beedf9d..eae6df4 100644 |
| 93 |
--- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk |
| 94 |
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk |
| 95 |
@@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 96 |
|
| 97 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 98 |
# work with the .cxx sources in this directory: |
| 99 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 100 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 101 |
|
| 102 |
CFLAGSNOOPT=-O0 |
| 103 |
|
| 104 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk |
| 105 |
index 3978bda..bf04770 100644 |
| 106 |
--- a/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk |
| 107 |
+++ b/bridges/source/cpp_uno/gcc3_linux_m68k/makefile.mk |
| 108 |
@@ -45,7 +45,7 @@ NO_BSYMBOLIC=TRUE |
| 109 |
CFLAGS += -DLEAK_STATIC_DATA |
| 110 |
.ENDIF |
| 111 |
|
| 112 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 113 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 114 |
|
| 115 |
NOOPTFILES= \ |
| 116 |
$(SLO)$/cpp2uno.obj \ |
| 117 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk |
| 118 |
index f71750e..c7ca5f9 100644 |
| 119 |
--- a/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk |
| 120 |
+++ b/bridges/source/cpp_uno/gcc3_linux_mips/makefile.mk |
| 121 |
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 122 |
|
| 123 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 124 |
# work with the .cxx sources in this directory: |
| 125 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 126 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 127 |
|
| 128 |
CFLAGSNOOPT=-O0 |
| 129 |
|
| 130 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk |
| 131 |
index 9a75200..3b86ee7 100644 |
| 132 |
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk |
| 133 |
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/makefile.mk |
| 134 |
@@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 135 |
|
| 136 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 137 |
# work with the .cxx sources in this directory: |
| 138 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 139 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 140 |
|
| 141 |
NOOPTFILES= \ |
| 142 |
$(SLO)$/uno2cpp.obj |
| 143 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk |
| 144 |
index 77763d7..b21194c 100644 |
| 145 |
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk |
| 146 |
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/makefile.mk |
| 147 |
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 148 |
|
| 149 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 150 |
# work with the .cxx sources in this directory: |
| 151 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 152 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 153 |
|
| 154 |
NOOPTFILES= \ |
| 155 |
$(SLO)$/uno2cpp.obj \ |
| 156 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk |
| 157 |
index bda85f3..0f40c1c 100644 |
| 158 |
--- a/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk |
| 159 |
+++ b/bridges/source/cpp_uno/gcc3_linux_s390/makefile.mk |
| 160 |
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 161 |
|
| 162 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 163 |
# work with the .cxx sources in this directory: |
| 164 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 165 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 166 |
|
| 167 |
CFLAGSNOOPT=-O0 |
| 168 |
|
| 169 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk |
| 170 |
index 9539dd6..aa47f6b 100644 |
| 171 |
--- a/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk |
| 172 |
+++ b/bridges/source/cpp_uno/gcc3_linux_s390x/makefile.mk |
| 173 |
@@ -46,7 +46,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 174 |
|
| 175 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 176 |
# work with the .cxx sources in this directory: |
| 177 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 178 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 179 |
|
| 180 |
CFLAGSNOOPT=-O0 |
| 181 |
|
| 182 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk |
| 183 |
index 3940038..2ee35bb 100644 |
| 184 |
--- a/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk |
| 185 |
+++ b/bridges/source/cpp_uno/gcc3_linux_sparc/makefile.mk |
| 186 |
@@ -45,7 +45,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 187 |
|
| 188 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 189 |
# # work with the .cxx sources in this directory: |
| 190 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 191 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 192 |
|
| 193 |
CFLAGSNOOPT=-O0 |
| 194 |
|
| 195 |
diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk |
| 196 |
index dd35432..ad5de1a 100644 |
| 197 |
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk |
| 198 |
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk |
| 199 |
@@ -50,7 +50,7 @@ CFLAGS += -DLEAK_STATIC_DATA |
| 200 |
|
| 201 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 202 |
# work with the .cxx sources in this directory: |
| 203 |
-CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing |
| 204 |
+CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing -mno-avx |
| 205 |
|
| 206 |
SLOFILES= \ |
| 207 |
$(SLO)$/abi.obj \ |
| 208 |
diff --git a/bridges/source/cpp_uno/mingw_intel/makefile.mk b/bridges/source/cpp_uno/mingw_intel/makefile.mk |
| 209 |
index 2c7a8da..a3c2b2a 100644 |
| 210 |
--- a/bridges/source/cpp_uno/mingw_intel/makefile.mk |
| 211 |
+++ b/bridges/source/cpp_uno/mingw_intel/makefile.mk |
| 212 |
@@ -49,7 +49,7 @@ CFLAGS += -DBROKEN_ALLOCA |
| 213 |
|
| 214 |
# In case someone enabled the non-standard -fomit-frame-pointer which does not |
| 215 |
# work with the .cxx sources in this directory: |
| 216 |
-CFLAGSCXX += -fno-omit-frame-pointer |
| 217 |
+CFLAGSCXX += -fno-omit-frame-pointer -mno-avx |
| 218 |
|
| 219 |
NOOPTFILES= \ |
| 220 |
$(SLO)$/uno2cpp.obj |
| 221 |
-- |
| 222 |
1.7.3.4 |
Archives