commit:     75781d879c5ba96c542e4253a848fc817bf28205
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 26 09:38:55 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jun 26 10:10:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75781d87

app-emulation/wine-staging: pass -mno-avx for mingw cross

AVX issues with mingw-gcc aren't exactly new, e.g.
https://bugs.winehq.org/show_bug.cgi?id=45289
Been known to cause issues with dxvk too, albeit unsure
if that's still relevant as issues are scattered/lost.

Newly, >=wine-8.10 is likely to crash doing anything
at all 32bit if used -march=native (w/ avx) and 32bit
(e.g. `WINEARCH=win32 winecfg`).

Adding this to every packages using mingw as a precaution,
not believed there is much to gain from keeping AVX given
the fragility here (note only revbumping wine-8.10 and 8.11
as they are affected the worst). May revisit eventually with
a newer GCC.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/wine-staging/wine-staging-8.0.ebuild                   | 5 +++++
 .../{wine-staging-8.10.ebuild => wine-staging-8.10-r1.ebuild}        | 5 +++++
 .../{wine-staging-8.11.ebuild => wine-staging-8.11-r1.ebuild}        | 5 +++++
 app-emulation/wine-staging/wine-staging-8.7.ebuild                   | 5 +++++
 app-emulation/wine-staging/wine-staging-8.8.ebuild                   | 5 +++++
 app-emulation/wine-staging/wine-staging-8.9.1.ebuild                 | 5 +++++
 app-emulation/wine-staging/wine-staging-9999.ebuild                  | 5 +++++
 7 files changed, 35 insertions(+)

diff --git a/app-emulation/wine-staging/wine-staging-8.0.ebuild 
b/app-emulation/wine-staging/wine-staging-8.0.ebuild
index 06a39f07e0f3..c8412919b5a8 100644
--- a/app-emulation/wine-staging/wine-staging-8.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.0.ebuild
@@ -301,6 +301,11 @@ src_configure() {
                                append-cflags '-fno-strict-aliasing'
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.10.ebuild 
b/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
similarity index 97%
rename from app-emulation/wine-staging/wine-staging-8.10.ebuild
rename to app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
index 7096d33eb0ec..e42a0756d4a3 100644
--- a/app-emulation/wine-staging/wine-staging-8.10.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.10-r1.ebuild
@@ -311,6 +311,11 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.11.ebuild 
b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
similarity index 97%
rename from app-emulation/wine-staging/wine-staging-8.11.ebuild
rename to app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
index a11cbb764ad0..940bb93e3836 100644
--- a/app-emulation/wine-staging/wine-staging-8.11.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.11-r1.ebuild
@@ -314,6 +314,11 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.7.ebuild 
b/app-emulation/wine-staging/wine-staging-8.7.ebuild
index 50cd09f01e47..3d3ed519862c 100644
--- a/app-emulation/wine-staging/wine-staging-8.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.7.ebuild
@@ -312,6 +312,11 @@ src_configure() {
                                append-cflags '-fno-strict-aliasing'
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.8.ebuild 
b/app-emulation/wine-staging/wine-staging-8.8.ebuild
index 356b6bd8d790..84fd9d3669c3 100644
--- a/app-emulation/wine-staging/wine-staging-8.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.8.ebuild
@@ -312,6 +312,11 @@ src_configure() {
                                append-cflags '-fno-strict-aliasing'
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-8.9.1.ebuild 
b/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
index 91fff75c3a4c..6a22f7ebef3f 100644
--- a/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.9.1.ebuild
@@ -313,6 +313,11 @@ src_configure() {
                                append-cflags '-fno-strict-aliasing'
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index a11cbb764ad0..940bb93e3836 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -314,6 +314,11 @@ src_configure() {
                        : "${CROSSCFLAGS:=$(
                                filter-flags '-fstack-protector*' #870136
                                filter-flags '-mfunction-return=thunk*' #878849
+                               # -mavx with mingw-gcc has a history of obscure 
issues and
+                               # disabling is seen as safer, e.g. 
`WINEARCH=win32 winecfg`
+                               # crashes with -march=skylake >=wine-8.10, 
similar issues with
+                               # znver4: 
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
+                               append-cflags -mno-avx
                                CC=${CROSSCC} test-flags-CC ${CFLAGS:--O2})}"
                        : "${CROSSLDFLAGS:=$(
                                filter-flags '-fuse-ld=*'

Reply via email to