contrib: Fix potential assembly issues with libvpx and AVX-512.

Fixes cross compilation with gcc 8 and where clang is acting weird.

diff --git a/contrib/libvpx/A04-avx-512-clang.patch b/contrib/libvpx/A04-avx-512-clang.patch
new file mode 100644 (file)
index 0000000..76bd5f0
--- /dev/null
+++ b/contrib/libvpx/A04-avx-512-clang.patch
@@ -0,0 +1,46 @@
+From bb286cd851bd16efa32fe6fba5a9c2d0a160efa5 Mon Sep 17 00:00:00 2001
+From: Johann <johannkoenig@google.com>
+Date: Thu, 28 Jun 2018 06:08:03 -0700
+Subject: [PATCH] libyuv: disable AVX512 in clang
+
+ARGBToRGB24Row_AVX512VBMI fails to compile on Mac:
+row_gcc.cc: instruction requires: AVX-512 VBMI ISA AVX-512 VL ISA
+
+BUG=libyuv:789
+
+Change-Id: Ibd584e8c82e3ce86ec5460b4243f84f5dbdf4c81
+---
+ third_party/libyuv/README.libvpx        | 1 +
+ third_party/libyuv/include/libyuv/row.h | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/third_party/libyuv/README.libvpx b/third_party/libyuv/README.libvpx
+index 1216ee9f54..9519dc4bee 100644
+--- a/third_party/libyuv/README.libvpx
++++ b/third_party/libyuv/README.libvpx
+@@ -13,6 +13,7 @@ example which down-samples the original input video (f.g. 1280x720) a number of
+ times in order to encode multiple resolution bit streams.
+ 
+ Local Modifications:
++Disable ARGBToRGB24Row_AVX512VBMI due to build failure on Mac.
+ rm libyuv/include/libyuv.h libyuv/include/libyuv/compare_row.h
+ mv libyuv/include tmp/
+ mv libyuv/source tmp/
+diff --git a/third_party/libyuv/include/libyuv/row.h b/third_party/libyuv/include/libyuv/row.h
+index 646a6abb10..65ef448b8c 100644
+--- a/third_party/libyuv/include/libyuv/row.h
++++ b/third_party/libyuv/include/libyuv/row.h
+@@ -57,11 +57,13 @@ extern "C" {
+ 
+ // clang >= 6.0.0 required for AVX512.
+ // TODO(fbarchard): fix xcode 9 ios b/789.
++#if 0  // Build fails in libvpx on Mac
+ #if defined(__clang__) && (defined(__x86_64__) || defined(__i386__))
+ #if (__clang_major__ >= 7) && !defined(__APPLE_EMBEDDED_SIMULATOR__)
+ #define CLANG_HAS_AVX512 1
+ #endif  // clang >= 7
+ #endif  // __clang__
++#endif  // 0
+ 
+ // Visual C 2012 required for AVX2.
+ #if defined(_M_IX86) && !defined(__clang__) && defined(_MSC_VER) && \

diff --git a/contrib/libvpx/module.defs b/contrib/libvpx/module.defs
index f9b38a88692933c8e5d46034be480df5f49f6f35..d046727132a163235d39b2eff2665a6e19eb9972 100644 (file)
--- a/contrib/libvpx/module.defs
+++ b/contrib/libvpx/module.defs
@@ -39,3 +39,7 @@ ifeq (0-darwin,$(BUILD.cross)-$(BUILD.system))
         LIBVPX.CONFIGURE.extra += --target=x86_64-darwin14-gcc
     endif
 endif
+
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    LIBVPX.CONFIGURE.extra += --disable-avx512
+endif