587321 - YARR landing broke mingw compilation

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jacek Caban]

Attachment: fix v1.0

There are two problems. One is 64-bit specific. We try to build TrampolineMasmX64.asm on Windows target, but it's compiler-specific, not OS-specific. Changing |ifeq ($(OS_ARCH),WINNT)| to |ifdef _MSC_VER| fixes the problem.

The second problem is compilation of Assertions.cpp. It mixes compiler and platform checks. Includes are guarded by compiler check, while _CrtDbgReport call is guarded by OS check. It results in not including crtdbg.h and trying to use _CrtDbgReport on mingw. The best fix would be to change includes guard, but unfortunately it fails because of lack of support for debugging API on mingw. It should be fixed on their side, but I think it's fine to simply not use _CrtDbgReport on mingw and change the second guard.

Comment 1

[Chris Leary [:cdleary] (not checking bugmail)]

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

Looks good, though the trampoline was already removed in bug 586887. I'll go ahead and commit the win->msvc change.

Comment 2

[Jacek Caban]

Thanks for the review, pushed to TM:
http://hg.mozilla.org/tracemonkey/rev/311ae2addf12

Comment 3

[Jacek Caban]

Merged to m-c:
http://hg.mozilla.org/mozilla-central/rev/311ae2addf12