[tor-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460357 - Do not use optimized AVX for Skia convolve_vertically in MinGW. r=lsalzman, a=jcristau

[gk at torproject.org]

commit 1d493532960f10875b52e6f42bc8813e71f54ade
Author: Tom Ritter <tom at mozilla.com>
Date:   Wed Apr 25 22:57:58 2018 -0500

    Bug 1460357 - Do not use optimized AVX for Skia convolve_vertically in MinGW. r=lsalzman, a=jcristau
    
    MozReview-Commit-ID: 8ROpiDD4xYH
    
    --HG--
    extra : source : 476091dbf8c06ad7880859f302e08f637c077764
---
 gfx/skia/skia/src/opts/SkOpts_hsw.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp
old mode 100644
new mode 100755
index dded64776a49..58bf00a40a18
--- a/gfx/skia/skia/src/opts/SkOpts_hsw.cpp
+++ b/gfx/skia/skia/src/opts/SkOpts_hsw.cpp
@@ -12,7 +12,9 @@
 #include <immintrin.h>   // ODR safe
 #include <stdint.h>      // ODR safe
 
-#if defined(__AVX2__)
+// As described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85525, MinGW will produce
+// unaligned instructions for this code, resulting in a crash.
+#if defined(__AVX2__) && !defined(__MINGW32__)
 
 namespace hsw {