Backed out bug 1422368 fixes because they weren't sufficient.

dothq · Apr 2, 2018 · 152a7fc · 152a7fc
1 parent 2f5d791
commit 152a7fc
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 39 deletions.
diff --git a/gfx/ycbcr/README b/gfx/ycbcr/README
@@ -27,5 +27,3 @@ win64.patch: SSE2 optimization for Microsoft Visual C++ x64 version
 TypeFromSize.patch: Bug 656185 - Add a method to detect YUVType from plane sizes.
 
 QuellGccWarnings.patch: Bug 711895 - Avoid some GCC compilation warnings.
-
-clang-cl-workaround.patch: Bug 1422368 - Work around a clang-cl unresolved symbol bug.
diff --git a/gfx/ycbcr/clang-cl-workaround.patch b/gfx/ycbcr/clang-cl-workaround.patch
diff --git a/gfx/ycbcr/update.sh b/gfx/ycbcr/update.sh
@@ -10,4 +10,3 @@ patch -p3 <convert.patch
 patch -p3 <win64.patch
 patch -p3 <TypeFromSize.patch
 patch -p3 <QuellGccWarnings.patch
-patch -p3 <clang-cl-workaround.patch
diff --git a/gfx/ycbcr/yuv_row_win.cpp b/gfx/ycbcr/yuv_row_win.cpp
@@ -11,14 +11,6 @@
 extern "C" {
 
 #if defined(MOZILLA_MAY_SUPPORT_SSE) && defined(_M_IX86)
-#if defined(__clang__)
-// clang-cl has a bug where it doesn't mangle names in inline asm
-// so let's do the mangling in the preprocessor (ugh)
-// (but we still need to declare a dummy extern for the parser)
-extern void* _kCoefficientsRgbY;
-#define kCoefficientsRgbY _kCoefficientsRgbY
-#endif
-
 __declspec(naked)
 void FastConvertYUVToRGB32Row_SSE(const uint8* y_buf,
                                   const uint8* u_buf,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,5 +27,3 @@ win64.patch: SSE2 optimization for Microsoft Visual C++ x64 version
		TypeFromSize.patch: Bug 656185 - Add a method to detect YUVType from plane sizes.

		QuellGccWarnings.patch: Bug 711895 - Avoid some GCC compilation warnings.

		clang-cl-workaround.patch: Bug 1422368 - Work around a clang-cl unresolved symbol bug.