diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2017-11-04 10:10:57 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2017-11-04 10:10:57 +0000 |
| commit | 98002fdeba98543ad9aac3394b74969f03da6028 (patch) | |
| tree | b964a0c953b47d1be8d30019649964bbdc2860bc /www/firefox-esr | |
| parent | 4cb488e0ff92041d3cae9c12c598d69c36bd0b9d (diff) | |
| download | ports-98002fdeba98543ad9aac3394b74969f03da6028.tar.gz ports-98002fdeba98543ad9aac3394b74969f03da6028.zip | |
gecko: unbreak build with GCC after r453437
MFH: 2017Q4
Notes
Notes:
svn path=/head/; revision=453446
Diffstat (limited to 'www/firefox-esr')
| -rw-r--r-- | www/firefox-esr/files/patch-bug1414440 | 47 |
1 files changed, 21 insertions, 26 deletions
diff --git a/www/firefox-esr/files/patch-bug1414440 b/www/firefox-esr/files/patch-bug1414440 index 3a8c7b758ac9..deeab67aa92b 100644 --- a/www/firefox-esr/files/patch-bug1414440 +++ b/www/firefox-esr/files/patch-bug1414440 @@ -1,72 +1,67 @@ -Build libyuv with SIMD optimizations on Linux x86. +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..161c12fa1b83 100644 +index 7abc2d4aef8f..fcf942c660a2 100644 --- media/libyuv/include/libyuv/compare_row.h +++ media/libyuv/include/libyuv/compare_row.h -@@ -18,8 +18,7 @@ namespace libyuv { - extern "C" { +@@ -19,7 +19,7 @@ extern "C" { #endif --#if defined(__pnacl__) || defined(__CLR_VER) || \ + #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+#if defined(__pnacl__) || defined(__CLR_VER) ++ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) #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..0d672dec96d6 100644 +index 040839c211b1..e99cb47d472f 100644 --- media/libyuv/include/libyuv/planar_functions.h +++ media/libyuv/include/libyuv/planar_functions.h -@@ -719,8 +719,7 @@ int I420Interpolate(const uint8* src0_y, - int height, +@@ -720,7 +720,7 @@ int I420Interpolate(const uint8* src0_y, int interpolation); --#if defined(__pnacl__) || defined(__CLR_VER) || \ + #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+#if defined(__pnacl__) || defined(__CLR_VER) ++ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) #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..73bbe8ef7ad4 100644 +index 2c51584eee8b..762ca4ba3ab9 100644 --- media/libyuv/include/libyuv/rotate_row.h +++ media/libyuv/include/libyuv/rotate_row.h -@@ -18,8 +18,7 @@ namespace libyuv { - extern "C" { +@@ -19,7 +19,7 @@ extern "C" { #endif --#if defined(__pnacl__) || defined(__CLR_VER) || \ + #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+#if defined(__pnacl__) || defined(__CLR_VER) ++ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) #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..3bdfb75fc160 100644 +index f74bd9f7d17a..b52d6d1fcee0 100644 --- media/libyuv/include/libyuv/row.h +++ media/libyuv/include/libyuv/row.h -@@ -30,8 +30,7 @@ extern "C" { - free(var##_mem); \ +@@ -31,7 +31,7 @@ extern "C" { var = 0 --#if defined(__pnacl__) || defined(__CLR_VER) || \ + #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+#if defined(__pnacl__) || defined(__CLR_VER) ++ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) #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..fe78a80f81bd 100644 +index edb46cc8c647..59017260b16d 100644 --- media/libyuv/include/libyuv/scale_row.h +++ media/libyuv/include/libyuv/scale_row.h -@@ -19,8 +19,7 @@ namespace libyuv { - extern "C" { +@@ -20,7 +20,7 @@ extern "C" { #endif --#if defined(__pnacl__) || defined(__CLR_VER) || \ + #if defined(__pnacl__) || defined(__CLR_VER) || \ - (defined(__i386__) && !defined(__SSE2__)) -+#if defined(__pnacl__) || defined(__CLR_VER) ++ (defined(__GNUC__) && !defined(__clang__) && !defined(__SSE__)) #define LIBYUV_DISABLE_X86 #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 |