mozilla-central: changeset 58645:43dd46547be61bb5acd4930ffbde5d46ae215396

author	Walter Meinl <wuno@lsvw.de>
	Sun, 05 Dec 2010 21:55:40 +0000
changeset 58645	43dd46547be61bb5acd4930ffbde5d46ae215396
parent 58644	2f15cc56a2c289d8961a0897f5b81be76716df7a
child 58646	2a6dd48ee44c31bae041fc891ef690d6245073d3
push id	17393
push user	jwatt@jwatt.org
push date	Sun, 05 Dec 2010 21:58:13 +0000
treeherder	mozilla-central@2a6dd48ee44c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	daveryeo, dvander, dvander
bugs	596737
milestone	2.0b8pre
first release with	nightly linux32 44641ad32c29 / 4.0b8pre / 20101206030318 / files nightly linux64 44641ad32c29 / 4.0b8pre / 20101206030318 / files nightly mac 44641ad32c29 / 4.0b8pre / 20101206030318 / files nightly win32 44641ad32c29 / 4.0b8pre / 20101206030318 / files nightly win64 a722e6bdd003 / 4.0b8pre / 20101206044702 / files
last release without	nightly linux32 ae74a11a7d98 / 4.0b8pre / 20101205030316 / files nightly linux64 ae74a11a7d98 / 4.0b8pre / 20101205030316 / files nightly mac ae74a11a7d98 / 4.0b8pre / 20101205030316 / files nightly win32 ae74a11a7d98 / 4.0b8pre / 20101205030316 / files nightly win64 48e4a07c0eda / 4.0b8pre / 20101205055020 / files

--- a/js/src/methodjit/MethodJIT.cpp
+++ b/js/src/methodjit/MethodJIT.cpp
@@ -133,31 +133,31 @@ PopActiveVMFrame(VMFrame &f)
 }
 
 extern "C" void JS_FASTCALL
 SetVMFrameRegs(VMFrame &f)
 {
     f.cx->setCurrentRegs(&f.regs);
 }
 
-#if defined(__APPLE__) || defined(XP_WIN)
+#if defined(__APPLE__) || defined(XP_WIN) || defined(XP_OS2)
 # define SYMBOL_STRING(name) "_" #name
 #else
 # define SYMBOL_STRING(name) #name
 #endif
 
 JS_STATIC_ASSERT(offsetof(JSFrameRegs, sp) == 0);
 
 #if defined(__linux__) && defined(JS_CPU_X64)
 # define SYMBOL_STRING_RELOC(name) #name "@plt"
 #else
 # define SYMBOL_STRING_RELOC(name) SYMBOL_STRING(name)
 #endif
 
-#if defined(XP_WIN) && defined(JS_CPU_X86)
+#if (defined(XP_WIN) || defined(XP_OS2)) && defined(JS_CPU_X86)
 # define SYMBOL_STRING_VMFRAME(name) "@" #name "@4"
 #else
 # define SYMBOL_STRING_VMFRAME(name) SYMBOL_STRING_RELOC(name)
 #endif
 
 #if defined(XP_MACOSX)
 # define HIDE_SYMBOL(name) ".private_extern _" #name
 #elif defined(__linux__)