From owner-svn-ports-all@freebsd.org Wed Nov 8 06:58:13 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2A04E6F9D0; Wed, 8 Nov 2017 06:58:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9A41A6D7E2; Wed, 8 Nov 2017 06:58:13 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA86wCsK013476; Wed, 8 Nov 2017 06:58:12 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA86wCAv013472; Wed, 8 Nov 2017 06:58:12 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201711080658.vA86wCAv013472@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 8 Nov 2017 06:58:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r453721 - in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: mail/thunderbird/files www/firefox-esr/files www/firefox/files www/seamonkey/files X-SVN-Commit-Revision: 453721 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Nov 2017 06:58:13 -0000 Author: jbeich Date: Wed Nov 8 06:58:12 2017 New Revision: 453721 URL: https://svnweb.freebsd.org/changeset/ports/453721 Log: gecko: sync libyuv fix with upstream version MFH: 2017Q4 (r453437 + r453446 followup) Modified: head/mail/thunderbird/files/patch-bug1414440 (contents, props changed) head/www/firefox-esr/files/patch-bug1414440 (contents, props changed) head/www/firefox/files/patch-bug1414440 (contents, props changed) head/www/seamonkey/files/patch-bug1414440 (contents, props changed) Modified: head/mail/thunderbird/files/patch-bug1414440 ============================================================================== --- head/mail/thunderbird/files/patch-bug1414440 Wed Nov 8 06:37:52 2017 (r453720) +++ head/mail/thunderbird/files/patch-bug1414440 Wed Nov 8 06:58:12 2017 (r453721) @@ -1,7 +1,7 @@ Always build libyuv x86 optimizations with Clang. diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h -index 7abc2d4aef8f..fcf942c660a2 100644 +index 38a957b2ce33..59ec4b30c238 100644 --- mozilla/media/libyuv/include/libyuv/compare_row.h +++ mozilla/media/libyuv/include/libyuv/compare_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -9,25 +9,25 @@ index 7abc2d4aef8f..fcf942c660a2 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h -index 040839c211b1..e99cb47d472f 100644 +index 881b0c5c6473..491c022bfe8f 100644 --- mozilla/media/libyuv/include/libyuv/planar_functions.h +++ mozilla/media/libyuv/include/libyuv/planar_functions.h -@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, - int interpolation); +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h -index 2c51584eee8b..762ca4ba3ab9 100644 +index ebc487f9abf4..59fbd10b573c 100644 --- mozilla/media/libyuv/include/libyuv/rotate_row.h +++ mozilla/media/libyuv/include/libyuv/rotate_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -35,25 +35,25 @@ index 2c51584eee8b..762ca4ba3ab9 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h -index f74bd9f7d17a..b52d6d1fcee0 100644 +index 069d73bd3f2e..3616ecd81c3d 100644 --- mozilla/media/libyuv/include/libyuv/row.h +++ mozilla/media/libyuv/include/libyuv/row.h -@@ -31,7 +31,7 @@ extern "C" { +@@ -38,7 +38,7 @@ extern "C" { var = 0 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h -index edb46cc8c647..59017260b16d 100644 +index df699e6c2282..242f025b1e6e 100644 --- mozilla/media/libyuv/include/libyuv/scale_row.h +++ mozilla/media/libyuv/include/libyuv/scale_row.h @@ -20,7 +20,7 @@ extern "C" { @@ -61,7 +61,17 @@ index edb46cc8c647..59017260b16d 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- mozilla/media/libyuv/linux.mk ++++ mozilla/media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr Modified: head/www/firefox-esr/files/patch-bug1414440 ============================================================================== --- head/www/firefox-esr/files/patch-bug1414440 Wed Nov 8 06:37:52 2017 (r453720) +++ head/www/firefox-esr/files/patch-bug1414440 Wed Nov 8 06:58:12 2017 (r453721) @@ -1,7 +1,7 @@ Always build libyuv x86 optimizations with Clang. diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h -index 7abc2d4aef8f..fcf942c660a2 100644 +index 38a957b2ce33..59ec4b30c238 100644 --- media/libyuv/include/libyuv/compare_row.h +++ media/libyuv/include/libyuv/compare_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -9,25 +9,25 @@ index 7abc2d4aef8f..fcf942c660a2 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h -index 040839c211b1..e99cb47d472f 100644 +index 881b0c5c6473..491c022bfe8f 100644 --- media/libyuv/include/libyuv/planar_functions.h +++ media/libyuv/include/libyuv/planar_functions.h -@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, - int interpolation); +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h -index 2c51584eee8b..762ca4ba3ab9 100644 +index ebc487f9abf4..59fbd10b573c 100644 --- media/libyuv/include/libyuv/rotate_row.h +++ media/libyuv/include/libyuv/rotate_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -35,25 +35,25 @@ index 2c51584eee8b..762ca4ba3ab9 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h -index f74bd9f7d17a..b52d6d1fcee0 100644 +index 069d73bd3f2e..3616ecd81c3d 100644 --- media/libyuv/include/libyuv/row.h +++ media/libyuv/include/libyuv/row.h -@@ -31,7 +31,7 @@ extern "C" { +@@ -38,7 +38,7 @@ extern "C" { var = 0 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h -index edb46cc8c647..59017260b16d 100644 +index df699e6c2282..242f025b1e6e 100644 --- media/libyuv/include/libyuv/scale_row.h +++ media/libyuv/include/libyuv/scale_row.h @@ -20,7 +20,7 @@ extern "C" { @@ -61,7 +61,17 @@ index edb46cc8c647..59017260b16d 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- media/libyuv/linux.mk ++++ media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr Modified: head/www/firefox/files/patch-bug1414440 ============================================================================== --- head/www/firefox/files/patch-bug1414440 Wed Nov 8 06:37:52 2017 (r453720) +++ head/www/firefox/files/patch-bug1414440 Wed Nov 8 06:58:12 2017 (r453721) @@ -1,7 +1,7 @@ Always build libyuv x86 optimizations with Clang. diff --git media/libyuv/libyuv/include/libyuv/compare_row.h media/libyuv/libyuv/include/libyuv/compare_row.h -index 7abc2d4aef8f..fcf942c660a2 100644 +index 7abc2d4aef8f..542df1ef504b 100644 --- media/libyuv/libyuv/include/libyuv/compare_row.h +++ media/libyuv/libyuv/include/libyuv/compare_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -9,12 +9,12 @@ index 7abc2d4aef8f..fcf942c660a2 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/libyuv/include/libyuv/planar_functions.h media/libyuv/libyuv/include/libyuv/planar_functions.h -index 040839c211b1..e99cb47d472f 100644 +index 040839c211b1..5f6a8034d209 100644 --- media/libyuv/libyuv/include/libyuv/planar_functions.h +++ media/libyuv/libyuv/include/libyuv/planar_functions.h @@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, @@ -22,12 +22,12 @@ index 040839c211b1..e99cb47d472f 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/libyuv/include/libyuv/rotate_row.h media/libyuv/libyuv/include/libyuv/rotate_row.h -index 2c51584eee8b..762ca4ba3ab9 100644 +index 2c51584eee8b..8e60a713c4cf 100644 --- media/libyuv/libyuv/include/libyuv/rotate_row.h +++ media/libyuv/libyuv/include/libyuv/rotate_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -35,12 +35,12 @@ index 2c51584eee8b..762ca4ba3ab9 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/libyuv/include/libyuv/row.h media/libyuv/libyuv/include/libyuv/row.h -index f74bd9f7d17a..b52d6d1fcee0 100644 +index f74bd9f7d17a..b8f674ba124d 100644 --- media/libyuv/libyuv/include/libyuv/row.h +++ media/libyuv/libyuv/include/libyuv/row.h @@ -31,7 +31,7 @@ extern "C" { @@ -48,33 +48,12 @@ index f74bd9f7d17a..b52d6d1fcee0 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 -@@ -103,7 +103,9 @@ extern "C" { - #define HAS_COPYROW_ERMS - #define HAS_COPYROW_SSE2 - #define HAS_H422TOARGBROW_SSSE3 -+#if defined(_MSC_VER) || defined(__SSE__) - #define HAS_HALFFLOATROW_SSE2 -+#endif - #define HAS_I400TOARGBROW_SSE2 - #define HAS_I422TOARGB1555ROW_SSSE3 - #define HAS_I422TOARGB4444ROW_SSSE3 -@@ -202,8 +204,10 @@ extern "C" { - #define HAS_ARGBTOYROW_AVX2 - #define HAS_COPYROW_AVX - #define HAS_H422TOARGBROW_AVX2 -+#if defined(_MSC_VER) || defined(__SSE__) - #define HAS_HALFFLOATROW_AVX2 - // #define HAS_HALFFLOATROW_F16C // Enable to test halffloat cast -+#endif - #define HAS_I400TOARGBROW_AVX2 - #define HAS_I422TOARGB1555ROW_AVX2 - #define HAS_I422TOARGB4444ROW_AVX2 diff --git media/libyuv/libyuv/include/libyuv/scale_row.h media/libyuv/libyuv/include/libyuv/scale_row.h -index edb46cc8c647..59017260b16d 100644 +index edb46cc8c647..2b2c7a0700ef 100644 --- media/libyuv/libyuv/include/libyuv/scale_row.h +++ media/libyuv/libyuv/include/libyuv/scale_row.h @@ -20,7 +20,7 @@ extern "C" { @@ -82,7 +61,48 @@ index edb46cc8c647..59017260b16d 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/libyuv/linux.mk media/libyuv/libyuv/linux.mk +index 923345ae4d12..9e555e303913 100644 +--- media/libyuv/libyuv/linux.mk ++++ media/libyuv/libyuv/linux.mk +@@ -80,4 +80,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr +diff --git media/libyuv/libyuv/source/row_gcc.cc media/libyuv/libyuv/source/row_gcc.cc +index 8735070b619d..9df8c6a627db 100644 +--- media/libyuv/libyuv/source/row_gcc.cc ++++ media/libyuv/libyuv/source/row_gcc.cc +@@ -5479,7 +5479,7 @@ void HalfFloatRow_SSE2(const uint16* src, uint16* dst, float scale, int width) { + : "+r"(src), // %0 + "+r"(dst), // %1 + "+r"(width) // %2 +- : "x"(scale * kScaleBias) // %3 ++ : "mx"(scale * kScaleBias) // %3 + : "memory", "cc", + "xmm2", "xmm3", "xmm4", "xmm5" + ); +@@ -5515,7 +5515,7 @@ void HalfFloatRow_AVX2(const uint16* src, uint16* dst, float scale, int width) { + : "+r"(src), // %0 + "+r"(dst), // %1 + "+r"(width) // %2 +- : "x"(scale * kScaleBias) // %3 ++ : "mx"(scale * kScaleBias) // %3 + : "memory", "cc", + "xmm2", "xmm3", "xmm4", "xmm5" + ); +@@ -5548,7 +5548,7 @@ void HalfFloatRow_F16C(const uint16* src, uint16* dst, float scale, int width) { + : "+r"(src), // %0 + "+r"(dst), // %1 + "+r"(width) // %2 +- : "x"(scale) // %3 ++ : "mx"(scale) // %3 + : "memory", "cc", + "xmm2", "xmm3", "xmm4" + ); Modified: head/www/seamonkey/files/patch-bug1414440 ============================================================================== --- head/www/seamonkey/files/patch-bug1414440 Wed Nov 8 06:37:52 2017 (r453720) +++ head/www/seamonkey/files/patch-bug1414440 Wed Nov 8 06:58:12 2017 (r453721) @@ -1,7 +1,7 @@ Always build libyuv x86 optimizations with Clang. diff --git media/libyuv/include/libyuv/compare_row.h media/libyuv/include/libyuv/compare_row.h -index 7abc2d4aef8f..fcf942c660a2 100644 +index 38a957b2ce33..59ec4b30c238 100644 --- mozilla/media/libyuv/include/libyuv/compare_row.h +++ mozilla/media/libyuv/include/libyuv/compare_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -9,25 +9,25 @@ index 7abc2d4aef8f..fcf942c660a2 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/planar_functions.h media/libyuv/include/libyuv/planar_functions.h -index 040839c211b1..e99cb47d472f 100644 +index 881b0c5c6473..491c022bfe8f 100644 --- mozilla/media/libyuv/include/libyuv/planar_functions.h +++ mozilla/media/libyuv/include/libyuv/planar_functions.h -@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, - int interpolation); +@@ -450,7 +450,7 @@ int I420Interpolate(const uint8* src0_y, int src0_stride_y, + int width, int height, int interpolation); #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/rotate_row.h media/libyuv/include/libyuv/rotate_row.h -index 2c51584eee8b..762ca4ba3ab9 100644 +index ebc487f9abf4..59fbd10b573c 100644 --- mozilla/media/libyuv/include/libyuv/rotate_row.h +++ mozilla/media/libyuv/include/libyuv/rotate_row.h @@ -19,7 +19,7 @@ extern "C" { @@ -35,25 +35,25 @@ index 2c51584eee8b..762ca4ba3ab9 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/row.h media/libyuv/include/libyuv/row.h -index f74bd9f7d17a..b52d6d1fcee0 100644 +index 069d73bd3f2e..3616ecd81c3d 100644 --- mozilla/media/libyuv/include/libyuv/row.h +++ mozilla/media/libyuv/include/libyuv/row.h -@@ -31,7 +31,7 @@ extern "C" { +@@ -38,7 +38,7 @@ extern "C" { var = 0 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 diff --git media/libyuv/include/libyuv/scale_row.h media/libyuv/include/libyuv/scale_row.h -index edb46cc8c647..59017260b16d 100644 +index df699e6c2282..242f025b1e6e 100644 --- mozilla/media/libyuv/include/libyuv/scale_row.h +++ mozilla/media/libyuv/include/libyuv/scale_row.h @@ -20,7 +20,7 @@ extern "C" { @@ -61,7 +61,17 @@ index edb46cc8c647..59017260b16d 100644 #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) ++ (defined(__i386__) && !defined(__SSE__) && !defined(__clang__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 +diff --git media/libyuv/linux.mk media/libyuv/linux.mk +index ee5a3a70705a..c1a45173c9ab 100644 +--- mozilla/media/libyuv/linux.mk ++++ mozilla/media/libyuv/linux.mk +@@ -78,4 +78,4 @@ cpuid: util/cpuid.c libyuv.a + $(CC) $(CFLAGS) -o $@ util/cpuid.c libyuv.a + + clean: +- /bin/rm -f source/*.o *.ii *.s libyuv.a convert cpuid psnr ++ /bin/rm -f source/*.o *.ii *.s libyuv.a yuvconvert cpuid psnr