579493 - ANGLE fails to compile on mingw

Status: RESOLVED FIXED

(Core :: Graphics: CanvasWebGL, defect)

Description

[Jacek Caban]

Attachment: fix v1.0

The compiler-specific assembly code is protected by OS check, instead of compiler, so mingw tries to compile MSC assembly. I've mainstreamed a fix, so all we have to do is to import revision 343 (currently imported is 342).

Comment 1

[Jacek Caban]

Comment on attachment 457938 [details] [diff] [review]
fix v1.0

>diff --git a/gfx/angle/README.mozilla b/gfx/angle/README.mozilla
>index 85d474f..52bf796 100644
>--- a/gfx/angle/README.mozilla
>+++ b/gfx/angle/README.mozilla
>@@ -1,6 +1,6 @@
> This is the ANGLE project, from http://code.google.com/p/angleproject/.
> 
>-Current revision: r342
>+Current revision: r343
> 
> Local patches:
>     angle-nspr.patch - use NSPR for TLS
>diff --git a/gfx/angle/src/compiler/preprocessor/scanner.c b/gfx/angle/src/compiler/preprocessor/scanner.c
>index 14eee59..0944da5 100644
>--- a/gfx/angle/src/compiler/preprocessor/scanner.c
>+++ b/gfx/angle/src/compiler/preprocessor/scanner.c
>@@ -83,15 +83,15 @@ static int byte_scan(InputSrc *, yystypepp * yylvalpp);
> 
> #define EOL_SY '\n'
> 
>-#if defined(_WIN32)
>+#if defined(_MSC_VER)
>     #define DBG_BREAKPOINT() __asm int 3
>-    #elif defined(_M_AMD64)
>+#elif defined(_M_AMD64)
>     #define DBG_BREAKPOINT() assert(!"Dbg_Breakpoint");
>-    #else
>+#else
>     #define DBG_BREAKPOINT()
>-    #endif
>+#endif
> 
>-    #if defined(_WIN32) && !defined(_M_AMD64)
>+#if defined(_MSC_VER) && !defined(_M_AMD64)
>     __int64 RDTSC ( void ) {
> 
>         __int64 v;

Comment 2

[Jacek Caban]

http://hg.mozilla.org/mozilla-central/rev/2a9cc85aea6f