diff options
| author | Bradley Sepos <[email protected]> | 2019-01-08 08:46:43 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2019-01-08 08:46:43 -0500 |
| commit | 49ab003cee6e5b53e9efa7ed4245d6ec0f2a8c75 (patch) | |
| tree | 32b45542555755d6a803bf021e41d30f4f8d49e5 /contrib | |
| parent | e3817b13cfebce6f7542be6761bd9fa8b51e1005 (diff) | |
contrib: Revert libvpx clang patch added in e3817b13cfebce6f7542be6761bd9fa8b51e1005.
I must have forgotten to `make libvpx.xclean` before building.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libvpx/A04-avx-512-clang.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/contrib/libvpx/A04-avx-512-clang.patch b/contrib/libvpx/A04-avx-512-clang.patch deleted file mode 100644 index 76bd5f03d..000000000 --- a/contrib/libvpx/A04-avx-512-clang.patch +++ /dev/null @@ -1,46 +0,0 @@ -From bb286cd851bd16efa32fe6fba5a9c2d0a160efa5 Mon Sep 17 00:00:00 2001 -From: Johann <[email protected]> -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) && \ |